diff --git a/proprietary/bootable/bootloader/lk/Android.mk b/proprietary/bootable/bootloader/lk/Android.mk
deleted file mode 100755
index c1388fd5ae61561f152ae3fce77691568d2aeb02..0000000000000000000000000000000000000000
--- a/proprietary/bootable/bootloader/lk/Android.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-LK_ROOT_DIR := $(PWD)
-HOST_OS ?= $(shell uname | tr '[A-Z]' '[a-z]')
-export HOST_OS LCM_WIDTH LCM_HEIGHT
-
-ifdef LK_PROJECT
-    LK_DIR := $(LOCAL_PATH)
-    INSTALLED_LK_TARGET := $(PRODUCT_OUT)/lk.bin 
-    INSTALLED_LOGO_TARGET := $(PRODUCT_OUT)/logo.bin
-
-  ifeq ($(wildcard $(TARGET_PREBUILT_LK)),)
-    TARGET_LK_OUT ?= $(if $(filter /% ~%,$(TARGET_OUT_INTERMEDIATES)),,$(LK_ROOT_DIR)/)$(TARGET_OUT_INTERMEDIATES)/BOOTLOADER_OBJ
-    BUILT_LK_TARGET := $(TARGET_LK_OUT)/build-$(LK_PROJECT)/lk.bin
-    ifeq ($(LK_CROSS_COMPILE),)
-    ifeq ($(TARGET_ARCH), arm)
-#      LK_CROSS_COMPILE := $(LK_ROOT_DIR)/$(TARGET_TOOLS_PREFIX)
-    else ifeq ($(TARGET_2ND_ARCH), arm)
-#      LK_CROSS_COMPILE := $(LK_ROOT_DIR)/$($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_TOOLS_PREFIX)
-    endif
-    endif
-    LK_MAKE_OPTION := $(if $(SHOW_COMMANDS),NOECHO=) $(if $(LK_CROSS_COMPILE),TOOLCHAIN_PREFIX=$(LK_CROSS_COMPILE)) BOOTLOADER_OUT=$(TARGET_LK_OUT) ROOTDIR=$(LK_ROOT_DIR)
-
-$(BUILT_LK_TARGET): FORCE
-	$(hide) mkdir -p $(dir $@)
-	$(MAKE) -C $(LK_DIR) $(LK_MAKE_OPTION) $(LK_PROJECT)
-
-$(TARGET_PREBUILT_LK): $(BUILT_LK_TARGET)
-	$(hide) mkdir -p $(dir $@)
-	$(hide) cp -f $(BUILT_LK_TARGET) $@
-	$(hide) cp -f $(dir $(BUILT_LK_TARGET))logo.bin $(dir $@)logo.bin
-
-  else
-    BUILT_LK_TARGET := $(TARGET_PREBUILT_LK)
-  endif#TARGET_PREBUILT_LK
-
-$(INSTALLED_LK_TARGET): $(BUILT_LK_TARGET)
-	$(hide) mkdir -p $(dir $@)
-	$(hide) cp -f $(BUILT_LK_TARGET) $(INSTALLED_LK_TARGET)
-
-$(INSTALLED_LOGO_TARGET): $(BUILT_LK_TARGET)
-	$(hide) mkdir -p $(dir $@)
-	$(hide) cp -f $(dir $(BUILT_LK_TARGET))logo.bin $(INSTALLED_LOGO_TARGET)
-
-.PHONY: lk save-lk clean-lk
-droidcore: $(INSTALLED_LK_TARGET) $(INSTALLED_LOGO_TARGET)
-lk: $(INSTALLED_LK_TARGET) $(INSTALLED_LOGO_TARGET)
-save-lk: $(TARGET_PREBUILT_LK)
-
-clean-lk:
-	$(hide) rm -rf $(INSTALLED_LK_TARGET) $(INSTALLED_LOGO_TARGET) $(TARGET_LK_OUT)
-
-droid: check-lk-config
-check-mtk-config: check-lk-config
-check-lk-config:
-ifneq (yes,$(strip $(DISABLE_MTK_CONFIG_CHECK)))
-	python device/mediatek/build/build/tools/check_kernel_config.py -c $(MTK_TARGET_PROJECT_FOLDER)/ProjectConfig.mk -l $(LK_DIR)/project/$(LK_PROJECT).mk -p $(MTK_PROJECT_NAME)
-else
-	-python device/mediatek/build/build/tools/check_kernel_config.py -c $(MTK_TARGET_PROJECT_FOLDER)/ProjectConfig.mk -l $(LK_DIR)/project/$(LK_PROJECT).mk -p $(MTK_PROJECT_NAME)
-endif
-
-
-endif#LK_PROJECT
diff --git a/proprietary/bootable/bootloader/lk/platform/mt6757/atags.c b/proprietary/bootable/bootloader/lk/platform/mt6757/atags.c
index 089ac2d936b7461aeb2390e055822d578e48fee6..c6561a32a4ae7033420c3646fdce64dcb1e42a3c 100755
--- a/proprietary/bootable/bootloader/lk/platform/mt6757/atags.c
+++ b/proprietary/bootable/bootloader/lk/platform/mt6757/atags.c
@@ -548,14 +548,14 @@ int target_fdt_model(void *fdt)
 	const struct fdt_property *prop;
 	char *prop_name = "model";
 	const char *mali_model_name[] = {
-		"MT8163",
-		"MT8163",
-		"MT8163",
+		"MT6757",
+		"MT6757",
+		"MT6757",
 	};
 	const char *sph_model_name[] = {
-		"MT8163S",
-		"MT8163S",
-		"MT8163S",
+		"MT6757S",
+		"MT6757S",
+		"MT6757S",
 	};
 
 	if (code > code_max)
diff --git a/proprietary/bootable/bootloader/lk/platform/mt6757/include/platform/msdc.h b/proprietary/bootable/bootloader/lk/platform/mt6757/include/platform/msdc.h
index fa12c08ab8944a8f1c14ca4f7f9f0b5138988c0b..90a2ffcb56365201d13391ce190b0fc9b7c0e5bb 100755
--- a/proprietary/bootable/bootloader/lk/platform/mt6757/include/platform/msdc.h
+++ b/proprietary/bootable/bootloader/lk/platform/mt6757/include/platform/msdc.h
@@ -835,7 +835,7 @@
 
 
 /*
-  *  This definition is used for MT8163_GPIO_RegMap.doc by fengguo.gao 
+  *  This definition is used for MT6757_GPIO_RegMap.doc by fengguo.gao 
   *  Zhanyong.Wang
   *  2014/11/28
   */
@@ -1517,7 +1517,7 @@ typedef enum __MSDC_PIN_STATE {
 }MSDC_PIN_STATE;
 
 /*
-  *  this definition is used for MT8163_GPIO_RegMap.doc by Sander.Lin 
+  *  this definition is used for MT6757_GPIO_RegMap.doc by Sander.Lin 
   *  Zhanyong.Wang
   *  2014/12/14
   */
diff --git a/proprietary/bootable/bootloader/lk/platform/mt6757/mmc_core.c b/proprietary/bootable/bootloader/lk/platform/mt6757/mmc_core.c
index 6bc6dfc54f19c7f2b20598162b094e056857fefe..4ed02303ec6e3eb7bae10a8512b5974dc94a443c 100755
--- a/proprietary/bootable/bootloader/lk/platform/mt6757/mmc_core.c
+++ b/proprietary/bootable/bootloader/lk/platform/mt6757/mmc_core.c
@@ -3550,10 +3550,10 @@ u32 mmc_is_exist(u32 id)
 #define EFUSE_M_HW2_RES0                0x000061C0
 #define EFUSE_EMMC_MSDC3_DIS            (1ul <<  7)
 #define EFUSE_EMMC_MSDC0_DIS            (1ul <<  6)
-#define MT8163_IO_READ32(addr, index)   (*(volatile unsigned int*)((addr) + (index)))
+#define MT6757_IO_READ32(addr, index)   (*(volatile unsigned int*)((addr) + (index)))
 
-#define EFUSE_EMMC_MSDC3_IsDisabled()   (!!(MT8163_IO_READ32(EFUSE_BASE,EFUSE_M_HW2_RES0) & EFUSE_EMMC_MSDC3_DIS))
-#define EFUSE_EMMC_MSDC0_IsDisabled()   (!!(MT8163_IO_READ32(EFUSE_BASE,EFUSE_M_HW2_RES0) & EFUSE_EMMC_MSDC0_DIS))
+#define EFUSE_EMMC_MSDC3_IsDisabled()   (!!(MT6757_IO_READ32(EFUSE_BASE,EFUSE_M_HW2_RES0) & EFUSE_EMMC_MSDC3_DIS))
+#define EFUSE_EMMC_MSDC0_IsDisabled()   (!!(MT6757_IO_READ32(EFUSE_BASE,EFUSE_M_HW2_RES0) & EFUSE_EMMC_MSDC0_DIS))
 #endif
 u32 mmc_whoami(void)
 {
diff --git a/proprietary/bootable/bootloader/preloader/Android.mk b/proprietary/bootable/bootloader/preloader/Android.mk
deleted file mode 100755
index 3bce156e791cf704582f83021654b2c15b38cd2f..0000000000000000000000000000000000000000
--- a/proprietary/bootable/bootloader/preloader/Android.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-PRELOADER_ROOT_DIR := $(PWD)
-
-ifdef PRELOADER_TARGET_PRODUCT
-    PRELOADER_DIR := $(LOCAL_PATH)
-    PRELOADER_OUT ?= $(if $(filter /% ~%,$(TARGET_OUT_INTERMEDIATES)),,$(PRELOADER_ROOT_DIR)/)$(TARGET_OUT_INTERMEDIATES)/PRELOADER_OBJ
-  ifdef PL_MODE
-    INSTALLED_PRELOADER_TARGET := $(PRODUCT_OUT)/preloader_$(PRELOADER_TARGET_PRODUCT).bin
-    BUILT_PRELOADER_TARGET := $(PRELOADER_OUT)/bin/preloader_$(PRELOADER_TARGET_PRODUCT)_$(PL_MODE).bin
-  else
-    INSTALLED_PRELOADER_TARGET := $(PRODUCT_OUT)/preloader_$(PRELOADER_TARGET_PRODUCT).bin
-    BUILT_PRELOADER_TARGET := $(PRELOADER_OUT)/bin/preloader_$(PRELOADER_TARGET_PRODUCT).bin
-  endif
-    ifeq ($(LK_CROSS_COMPILE),)
-    ifeq ($(TARGET_ARCH), arm)
-#      PRELOADER_CROSS_COMPILE := $(PRELOADER_ROOT_DIR)/$(TARGET_TOOLS_PREFIX)
-    else ifeq ($(TARGET_2ND_ARCH), arm)
-#      PRELOADER_CROSS_COMPILE := $(PRELOADER_ROOT_DIR)/$($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_TOOLS_PREFIX)
-    endif
-    endif
-
-ifneq (MT8127,$(strip $(MTK_PLATFORM)))
-    PRELOADER_CROSS_COMPILE := $(CURDIR)/prebuilts/gcc/$(HOST_OS)-x86/arm/arm-linux-androideabi-4.8/bin/arm-linux-androideabi-
-else
-    PRELOADER_CROSS_COMPILE := $(CURDIR)/prebuilts/gcc/$(HOST_OS)-x86/arm/arm-eabi-4.8/bin/arm-eabi-
-endif
-    PRELOADER_MAKE_OPTION := $(if $(SHOW_COMMANDS),,-s) -f Makefile $(if $(PRELOADER_CROSS_COMPILE),CROSS_COMPILE=$(PRELOADER_CROSS_COMPILE)) PRELOADER_OUT=$(PRELOADER_OUT) MTK_PROJECT=$(PRELOADER_TARGET_PRODUCT) TOOL_PATH=$(PRELOADER_ROOT_DIR)/device/mediatek/build/build/tools ROOTDIR=$(PRELOADER_ROOT_DIR)
-
-  ifeq ($(wildcard $(TARGET_PREBUILT_PRELOADER)),)
-$(BUILT_PRELOADER_TARGET): FORCE
-	$(hide) mkdir -p $(dir $@)
-	$(MAKE) -C $(PRELOADER_DIR) $(PRELOADER_MAKE_OPTION)
-
-$(TARGET_PREBUILT_PRELOADER): $(BUILT_PRELOADER_TARGET) | $(ACP)
-	$(copy-file-to-target)
-
-  else
-    BUILT_PRELOADER_TARGET := $(TARGET_PREBUILT_PRELOADER)
-  endif#TARGET_PREBUILT_PRELOADER
-
-  ifneq ($(INSTALLED_PRELOADER_TARGET),$(BUILT_PRELOADER_TARGET))
-$(INSTALLED_PRELOADER_TARGET): $(BUILT_PRELOADER_TARGET) | $(ACP)
-	$(copy-file-to-target)
-
-  endif
-
-.PHONY: preloader pl save-preloader %-preloader clean-preloader check-mtk-config check-pl-config
-
-TARGET_PRELOADER := $(PRODUCT_OUT)/preloader.img
-$(TARGET_PRELOADER): $(INSTALLED_PRELOADER_TARGET) $(PRELOADER_DIR)/tools/gen-preloader-img.py
-	$(hide) $(PRELOADER_DIR)/tools/gen-preloader-img.py $< $@
-
-droidcore: preloader
-preloader pl: check-pl-config $(INSTALLED_PRELOADER_TARGET) $(TARGET_PRELOADER)
-save-preloader: $(TARGET_PREBUILT_PRELOADER)
-
-%-preloader:
-	$(MAKE) -C $(PRELOADER_DIR) $(PRELOADER_MAKE_OPTION) $(patsubst %-preloader,%,$@)
-
-clean-preloader:
-	$(hide) rm -rf $(INSTALLED_PRELOADER_TARGET) $(TARGET_PRELOADER) $(PRELOADER_OUT)
-
-check-mtk-config: check-pl-config
-check-pl-config:
-ifneq (yes,$(strip $(DISABLE_MTK_CONFIG_CHECK)))
-	python device/mediatek/build/build/tools/check_kernel_config.py -c $(MTK_TARGET_PROJECT_FOLDER)/ProjectConfig.mk -b $(PRELOADER_DIR)/custom/$(PRELOADER_TARGET_PRODUCT)/$(PRELOADER_TARGET_PRODUCT).mk -p $(MTK_PROJECT_NAME)
-else
-	-python device/mediatek/build/build/tools/check_kernel_config.py -c $(MTK_TARGET_PROJECT_FOLDER)/ProjectConfig.mk -b $(PRELOADER_DIR)/custom/$(PRELOADER_TARGET_PRODUCT)/$(PRELOADER_TARGET_PRODUCT).mk -p $(MTK_PROJECT_NAME)
-endif
-
-
-endif#PRELOADER_TARGET_PRODUCT
diff --git a/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/dramc_dle_cal.c b/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/dramc_dle_cal.c
index ead469d977f0ba24a560d2e0106ce39ea0ec493b..636b8496a86ee185de812f86bb8cc3261003562a 100755
--- a/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/dramc_dle_cal.c
+++ b/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/dramc_dle_cal.c
@@ -161,7 +161,7 @@ void dle_factor_handler(char **factor_value, char mode) {
     curr_val = atoi(*factor_value);
     //dbg_print("dle_factor_handler, curr_val:0x%x\n", curr_val);
 
-    #if 1 //MT8163
+    #if 1 //MT6757
     DRAMC_WRITE_REG((DRAMC_READ_REG(DRAMC_DATLATCTL) & 0xFFE0E0FF)
 		| ((curr_val & 0x1F) << 16)
 		| (((curr_val & 0x1F) - 0x4) << 8),	//Notice: Need ensure curr_val( from dle_tbl) >= 4 !!!		
diff --git a/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/emi.c b/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/emi.c
index 49da7b6fefaf893b7826b11b6403138f840d6652..3cb483c36d05067cca1890062cef74503ccda2b9 100755
--- a/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/emi.c
+++ b/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/emi.c
@@ -48,9 +48,9 @@
 //#define print
 #define dbg_print //print
 
-#define MT8163_BRINGUP_TMP (1)
+#define MT6757_BRINGUP_TMP (1)
 
-#if MT8163_BRINGUP_TMP
+#if MT6757_BRINGUP_TMP
 #define GATING_CLOCK_CONTROL_DVT  //for DVT test
 //#define TEST_ASYMMETRY_MODE
 #endif
@@ -577,7 +577,7 @@ static void init_lpddr2(EMI_SETTINGS *emi_setting)
 #endif
 #endif
 
-	// For MT8163 LPDDR2
+	// For MT6757 LPDDR2
 	*((V_UINT32P)(DRAMC0_BASE + 0x00f0)) = 0xC0000000;	// Edward: [31]DQ4BMUX=1 in SBS. [30]S2=1, Edward : 100b for LPDDR2/3, 110b for DDR3x16x2
 	*((V_UINT32P)(DDRPHY_BASE + 0x00f0)) = 0xC0000000;
 
@@ -604,7 +604,7 @@ static void init_lpddr2(EMI_SETTINGS *emi_setting)
 	*((V_UINT32P)(DRAMC0_BASE + 0x0168)) = 0x00000080;
 	*((V_UINT32P)(DDRPHY_BASE + 0x0168)) = 0x00000080;
 
-	//For MT8163 LPDDR2
+	//For MT6757 LPDDR2
 	*((V_UINT32P)(DRAMC0_BASE + 0x00d8)) = 0x00700900;
 	*((V_UINT32P)(DDRPHY_BASE + 0x00d8)) = 0x00700900;
 
@@ -630,7 +630,7 @@ static void init_lpddr2(EMI_SETTINGS *emi_setting)
 
 	//*((V_UINT32P)(DRAMC0_BASE + 0x0158)) = 0xf0f0f0f0;  // Edward: 4 bit swap enable 0xf0f0f0f0. disable 0xff00ff00.
 	//*((V_UINT32P)(DDRPHY_BASE + 0x0158)) = 0xf0f0f0f0;
-	//For MT8163 LPDDR2
+	//For MT6757 LPDDR2
 	*((V_UINT32P)(DRAMC0_BASE + 0x0230)) = 0xf00f0ff0;
 	*((V_UINT32P)(DDRPHY_BASE + 0x0230)) = 0xf00f0ff0;
 
@@ -1015,7 +1015,7 @@ static void init_lpddr3(EMI_SETTINGS *emi_setting)
 	*((V_UINT32P)(DRAMC0_BASE + 0x0048)) = 0x0001110d;
 	*((V_UINT32P)(DDRPHY_BASE + 0x0048)) = 0x0001110d;
 
-    // Todo: For MT8163 LPDDR3 POP
+    // Todo: For MT6757 LPDDR3 POP
     if((emi_setting->LPDDR3_MODE_REG_5 & 0xFFF00000) == 0x17800000)
 	{
 		*((V_UINT32P)(DRAMC0_BASE + 0x00d8)) = 0x40500900;
@@ -1061,7 +1061,7 @@ static void init_lpddr3(EMI_SETTINGS *emi_setting)
 
 	//*((V_UINT32P)(DRAMC0_BASE + 0x00f0)) = 0x00000000; // Edward: DQ4BMUX=1 for SBS. [30]S2=1, Edward : 100b for LPDDR2/3, 110b for DDR3x16x2
 	//*((V_UINT32P)(DDRPHY_BASE + 0x00f0)) = 0x00000000;
-    // Todo: For MT8163 LPDDR3 DSC
+    // Todo: For MT6757 LPDDR3 DSC
 	if((emi_setting->LPDDR3_MODE_REG_5 & 0xFFF00000) == 0x17800000)
 	{
 		*((V_UINT32P)(DRAMC0_BASE + 0x00f0)) = 0x40000000;
@@ -1094,7 +1094,7 @@ static void init_lpddr3(EMI_SETTINGS *emi_setting)
 	*((V_UINT32P)(DRAMC0_BASE + 0x0168)) = 0x00000080;
 	*((V_UINT32P)(DDRPHY_BASE + 0x0168)) = 0x00000080;
 
-    // Todo: For MT8163 LPDDR3 POP
+    // Todo: For MT6757 LPDDR3 POP
 	if((emi_setting->LPDDR3_MODE_REG_5 & 0xFFF00000) == 0x17800000)
 	{
 		*((V_UINT32P)(DRAMC0_BASE + 0x00d8)) = 0x40700900;
@@ -1150,7 +1150,7 @@ static void init_lpddr3(EMI_SETTINGS *emi_setting)
 	*((V_UINT32P)(DRAMC0_BASE + 0x01e8)) = emi_setting->DRAMC_ACTIM1_VAL;	 //LPDDR3EN set to 1
 	*((V_UINT32P)(DDRPHY_BASE + 0x01e8)) = emi_setting->DRAMC_ACTIM1_VAL;	 //LPDDR3EN set to 1
 
-    // Todo: Current for MT8163 LPDDR3 POP
+    // Todo: Current for MT6757 LPDDR3 POP
 	if((emi_setting->LPDDR3_MODE_REG_5 & 0xFFF00000) == 0x17800000)
 	{
 		*((V_UINT32P)(DRAMC0_BASE + 0x0230)) = 0xffff0000;
@@ -1621,7 +1621,7 @@ static void init_ddr3(EMI_SETTINGS *emi_setting)
 	}
     #endif
 
-    // Todo: For MT8163 PCDDR3
+    // Todo: For MT6757 PCDDR3
     if(emi_setting->PCDDR3_MODE_REG5 & (0x1<<30))
     {//DDR3 8bit x4
 	    *(volatile unsigned int *)(DRAMC0_BASE + 0x00F0) = 0xC0000000;
@@ -1707,7 +1707,7 @@ static void init_ddr3(EMI_SETTINGS *emi_setting)
 		*(volatile unsigned int *)(DDRPHY_BASE + 0x00D8) = 0x00300900;
 	}
     #endif
-    // Todo: For MT8163 PCDDR3
+    // Todo: For MT6757 PCDDR3
     *(volatile unsigned int *)(DRAMC0_BASE + 0x00D8) = 0x80300900;
     *(volatile unsigned int *)(DDRPHY_BASE + 0x00D8) = 0x80300900;
 
@@ -1743,7 +1743,7 @@ static void init_ddr3(EMI_SETTINGS *emi_setting)
         *(volatile unsigned int *)(DDRPHY_BASE + 0x0230) = 0xffff0000;
     }
     #endif
-    // Todo: For MT8163 PCDDR3
+    // Todo: For MT6757 PCDDR3
     if(emi_setting->PCDDR3_MODE_REG5 & (0x1<<30))
     {//DDR3 8bit x4
         *(volatile unsigned int *)(DRAMC0_BASE + 0x0230) = 0xf00f0ff0;
@@ -1861,7 +1861,7 @@ static void init_ddr3(EMI_SETTINGS *emi_setting)
     }
     else
     {
-        //dual rank mode, MT8163 2GB setting
+        //dual rank mode, MT6757 2GB setting
         *((volatile unsigned int *)(DRAMC0_BASE + 0x0110)) = 0x0b051211;
         *((volatile unsigned int *)(DDRPHY_BASE + 0x0110)) = 0x0b051211;
     }
@@ -1994,7 +1994,7 @@ static void init_ddr3(EMI_SETTINGS *emi_setting)
     *((volatile unsigned int *)(DRAMC0_BASE + 0x00E4)) = 0x000007a3;  //CKEBYCTL
     *((volatile unsigned int *)(DDRPHY_BASE + 0x00E4)) = 0x000007a3;
 
-    if(emi_setting->PCDDR3_MODE_REG5 & (0x1<<28)) // MT8163 DDR3 2GB
+    if(emi_setting->PCDDR3_MODE_REG5 & (0x1<<28)) // MT6757 DDR3 2GB
     {//DDR3 8bit x4
         *((volatile unsigned int *)(DRAMC0_BASE + 0x01ec)) = 0x00000001;  // Edward : Add this to enable dual scheduler according to Cl and SY.
         *((volatile unsigned int *)(DDRPHY_BASE + 0x01ec)) = 0x00000001;
@@ -2210,7 +2210,7 @@ static int emmc_nand_id_len=16;
 static int fw_id_len;
 static int mt_get_mdl_number (void)
 {
-#if MT8163_BRINGUP_TMP //For bringup temorarily
+#if MT6757_BRINGUP_TMP //For bringup temorarily
     return 0;
 #else
     static int found = 0;
@@ -3167,7 +3167,7 @@ void mt_set_emi (void)
            	*((volatile unsigned int *)(DRAMC0_BASE + 0x00B8)) = 0xFF00CC00; /* [15:8] DQ0~15 driving */
            	*((volatile unsigned int *)(DDRPHY_BASE + 0x00B8)) = 0xFF00CC00;
 	   }
-	   #else // MT8163 2GB setting, disable driving.
+	   #else // MT6757 2GB setting, disable driving.
 	   {
            	//*((volatile unsigned int *)(DRAMC0_BASE + 0x00B4)) = 0xFF00CC00; /* [15:8] DQ16~31 driving */
            	//*((volatile unsigned int *)(DDRPHY_BASE + 0x00B4)) = 0xFF00CC00;
diff --git a/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/inc/dramc_register.h b/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/inc/dramc_register.h
index 172fdcd3bd1eb1b1b7d75c7aa6baec23bb045156..17feaa6efdda7f88f66bcd9d8c03a678a82b13e9 100755
--- a/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/inc/dramc_register.h
+++ b/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/inc/dramc_register.h
@@ -255,7 +255,7 @@
 #define LPDDR3_TEST2_4_048		0x2301110D
 #define LPDDR3_MISCTL0_VAL_0fc	0x17000000
 
-#else //default MT8163 EVB
+#else //default MT6757 EVB
 
 #define LPDDR3_EMI_CONA		0x0002A052
 #define LPDDR3_ACTIM_000		0x66CB4619
diff --git a/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/inc/msdc.h b/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/inc/msdc.h
index 9b9d8d0e3c9ca81c63a50f516a44ce9f6f6b4de9..9fa7e5f1caa54834221bf49ef4a3bfbcb96286a5 100755
--- a/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/inc/msdc.h
+++ b/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/inc/msdc.h
@@ -835,7 +835,7 @@
 
 
 /*
-  *  This definition is used for MT8163_GPIO_RegMap.doc by fengguo.gao 
+  *  This definition is used for MT6757_GPIO_RegMap.doc by fengguo.gao 
   *  Zhanyong.Wang
   *  2014/11/28
   */
@@ -1517,7 +1517,7 @@ typedef enum __MSDC_PIN_STATE {
 }MSDC_PIN_STATE;
 
 /*
-  *  this definition is used for MT8163_GPIO_RegMap.doc by Sander.Lin 
+  *  this definition is used for MT6757_GPIO_RegMap.doc by Sander.Lin 
   *  Zhanyong.Wang
   *  2014/12/14
   */
diff --git a/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/inc/mt6757.h b/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/inc/mt6757.h
index f51e2617431ad1f97eba85a61020b4e4cfc09800..3427c49476db85eb55838985e18197448f888556 100755
--- a/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/inc/mt6757.h
+++ b/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/inc/mt6757.h
@@ -33,8 +33,8 @@
  * applicable license agreements with MediaTek Inc.
  */
 
-#ifndef MT8163_H
-#define MT8163_H
+#ifndef MT6757_H
+#define MT6757_H
 
 /*=======================================================================*/
 /* Constant Definitions                                                  */
@@ -50,7 +50,7 @@
 /*=======================================================================*/
 /* FIXME, these registers are defined for mt6589, not sure the corresponding register in mt6582*/
 #define TOPCKGEN_BASE       (IO_PHYS + 0x0000)
-#define CONFIG_BASE         (IO_PHYS + 0x1000)		/* FIXME do not list in MT8163 memory map*/
+#define CONFIG_BASE         (IO_PHYS + 0x1000)		/* FIXME do not list in MT6757 memory map*/
 #define INFRACFG_AO_BASE    (IO_PHYS + 0x1000)
 #define IOCFG_L_BASE        (IO_PHYS + 0x2000)
 #define IOCFG_B_BASE        (IO_PHYS + 0x2400)
@@ -68,11 +68,11 @@
 #define DDRPHY_BASE         (IO_PHYS + 0xF000)
 #define KPD_BASE            (IO_PHYS + 0x00010000)
 
-//#define DEM_BASE            (IO_PHYS + 0x0011A000)  /* FIXME do not list in MT8163 memory map*/
+//#define DEM_BASE            (IO_PHYS + 0x0011A000)  /* FIXME do not list in MT6757 memory map*/
 
 #define MCUSYS_CFGREG_BASE  (IO_PHYS + 0x00200000)
-#define CA7MCUCFG_BASE      (IO_PHYS + 0x00200100)	/* FIXME do not list in MT8163 memory map*/
-#define CA15L_CONFIG_BASE   (IO_PHYS + 0x00200200)	/* FIXME do not list in MT8163 memory map*/
+#define CA7MCUCFG_BASE      (IO_PHYS + 0x00200100)	/* FIXME do not list in MT6757 memory map*/
+#define CA15L_CONFIG_BASE   (IO_PHYS + 0x00200200)	/* FIXME do not list in MT6757 memory map*/
 #define SRAMROM_BASE        (IO_PHYS + 0x00202000)
 #define EMI_BASE            (IO_PHYS + 0x00203000)
 #define DRAMC_NAO_BASE      (IO_PHYS + 0x0020E000)
@@ -94,8 +94,8 @@
 #define SPI_BASE            (IO_PHYS + 0x0100A000)  
 #define NFI_BASE            (IO_PHYS + 0x0100D000)
 #define NFIECC_BASE         (IO_PHYS + 0x0100E000)
-//#define I2C3_BASE           (IO_PHYS + 0x01010000)	/* FIXME do not list in MT8163 memory map*/
-//#define I2C4_BASE           (IO_PHYS + 0x01011000)	/* FIXME do not list in MT8163 memory map*/
+//#define I2C3_BASE           (IO_PHYS + 0x01010000)	/* FIXME do not list in MT6757 memory map*/
+//#define I2C4_BASE           (IO_PHYS + 0x01011000)	/* FIXME do not list in MT6757 memory map*/
 #define USBSIF_BASE         (IO_PHYS + 0x01210000)  
 #define MSDC0_BASE          (IO_PHYS + 0x01230000)
 #define MSDC1_BASE          (IO_PHYS + 0x01240000)
@@ -103,8 +103,8 @@
 #define MSDC3_BASE          (IO_PHYS + 0x01260000)
 //#define U3D_BASE			(IO_PHYS + 0x01270000)
 #define USB_BASE			(IO_PHYS + 0x01200000)
-//#define USB_SIF_BASE		(IO_PHYS + 0x01280000)		/* FIXME do not list in MT8163 memory map*/
-//#define USB_SIF2_BASE		(IO_PHYS + 0x01290000)		/* FIXME do not list in MT8163 memory map*/
+//#define USB_SIF_BASE		(IO_PHYS + 0x01280000)		/* FIXME do not list in MT6757 memory map*/
+//#define USB_SIF2_BASE		(IO_PHYS + 0x01290000)		/* FIXME do not list in MT6757 memory map*/
 
 
 /*=======================================================================*/
@@ -126,9 +126,9 @@
 #define SSUSB_USB3_SYS_CSR_BASE			(U3D_BASE + 0x2400)
 #define SSUSB_USB2_CSR_BASE				(U3D_BASE + 0x3400)
 
-#define SSUSB_SIFSLV_IPPC_BASE				(USB_SIF_BASE + 0x700)	/* FIXME do not list in MT8163 memory map*/
-#define SSUSB_SIFSLV_U2PHY_COM_BASE			(USB_SIF_BASE + 0x800)	/* FIXME do not list in MT8163 memory map*/
-#define SSUSB_SIFSLV_U2PHY_COM_SIV_B_BASE	(USB_SIF2_BASE + 0x800)	/* FIXME do not list in MT8163 memory map*/
+#define SSUSB_SIFSLV_IPPC_BASE				(USB_SIF_BASE + 0x700)	/* FIXME do not list in MT6757 memory map*/
+#define SSUSB_SIFSLV_U2PHY_COM_BASE			(USB_SIF_BASE + 0x800)	/* FIXME do not list in MT6757 memory map*/
+#define SSUSB_SIFSLV_U2PHY_COM_SIV_B_BASE	(USB_SIF2_BASE + 0x800)	/* FIXME do not list in MT6757 memory map*/
 
 
 /*=======================================================================*/
diff --git a/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/mmc_core.c b/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/mmc_core.c
index 3da9f52171ec04a847c9f385717f3718275058b3..f8dc6ddd076c288190de46724e737df66b139d4e 100755
--- a/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/mmc_core.c
+++ b/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/mmc_core.c
@@ -3531,10 +3531,10 @@ u32 mmc_is_exist(u32 id)
 #define EFUSE_M_HW2_RES0                0x000061C0
 #define EFUSE_EMMC_MSDC3_DIS            (1ul <<  7)
 #define EFUSE_EMMC_MSDC0_DIS            (1ul <<  6)
-#define MT8163_IO_READ32(addr, index)   (*(volatile unsigned int*)((addr) + (index)))
+#define MT6757_IO_READ32(addr, index)   (*(volatile unsigned int*)((addr) + (index)))
 
-#define EFUSE_EMMC_MSDC3_IsDisabled()   (!!(MT8163_IO_READ32(EFUSE_BASE,EFUSE_M_HW2_RES0) & EFUSE_EMMC_MSDC3_DIS))
-#define EFUSE_EMMC_MSDC0_IsDisabled()   (!!(MT8163_IO_READ32(EFUSE_BASE,EFUSE_M_HW2_RES0) & EFUSE_EMMC_MSDC0_DIS))
+#define EFUSE_EMMC_MSDC3_IsDisabled()   (!!(MT6757_IO_READ32(EFUSE_BASE,EFUSE_M_HW2_RES0) & EFUSE_EMMC_MSDC3_DIS))
+#define EFUSE_EMMC_MSDC0_IsDisabled()   (!!(MT6757_IO_READ32(EFUSE_BASE,EFUSE_M_HW2_RES0) & EFUSE_EMMC_MSDC0_DIS))
 #endif
 u32 mmc_whoami(void)
 {
diff --git a/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/pll.c b/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/pll.c
index 728dfc449798fa3b7feefa0fe5be4e95b61a9c34..0e423c07dc62fdb617fde362daecd367d50022a6 100755
--- a/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/pll.c
+++ b/proprietary/bootable/bootloader/preloader/platform/mt6757/src/drivers/pll.c
@@ -2617,7 +2617,7 @@ void mt_pll_init(void)
     int ret = 0;
     unsigned int temp;
 
-    //MT8163 workaround
+    //MT6757 workaround
     #define NFI_1X_INFRA_SEL 0x10001098
     temp = DRV_Reg32(NFI_1X_INFRA_SEL);
     temp &= (0x1 << 10);
diff --git a/proprietary/bootable/recovery/applysig/Android.mk b/proprietary/bootable/recovery/applysig/Android.mk
deleted file mode 100755
index d13fe75c1217393b2a3f10fa42a6754de4cc4cc3..0000000000000000000000000000000000000000
--- a/proprietary/bootable/recovery/applysig/Android.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := applysig.c
-LOCAL_MODULE := libapplysig
-LOCAL_MULTILIB := both
-LOCAL_MODULE_TAGS := eng
-LOCAL_C_INCLUDES += external/bzip2 external/zlib bootable/recovery system/core/mkbootimg \
-                    vendor/mediatek/proprietary/bootable/recovery/utils/include
-
-LOCAL_STATIC_LIBRARIES += libmtdutils libstdc++
-
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := main.c
-LOCAL_MODULE := applysig
-LOCAL_C_INCLUDES += bootable/recovery
-LOCAL_STATIC_LIBRARIES += libapplysig libmtdutils libpartition
-LOCAL_SHARED_LIBRARIES += libcutils libstdc++ libc
-
-include $(BUILD_EXECUTABLE)
diff --git a/proprietary/external/AudioCompensationFilter/Android.mk b/proprietary/external/AudioCompensationFilter/Android.mk
deleted file mode 100755
index 18ed511e08c7f54016406ad60c15c72e4cb2f28c..0000000000000000000000000000000000000000
--- a/proprietary/external/AudioCompensationFilter/Android.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-ifneq ($(strip $(MTK_PLATFORM)),)
-LOCAL_PATH := $(my-dir)
-
-include $(CLEAR_VARS)
-
-ifeq ($(findstring MTK_AOSP_ENHANCEMENT,  $(COMMON_GLOBAL_CPPFLAGS)),)
-    LOCAL_CFLAGS += -DMTK_BASIC_PACKAGE
-endif
-
-LOCAL_SRC_FILES := \
-AudioCompFltCustParam.cpp
-
-LOCAL_C_INCLUDES := \
-    $(MTK_PATH_SOURCE)/external/audiocustparam \
-    $(MTK_PATH_SOURCE)/external/nvram/libnvram \
-    $(MTK_PATH_CUSTOM)/cgen/inc \
-    $(MTK_PATH_CUSTOM)/cgen/cfgfileinc \
-    $(MTK_PATH_CUSTOM)/cgen/cfgdefault
-
-
-
-LOCAL_SHARED_LIBRARIES := \
-    libcustom_nvram \
-    libnvram \
-    libnativehelper \
-    libcutils \
-    libutils \
-    libaudiocustparam
-
-# MTK Audio Tuning Tool Version
-LOCAL_C_INCLUDES += \
-        external/libxml2/include \
-        external/icu/icu4c/source/common \
-        $(JNI_H_INCLUDE) \
-        $(MTK_PATH_SOURCE)/external/AudioParamParser/include \
-        $(MTK_PATH_SOURCE)/external/AudioParamParser
-
-ifneq ($(MTK_AUDIO_TUNING_TOOL_VERSION),)
-  ifneq ($(strip $(MTK_AUDIO_TUNING_TOOL_VERSION)),V1)
-    MTK_AUDIO_TUNING_TOOL_V2_PHASE:=$(shell echo $(MTK_AUDIO_TUNING_TOOL_VERSION) | sed 's/V2.//g')
-    LOCAL_CFLAGS += -DMTK_AUDIO_HIERARCHICAL_PARAM_SUPPORT
-    LOCAL_CFLAGS += -DMTK_AUDIO_TUNING_TOOL_V2_PHASE=$(MTK_AUDIO_TUNING_TOOL_V2_PHASE)
-    LOCAL_SHARED_LIBRARIES += libaudio_param_parser
-    LOCAL_SHARED_LIBRARIES += libmedia
-  endif
-endif
-# MTK Audio Tuning Tool Version
-
-ifeq ($(MTK_STEREO_SPK_ACF_TUNING_SUPPORT),yes)
-  LOCAL_CFLAGS += -DMTK_STEREO_SPK_ACF_TUNING_SUPPORT
-endif
-
-ifeq ($(MTK_AUDIO_BLOUD_CUSTOMPARAMETER_REV),MTK_AUDIO_BLOUD_CUSTOMPARAMETER_V5)
-  LOCAL_CFLAGS += -DMTK_AUDIO_BLOUD_CUSTOMPARAMETER_V5
-else
-  ifeq ($(strip $(MTK_AUDIO_BLOUD_CUSTOMPARAMETER_REV)),MTK_AUDIO_BLOUD_CUSTOMPARAMETER_V4)
-    LOCAL_CFLAGS += -DMTK_AUDIO_BLOUD_CUSTOMPARAMETER_V4
-  endif
-endif
-
-LOCAL_MODULE := libaudiocompensationfilter
-
-LOCAL_MODULE_TAGS := optional
-
-#ifeq ($(MTK_AUDIO_A64_SUPPORT),yes)
-LOCAL_MULTILIB := both
-#else
-#LOCAL_MULTILIB := 32
-#endif
-
-include $(BUILD_SHARED_LIBRARY)
-endif
diff --git a/proprietary/external/AudioComponentEngine/Android.mk b/proprietary/external/AudioComponentEngine/Android.mk
deleted file mode 100755
index 94eeb51b52e766073897bab0d6f180ec299877a1..0000000000000000000000000000000000000000
--- a/proprietary/external/AudioComponentEngine/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-ifneq ($(strip $(MTK_PLATFORM)),)
-LOCAL_PATH := $(my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-MtkAudioBitConverter.cpp \
-MtkAudioSrc.cpp \
-MtkAudioLoud.cpp
-
-LOCAL_C_INCLUDES := \
-    $(MTK_PATH_SOURCE)/external/nvram/libnvram \
-    $(MTK_PATH_SOURCE)/external/AudioCompensationFilter \
-    $(MTK_PATH_SOURCE)/external/blisrc/blisrc32 \
-    $(MTK_PATH_SOURCE)/external/limiter \
-    $(MTK_PATH_SOURCE)/external/shifter \
-    $(MTK_PATH_SOURCE)/external/bessound_HD
-
-
-LOCAL_SHARED_LIBRARIES := \
-    libaudiocompensationfilter \
-    libnvram \
-    libnativehelper \
-    libcutils \
-    libutils \
-    libblisrc32 \
-    libbessound_hd_mtk \
-    libmtklimiter \
-    libmtkshifter
-
-ifeq ($(MTK_AUDIO_BLOUD_CUSTOMPARAMETER_REV),MTK_AUDIO_BLOUD_CUSTOMPARAMETER_V5)
-  LOCAL_CFLAGS += -DMTK_AUDIO_BLOUD_CUSTOMPARAMETER_V5
-else
-  ifeq ($(strip $(MTK_AUDIO_BLOUD_CUSTOMPARAMETER_REV)),MTK_AUDIO_BLOUD_CUSTOMPARAMETER_V4)
-    LOCAL_CFLAGS += -DMTK_AUDIO_BLOUD_CUSTOMPARAMETER_V4
-  endif
-endif
-
-LOCAL_MODULE := libaudiocomponentengine
-
-LOCAL_MODULE_TAGS := optional
-#ifeq ($(MTK_AUDIO_A64_SUPPORT),yes)
-LOCAL_MULTILIB := both
-#else
-#LOCAL_MULTILIB := 32
-#endif
-include $(BUILD_SHARED_LIBRARY)
-endif
diff --git a/proprietary/external/AudioDCRemoval/Android.mk b/proprietary/external/AudioDCRemoval/Android.mk
deleted file mode 100755
index c8286561fc1e8adef2cffbce39cef29880a95944..0000000000000000000000000000000000000000
--- a/proprietary/external/AudioDCRemoval/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-ifneq ($(strip $(MTK_PLATFORM)),)
-LOCAL_PATH := $(my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-AudioMTKDcRemoval.cpp
-
-LOCAL_C_INCLUDES := \
-	$(MTK_PATH_SOURCE)/external/audiodcremoveflt
-
-LOCAL_SHARED_LIBRARIES := \
-    libaudiodcrflt \
-    libnativehelper \
-    libcutils \
-    libutils 
-	
-LOCAL_MODULE := libaudiomtkdcremoval
-
-LOCAL_MODULE_TAGS := optional
-#ifeq ($(MTK_AUDIO_A64_SUPPORT),yes)#
-LOCAL_MULTILIB := both
-#else#
-#LOCAL_MULTILIB := 32#
-#endif#
-include $(BUILD_SHARED_LIBRARY)
-endif
diff --git a/proprietary/external/AudioParamParser/Android.mk b/proprietary/external/AudioParamParser/Android.mk
deleted file mode 100755
index 65a6aad8c58fde7212a2c01cb33525921b287077..0000000000000000000000000000000000000000
--- a/proprietary/external/AudioParamParser/Android.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-ifeq ($(strip $(MTK_APP_FORCE_ENABLE_CUS_XML_SUPPORT)),yes)
-	LOCAL_CFLAGS += APP_FORCE_ENABLE_CUS_XML
-endif
-
-ifeq ($(strip $(TARGET_BUILD_VARIANT)),eng)
-	LOCAL_CFLAGS += -DCONFIG_MT_ENG_BUILD
-endif
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES:= \
-	AudioCategory.c \
-	AudioParam.c \
-	AudioParamFieldInfo.c \
-	AudioParamParser.c \
-	AudioParamTreeView.c \
-	AudioParamUnit.c \
-	AudioType.c \
-	AudioUtils.c \
-	UnitTest.c \
-	guicon.cpp
-
-LOCAL_C_INCLUDES= \
-	external/libxml2/include \
-	external/icu/icu4c/source/common \
-	$(JNI_H_INCLUDE) \
-	$(LOCAL_PATH)/include \
-	$(MTK_PATH_SOURCE)/external/audiocustparam
-
-LOCAL_SHARED_LIBRARIES += \
-	libicuuc \
-	libutils \
-	libcutils \
-	libbinder \
-	libmedia \
-	libaudiocustparam
-
-LOCAL_STATIC_LIBRARIES := libxml2
-
-LOCAL_MODULE := libaudio_param_parser
-
-LOCAL_MULTILIB := both
-
-include $(BUILD_SHARED_LIBRARY)
-
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := eng
-
-LOCAL_SRC_FILES:= \
-	test/main.c
-
-LOCAL_C_INCLUDES= \
-	$(MTK_PATH_SOURCE)/external/AudioParamParser/ \
-	$(MTK_PATH_SOURCE)/external/AudioParamParser/include
-
-LOCAL_SHARED_LIBRARIES += \
-	libaudio_param_parser
-
-LOCAL_MODULE := audio_param_test
-
-#LOCAL_MULTILIB := 32
-
-include $(BUILD_EXECUTABLE)
-
-include $(LOCAL_PATH)/DeployAudioParam.mk
-
-include $(LOCAL_PATH)/GenAudioParamOptionsXml.mk
-
diff --git a/proprietary/external/AudioSpeechEnhancement/Android.mk b/proprietary/external/AudioSpeechEnhancement/Android.mk
deleted file mode 100755
index 93ef6df8837d877ea354de64b00bc61900e98d76..0000000000000000000000000000000000000000
--- a/proprietary/external/AudioSpeechEnhancement/Android.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(my-dir)
-
-include $(CLEAR_VARS)
-
-CHIP := $(shell echo $(MTK_PLATFORM) | tr A-Z a-z )
-ifeq ($(filter mt2601 mt6572 mt6582 mt6592 mt7623 ,$(CHIP)),)
-  DIR := V3
-else
-  DIR := V2
-endif
-
-LOCAL_MODULE := libspeech_enh_lib
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES_arm := $(DIR)/libspeech_enh_lib.so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_SRC_FILES_arm64 := $(DIR)/lib64speech_enh_lib.so
-LOCAL_MULTILIB := both
-
-include $(BUILD_PREBUILT)
diff --git a/proprietary/external/AudioTimeStretch/Android.mk b/proprietary/external/AudioTimeStretch/Android.mk
deleted file mode 100755
index 7620a8ab016d3ad2f41b23315d95d2b07d93892f..0000000000000000000000000000000000000000
--- a/proprietary/external/AudioTimeStretch/Android.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-LOCAL_PATH := $(my-dir)
-
-include $(CLEAR_VARS)
-#LOCAL_PREBUILT_LIBS := libtimestretch.so
-#LOCAL_MODULE_TAGS := optional
-#include $(BUILD_MULTI_PREBUILT)
-LOCAL_MODULE := libtimestretch
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES_arm := libtimestretch.so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_SRC_FILES_arm64 := lib64timestretch.so
-LOCAL_MULTILIB := both
-include $(BUILD_PREBUILT)
-
diff --git a/proprietary/external/LaunchPPPoe/Android.mk b/proprietary/external/LaunchPPPoe/Android.mk
deleted file mode 100755
index d2fe6e47f8b088c5b44a627ea2db06ec6d44e513..0000000000000000000000000000000000000000
--- a/proprietary/external/LaunchPPPoe/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= LanunchPPPoe.c
-LOCAL_CFLAGS := -Werror=format
-LOCAL_MODULE:= launchpppoe
-LOCAL_C_INCLUDES := system/core/include/netutils/ system/core/include/cutils/
-LOCAL_SHARED_LIBRARIES := libcutils libnetutils                     
-
-include $(BUILD_EXECUTABLE)
diff --git a/proprietary/external/SRS_AudioEffect/SRSTruMedia/Android.mk b/proprietary/external/SRS_AudioEffect/SRSTruMedia/Android.mk
deleted file mode 100755
index 3d207edf055a5fb225045bc0d3bd894b8553a69f..0000000000000000000000000000000000000000
--- a/proprietary/external/SRS_AudioEffect/SRSTruMedia/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-ifeq ($(strip $(HAVE_SRSAUDIOEFFECT_FEATURE)),yes)
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := DTSTruMedia
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := platform
-include $(BUILD_PREBUILT)
-
-endif
diff --git a/proprietary/external/SRS_AudioEffect/srs_processing/Android.mk b/proprietary/external/SRS_AudioEffect/srs_processing/Android.mk
deleted file mode 100755
index ecfd91b86c13ccbf754faaf5c2df370153f96f5e..0000000000000000000000000000000000000000
--- a/proprietary/external/SRS_AudioEffect/srs_processing/Android.mk
+++ /dev/null
@@ -1,639 +0,0 @@
-ifeq ($(strip $(MTK_AUDIO)),yes)
-ifeq ($(strip $(HAVE_SRSAUDIOEFFECT_FEATURE)),yes)
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-include $(LOCAL_PATH)/CONFIG.mk $(LOCAL_PATH)/license/LICENSE.mk
-
-################################################################################
-#### BUILD SETUP - DO NOT EDIT #################################################
-
-VCHECK_EMPTY :=
-VCHECK_SPACE := $(VCHECK_EMPTY) $(VCHECK_EMPTY)
-VCHECK_DOT := .
-VCHECK_NUMS := $(subst $(VCHECK_DOT),$(VCHECK_SPACE),$(PLATFORM_VERSION))
-
-ifeq ($(word 1,$(VCHECK_NUMS)),3)
-AND_PLAT_HONEY := true
-endif
-
-ifeq ($(word 1,$(VCHECK_NUMS)),4)
-ifeq ($(word 2,$(VCHECK_NUMS)),0)
-AND_PLAT_ICS := true
-endif
-ifeq ($(word 2,$(VCHECK_NUMS)),1)
-AND_PLAT_JB := true
-endif
-ifeq ($(word 2,$(VCHECK_NUMS)),2)
-AND_PLAT_JB := true
-endif
-ifeq ($(word 2,$(VCHECK_NUMS)),3)
-AND_PLAT_JB := true
-endif
-ifeq ($(word 2,$(VCHECK_NUMS)),4)
-AND_PLAT_KK := true
-endif
-endif
-
-ifeq ($(word 1,$(VCHECK_NUMS)),5)
-ifeq ($(word 2,$(VCHECK_NUMS)),0)
-AND_PLAT_L := true
-endif
-endif 
-
-AND_PLAT_EXT :=
-AND_PLAT_INDEX := 7
-
-ifeq ($(AND_PLAT_HONEY),true)
-AND_PLAT_INDEX := 8
-endif
-
-ifeq ($(AND_PLAT_ICS),true)
-AND_PLAT_EXT := _ics
-AND_PLAT_INDEX := 9
-endif
-
-ifeq ($(AND_PLAT_JB),true)
-AND_PLAT_EXT := _jb
-AND_PLAT_INDEX := 10
-endif
-
-ifeq ($(AND_PLAT_KK),true)
-AND_PLAT_EXT := _kk
-AND_PLAT_INDEX := 11
-endif
-
-ifeq ($(AND_PLAT_L),true)
-AND_PLAT_EXT := _l
-AND_PLAT_INDEX := 12
-endif
-
-#ifeq ($(TARGET_ARCH),arm)
-SRSLIB_PLAT := ARMV5TE_LE
-SRSLIB_PATH := srs_libs_arm
-#endif
-
-#ifeq ($(TARGET_ARCH),arm64)
-#SRSLIB_PLAT := ARMV8_LE
-#SRSLIB_PATH := srs_libs_arm64
-#endif
-
-#ifeq ($(TARGET_ARCH),aarch64)
-#SRSLIB_PLAT := ARMV8_LE
-#SRSLIB_PATH := srs_libs_arm64
-#endif
-
-ifeq ($(TARGET_ARCH),x86)
-SRSLIB_PLAT := x86
-SRSLIB_PATH := srs_libs_x86
-endif
-
-######################################################################################
-#### ENVIRONMENT CONFIG - SETUP BASED ON ENVIRONMENT VARIABLES #######################
-
-ifneq (,$(SRS_ENV_PRODUCT))
-SRS_PRODUCT := $(SRS_ENV_PRODUCT)
-endif
-
-ifneq (,$(SRS_ENV_VARIANT))
-SRS_VARIANT := $(SRS_ENV_VARIANT)
-endif
-
-ifneq (,$(SRS_ENV_TAGS))
-SRS_TAGS := $(SRS_ENV_TAGS)
-endif
-
-ifneq (,$(SRS_ENV_FEATURES))
-SRS_FEATURES := $(SRS_ENV_FEATURES)
-endif
-
-################################################################################
-#### AUTO CONFIG - SETUP BASED ON BUILD CONFIG VARIABLES #######################
-
-ifeq ($(SRS_PRODUCT),trumedia_hd)
-SRS_TECH_WOWHDX := true
-SRS_TECH_HPF := true
-SRS_TECH_CSHP := true
-SRS_TECH_AEQ := true
-SRS_TECH_HLIMIT := true
-endif
-
-ifeq ($(SRS_PRODUCT),trumedia)
-SRS_TECH_WOWHDX := true
-SRS_TECH_HPF := true
-SRS_TECH_CSHP := true
-SRS_TECH_AEQ := true
-SRS_TECH_HLIMIT := true
-endif
-
-ifneq (,$(findstring userpeq,$(SRS_FEATURES)))
-SRS_TECH_USERPEQ := true
-endif
-
-ifneq (,$(findstring usergeq,$(SRS_FEATURES)))
-SRS_TECH_GEQ := true
-endif
-
-ifeq ($(SRS_TECH_USERPEQ),true)
-SRS_TECH_AEQ := true
-endif
-
-ifeq ($(SRS_TECH_WOWHDX),true)
-SRS_TECHLIB_SRS3D := true
-SRS_TECHLIB_SA_TRUBASS := true
-SRS_TECHLIB_WIDESUR := true
-SRS_TECHLIB_FFT := true
-SRS_TECHLIB_DESIGN := true
-endif
-
-ifeq ($(SRS_TECH_WOWHD),true)
-SRS_TECHLIB_SRS3D := true
-SRS_TECHLIB_SA_TRUBASS := true
-SRS_TECHLIB_DESIGN := true
-endif
-
-ifeq ($(SRS_TECH_CSHP),true)
-SRS_TECHLIB_CSDECODE := true
-SRS_TECHLIB_DESIGN := true
-SRS_TECHLIB_HP360 := true
-SRS_TECHLIB_SA_TRUBASS := true
-endif
-
-ifeq ($(SRS_TECH_AEQ),true)
-SRS_TECHLIB_AEQ := true
-SRS_TECHLIB_FFT := true
-SRS_TECHLIB_DESIGN := true
-endif
-
-
-################################################################################
-#### BUILD STATIC LIBRARY RULES ################################################
-
-ifeq ($(SRS_TECH_WOWHDX),true)
-include $(CLEAR_VARS)
-LOCAL_MODULE := srs_wowhdx_$(SRSLIB_PLAT)_NDK
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MULTILIB := 32
-LOCAL_ARM_MODE := arm
-LOCAL_SRC_FILES_arm := $(SRSLIB_PATH)/srs_wowhdx_$(SRSLIB_PLAT)_NDK.a
-LOCAL_MODULE_SUFFIX := .a
-include $(BUILD_PREBUILT)
-endif
-
-ifeq ($(SRS_TECH_WOWHD),true)
-include $(CLEAR_VARS)
-LOCAL_MODULE := srs_wowhd_$(SRSLIB_PLAT)_NDK
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MULTILIB := 32
-LOCAL_ARM_MODE := arm
-LOCAL_SRC_FILES_arm := $(SRSLIB_PATH)/srs_wowhd_$(SRSLIB_PLAT)_NDK.a
-LOCAL_MODULE_SUFFIX := .a
-include $(BUILD_PREBUILT)
-endif
-
-ifeq ($(SRS_TECH_CSHP),true)
-include $(CLEAR_VARS)
-LOCAL_MODULE := srs_cshp_$(SRSLIB_PLAT)_NDK
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MULTILIB := 32
-LOCAL_ARM_MODE := arm
-LOCAL_SRC_FILES_arm := $(SRSLIB_PATH)/srs_cshp_$(SRSLIB_PLAT)_NDK.a
-LOCAL_MODULE_SUFFIX := .a
-include $(BUILD_PREBUILT)
-endif
-
-ifeq ($(SRS_TECH_HLIMIT),true)
-include $(CLEAR_VARS)
-LOCAL_MODULE := srs_hardlimiter_$(SRSLIB_PLAT)_NDK
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MULTILIB := 32
-LOCAL_ARM_MODE := arm
-LOCAL_SRC_FILES_arm := $(SRSLIB_PATH)/srs_hardlimiter_$(SRSLIB_PLAT)_NDK.a
-LOCAL_MODULE_SUFFIX := .a
-include $(BUILD_PREBUILT)
-endif
-
-ifeq ($(SRS_TECHLIB_WIDESUR),true)
-include $(CLEAR_VARS)
-LOCAL_MODULE := srs_widesrd_$(SRSLIB_PLAT)_NDK
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MULTILIB := 32
-LOCAL_ARM_MODE := arm
-LOCAL_SRC_FILES_arm := $(SRSLIB_PATH)/srs_widesrd_$(SRSLIB_PLAT)_NDK.a
-LOCAL_MODULE_SUFFIX := .a
-include $(BUILD_PREBUILT)
-endif
-
-ifeq ($(SRS_TECHLIB_SRS3D),true)
-include $(CLEAR_VARS)
-LOCAL_MODULE := srs_srs3d_$(SRSLIB_PLAT)_NDK
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MULTILIB := 32
-LOCAL_ARM_MODE := arm
-LOCAL_SRC_FILES_arm := $(SRSLIB_PATH)/srs_srs3d_$(SRSLIB_PLAT)_NDK.a
-LOCAL_MODULE_SUFFIX := .a
-include $(BUILD_PREBUILT)
-endif
-
-ifeq ($(SRS_TECHLIB_CSDECODE),true)
-include $(CLEAR_VARS)
-LOCAL_MODULE := srs_csdecoder_$(SRSLIB_PLAT)_NDK
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MULTILIB := 32
-LOCAL_ARM_MODE := arm
-LOCAL_SRC_FILES_arm := $(SRSLIB_PATH)/srs_csdecoder_$(SRSLIB_PLAT)_NDK.a
-LOCAL_MODULE_SUFFIX := .a
-include $(BUILD_PREBUILT)
-endif
-
-ifeq ($(SRS_TECHLIB_HP360),true)
-include $(CLEAR_VARS)
-LOCAL_MODULE := srs_hp360_$(SRSLIB_PLAT)_NDK
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MULTILIB := 32
-LOCAL_ARM_MODE := arm
-LOCAL_SRC_FILES_arm := $(SRSLIB_PATH)/srs_hp360_$(SRSLIB_PLAT)_NDK.a
-LOCAL_MODULE_SUFFIX := .a
-include $(BUILD_PREBUILT)
-endif
-
-ifeq ($(SRS_TECHLIB_SA_TRUBASS),true)
-include $(CLEAR_VARS)
-LOCAL_MODULE := srs_tbhd_$(SRSLIB_PLAT)_NDK
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MULTILIB := 32
-LOCAL_ARM_MODE := arm
-LOCAL_SRC_FILES_arm := $(SRSLIB_PATH)/srs_tbhd_$(SRSLIB_PLAT)_NDK.a
-LOCAL_MODULE_SUFFIX := .a
-include $(BUILD_PREBUILT)
-endif
-
-ifeq ($(SRS_TECHLIB_FFT),true)
-include $(CLEAR_VARS)
-LOCAL_MODULE := srs_fft_$(SRSLIB_PLAT)_NDK
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MULTILIB := 32
-LOCAL_ARM_MODE := arm
-LOCAL_SRC_FILES_arm := $(SRSLIB_PATH)/srs_fft_$(SRSLIB_PLAT)_NDK.a
-LOCAL_MODULE_SUFFIX := .a
-include $(BUILD_PREBUILT)
-endif
-
-ifeq ($(SRS_TECHLIB_DESIGN),true)
-include $(CLEAR_VARS)
-LOCAL_MODULE := srs_designer_$(SRSLIB_PLAT)_NDK
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MULTILIB := 32
-LOCAL_ARM_MODE := arm
-LOCAL_SRC_FILES_arm := $(SRSLIB_PATH)/srs_designer_$(SRSLIB_PLAT)_NDK.a
-LOCAL_MODULE_SUFFIX := .a
-include $(BUILD_PREBUILT)
-endif
-
-ifeq ($(SRS_TECHLIB_AEQ),true)
-include $(CLEAR_VARS)
-LOCAL_MODULE := srs_aeq_$(SRSLIB_PLAT)_NDK
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MULTILIB := 32
-LOCAL_ARM_MODE := arm
-LOCAL_SRC_FILES_arm := $(SRSLIB_PATH)/srs_aeq_$(SRSLIB_PLAT)_NDK.a
-LOCAL_MODULE_SUFFIX := .a
-include $(BUILD_PREBUILT)
-endif
-
-ifeq ($(SRS_TECH_GEQ),true)
-include $(CLEAR_VARS)
-LOCAL_MODULE := srs_geq_$(SRSLIB_PLAT)_NDK
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MULTILIB := 32
-LOCAL_ARM_MODE := arm
-LOCAL_SRC_FILES_arm := $(SRSLIB_PATH)/srs_geq_$(SRSLIB_PLAT)_NDK.a
-LOCAL_MODULE_SUFFIX := .a
-include $(BUILD_PREBUILT)
-endif
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := srs_common_$(SRSLIB_PLAT)_NDK
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MULTILIB := 32
-LOCAL_ARM_MODE := arm
-LOCAL_SRC_FILES_arm := $(SRSLIB_PATH)/srs_common_$(SRSLIB_PLAT)_NDK.a
-LOCAL_MODULE_SUFFIX := .a
-include $(BUILD_PREBUILT)
-
-# License libraries needed by both SRS license and dsec
-include $(CLEAR_VARS)
-LOCAL_MODULE := libsrs_spool_$(SRS_PROTECT_TYPE)_$(SRSLIB_PLAT)_NDK
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MULTILIB := 32
-LOCAL_ARM_MODE := arm
-LOCAL_SRC_FILES_arm := license/libsrs_spool_$(SRS_PROTECT_TYPE)_$(SRSLIB_PLAT)_NDK.a
-LOCAL_MODULE_SUFFIX := .a
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libdts-security-dsec_$(SRSLIB_PLAT)_NDK
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MULTILIB := 32
-LOCAL_ARM_MODE := arm
-LOCAL_SRC_FILES_arm := license/libdts-security-dsec_$(SRSLIB_PLAT)_NDK.a
-LOCAL_MODULE_SUFFIX := .a
-include $(BUILD_PREBUILT)
-
-
-
-################################################################################
-#### BUILD LIBSRSPROCESSING.SO RULES ###########################################
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE:= libsrsprocessing
-LOCAL_MODULE_TAGS := eng
-LOCAL_32_BIT_ONLY := true
-LOCAL_PRELINK_MODULE := false
-
-LOCAL_SRC_FILES := \
-    srs_techs/srs_tech_tools.cpp \
-    srs_processing.cpp \
-    srs_workspace.cpp \
-    srs_params.cpp
-
-LOCAL_SRC_FILES += srs_subs/srs_routing.cpp
-
-#ifeq ($(TARGET_ARCH),arm)
-LOCAL_MULTILIB := 32
-LOCAL_ARM_MODE := arm
-#else ifeq ($(TARGET_ARCH),arm64)
-#LOCAL_MULTILIB := 64
-#LOCAL_ARM_MODE := arm64
-#else ifeq ($(TARGET_ARCH),aarch64)
-#LOCAL_MULTILIB := 64
-#LOCAL_ARM_MODE := arm64
-#endif
-
-# Enable 32-bit processing
-LOCAL_CFLAGS += -D_SRS_PROC_32BIT
-
-# Enable android synchronization between setParameter() and Config()
-LOCAL_CFLAGS += -D_SRS_PROC_ANDROID_SYNCHRONIZE
-
-LOCAL_SRC_FILES += srs_trumedia.cpp
-
-ifeq ($(SRS_PRODUCT),trumedia_hd)
-LOCAL_CFLAGS += -D_SRSCFG_TRUMEDIA_HD
-endif
-
-ifeq ($(SRS_PRODUCT),trumedia)
-LOCAL_CFLAGS += -D_SRSCFG_TRUMEDIA
-endif
-
-
-ifeq ($(SRS_TECH_HPF),true)
-LOCAL_SRC_FILES += srs_techs/srs_tech_hpf.cpp
-endif
-
-ifeq ($(SRS_TECH_WOWHDX),true)
-LOCAL_SRC_FILES += srs_techs/srs_tech_wowhdx.cpp
-LOCAL_STATIC_LIBRARIES += srs_wowhdx_$(SRSLIB_PLAT)_NDK
-LOCAL_CFLAGS += -D_SRSCFG_WOWHDX
-endif
-
-ifeq ($(SRS_TECH_WOWHD),true)
-LOCAL_SRC_FILES += srs_techs/srs_tech_wowhd.cpp
-LOCAL_STATIC_LIBRARIES += srs_wowhd_$(SRSLIB_PLAT)_NDK
-endif
-
-ifeq ($(SRS_TECH_CSHP),true)
-LOCAL_SRC_FILES += srs_techs/srs_tech_cshp.cpp
-LOCAL_STATIC_LIBRARIES += srs_cshp_$(SRSLIB_PLAT)_NDK
-endif
-
-ifeq ($(SRS_TECH_USERPEQ),true)
-LOCAL_SRC_FILES += srs_techs/srs_tech_userpeq.cpp
-LOCAL_CFLAGS += -D_SRSCFG_USERPEQ
-endif
-
-ifeq ($(SRS_TECH_AEQ),true)
-LOCAL_SRC_FILES += srs_techs/srs_tech_aeq.cpp
-LOCAL_SRC_FILES += libb64/src/cdecode.c
-LOCAL_C_INCLUDES = $(LOCAL_PATH)/libb64/include
-endif
-
-ifeq ($(SRS_TECH_HLIMIT),true)
-LOCAL_SRC_FILES += srs_techs/srs_tech_hlimit.cpp
-LOCAL_STATIC_LIBRARIES += srs_hardlimiter_$(SRSLIB_PLAT)_NDK
-endif
-
-ifeq ($(SRS_TECHLIB_WIDESUR),true)
-LOCAL_STATIC_LIBRARIES += srs_widesrd_$(SRSLIB_PLAT)_NDK
-endif
-
-ifeq ($(SRS_TECHLIB_CSDECODE),true)
-LOCAL_STATIC_LIBRARIES += srs_csdecoder_$(SRSLIB_PLAT)_NDK
-endif
-
-ifeq ($(SRS_TECHLIB_HP360),true)
-LOCAL_STATIC_LIBRARIES += srs_hp360_$(SRSLIB_PLAT)_NDK
-endif
-
-ifeq ($(SRS_TECHLIB_SRS3D),true)
-LOCAL_STATIC_LIBRARIES += srs_srs3d_$(SRSLIB_PLAT)_NDK
-endif
-
-ifeq ($(SRS_TECHLIB_SA_TRUBASS),true)
-LOCAL_STATIC_LIBRARIES += srs_tbhd_$(SRSLIB_PLAT)_NDK
-endif
-
-ifeq ($(SRS_TECHLIB_FFT),true)
-LOCAL_STATIC_LIBRARIES += srs_fft_$(SRSLIB_PLAT)_NDK
-endif
-
-ifeq ($(SRS_TECHLIB_DESIGN),true)
-LOCAL_STATIC_LIBRARIES += srs_designer_$(SRSLIB_PLAT)_NDK
-endif
-
-ifeq ($(SRS_TECHLIB_AEQ),true)
-LOCAL_STATIC_LIBRARIES += srs_aeq_$(SRSLIB_PLAT)_NDK
-endif
-
-ifeq ($(SRS_TECH_GEQ),true)
-LOCAL_SRC_FILES += srs_techs/srs_tech_geq.cpp
-LOCAL_STATIC_LIBRARIES += srs_geq_$(SRSLIB_PLAT)_NDK
-LOCAL_CFLAGS += -D_SRSCFG_MOBILE_EQ
-
-ifneq (,$(findstring extendgeq,$(SRS_FEATURES)))
-LOCAL_CFLAGS += -D_SRSCFG_MOBILE_EQ_EXTENDED
-else
-LOCAL_CFLAGS += -D_SRSCFG_MOBILE_EQ_BASIC
-endif
-
-endif
-
-# License libraries needed by both SRS license and dsec
-LOCAL_STATIC_LIBRARIES += libsrs_spool_$(SRS_PROTECT_TYPE)_$(SRSLIB_PLAT)_NDK
-LOCAL_STATIC_LIBRARIES += libdts-security-dsec_$(SRSLIB_PLAT)_NDK
-
-#DSPOFFLOAD_PATH :=vendor_qdsp/QDSP.mk
-#ifneq (,$(DSPOFFLOAD_PATH))
-#include $(LOCAL_PATH)/$(DSPOFFLOAD_PATH)
-#endif
-
-LOCAL_STATIC_LIBRARIES += srs_common_$(SRSLIB_PLAT)_NDK
-ifeq ($(AND_PLAT_ICS),true)
-LOCAL_STATIC_LIBRARIES += libmedia_helper
-endif
-
-ifeq ($(AND_PLAT_JB),true)
-LOCAL_STATIC_LIBRARIES += libmedia_helper
-endif
-
-ifeq ($(AND_PLAT_KK),true)
-LOCAL_STATIC_LIBRARIES += libmedia_helper
-endif
-
-ifeq ($(AND_PLAT_L),true)
-LOCAL_STATIC_LIBRARIES += libmedia_helper
-endif
-
-LOCAL_SHARED_LIBRARIES += \
-    libcutils \
-    libutils \
-    libmedia
-
-LOCAL_C_INCLUDES += frameworks/base/libs/audioflinger
-
-LOCAL_CFLAGS += -DSRS_BASECFG_READPATH=$(SRS_BASECFG_READPATH)
-LOCAL_CFLAGS += -DSRS_USERCFG_PATH=$(SRS_USERCFG_PATH)
-LOCAL_CFLAGS += -D_SRSCFG_LIBVARIANT=$(SRS_VARIANT)
-
-ifeq ($(TARGET_ARCH),arm)
-LOCAL_CFLAGS += -D_SRSCFG_ARCH_ARM
-endif
-
-ifeq ($(TARGET_ARCH),arm64)
-LOCAL_CFLAGS += -D_SRSCFG_ARCH_ARM64
-endif
-
-ifeq ($(TARGET_ARCH),aarch64)
-LOCAL_CFLAGS += -D_SRSCFG_ARCH_ARM64
-endif
-
-ifeq ($(TARGET_ARCH),x86)
-LOCAL_CFLAGS += -D_SRSCFG_ARCH_X86
-endif
-
-ifneq (,$(POSTPRO_PROPGATE))
-LOCAL_CFLAGS += -DPOSTPRO_PROPGATE
-endif
-
-ifeq ($(SRS_USERCFG_ALLOW),true)
-LOCAL_CFLAGS += -DSRS_USERCFG_ALLOW
-endif
-
-ifeq ($(SRS_USERCFG_UNLOCKED),true)
-LOCAL_CFLAGS += -DSRS_USERCFG_UNLOCKED
-endif
-
-ifneq (,$(findstring logging,$(SRS_FEATURES)))
-LOCAL_CFLAGS += -DSRS_VERBOSE
-endif
-
-ifneq (,$(findstring audiolog,$(SRS_FEATURES)))
-LOCAL_CFLAGS += -DSRS_AUDIOLOG
-LOCAL_CFLAGS += -DSRS_AUDIOLOG_PREPATH=$(SRS_AUDIOLOG_PREPATH)
-LOCAL_CFLAGS += -DSRS_AUDIOLOG_POSTPATH=$(SRS_AUDIOLOG_POSTPATH)
-
-ifneq (,$(findstring audiosesslog,$(SRS_FEATURES)))
-LOCAL_CFLAGS += -DSRS_AUDIOLOG_MARKERS
-endif
-
-endif
-
-ifneq (,$(findstring forcesilence,$(SRS_FEATURES)))
-LOCAL_CFLAGS += -DSRS_FORCE_SILENCE
-endif
-
-LOCAL_CFLAGS += -DSRS_AND_PLAT_INDEX=$(AND_PLAT_INDEX)
-
-STAGS_EMPTY :=
-STAGS_SPACE := $(STAGS_EMPTY) $(STAGS_EMPTY)
-STAGS_COMMA := ,
-STAGS_SEP := ^
-SRS_TAGS_NOSPACE := $(subst $(STAGS_SPACE),$(STAGS_SEP),$(SRS_TAGS))
-SRS_TAGS_OUT := $(subst $(STAGS_COMMA),$(STAGS_SEP),$(SRS_TAGS_NOSPACE))
-
-LOCAL_CFLAGS += -DSRS_TAGS=$(SRS_TAGS_OUT)
-
-ifeq ($(SRS_PROTECT_TYPE),license)
-LOCAL_CFLAGS += -DSRS_PROTECT_PATH=$(SRS_PROTECT_PATH)
-LOCAL_CFLAGS += -DSRS_PROTECT_AUTHID=$(SRS_PROTECT_AUTHID)
-endif
-
-ifeq ($(SRS_PROTECT_TYPE),dsec)
-LOCAL_CFLAGS += -DSRS_PROTECT_PATH=$(DSEC_PATH)
-LOCAL_CFLAGS += -DSRS_PROTECT_AUTHID=$(DSEC_AUTHID)
-endif
-
-ifneq (,$(findstring perftrack,$(SRS_FEATURES)))
-LOCAL_CFLAGS += -D_SRSCFG_PERFTRACK
-endif
-
-ifeq ($(SRS_PARAMWRITE_CFG),false)
-LOCAL_CFLAGS += -DSRS_PARAMWRITE_CFG_BLOCK
-endif
-
-ifeq ($(SRS_PARAMWRITE_PREF),false)
-LOCAL_CFLAGS += -DSRS_PARAMWRITE_PREF_BLOCK
-endif
-
-ifeq ($(SRS_PARAMREAD_INFO),false)
-LOCAL_CFLAGS += -DSRS_PARAMREAD_INFO_BLOCK
-endif
-
-ifeq ($(SRS_PARAMREAD_DEBUG),false)
-LOCAL_CFLAGS += -DSRS_PARAMREAD_DEBUG_BLOCK
-endif
-
-ifeq ($(SRS_PARAMREAD_CFG),false)
-LOCAL_CFLAGS += -DSRS_PARAMREAD_CFG_BLOCK
-endif
-
-ifeq ($(SRS_PARAMREAD_PREF),false)
-LOCAL_CFLAGS += -DSRS_PARAMREAD_PREF_BLOCK
-endif
-
-ifneq (,$(SRS_AEQ_FIR_COEFF_FILE_PATH))
-LOCAL_CFLAGS += -DSRS_AEQ_COEFF_FROM_FILE
-LOCAL_CFLAGS += -DSRS_AEQ_FIR_COEFF_FILE_PATH=$(SRS_AEQ_FIR_COEFF_FILE_PATH)
-endif
-
-ifeq ($(TARGET_SIMULATOR),true)
- LOCAL_LDLIBS += -ldl
-else
- LOCAL_SHARED_LIBRARIES += libdl
-endif
-
-ifeq ($(TARGET_SIMULATOR),true)
-    ifeq ($(HOST_OS),linux)
-        LOCAL_LDLIBS += -lrt -lpthread
-    endif
-endif
-
-#ifeq ($(TARGET_ARCH),arm)
-    LOCAL_LDFLAGS += -Wl,--no-warn-shared-textrel
-#endif
-
-#FORCE_COMPAT := true
-
-ifeq ($(TARGET_ARCH),arm)
-    ifeq ($(FORCE_COMPAT),true)
-    LOCAL_CFLAGS += -fno-exceptions \
-        -march=armv6 \
-        -mthumb-interwork \
-        -mfloat-abi=softfp \
-        -g
-    endif
-endif
-include $(BUILD_SHARED_LIBRARY)
-endif
-endif
diff --git a/proprietary/external/VideoSpeedEffect/Android.mk b/proprietary/external/VideoSpeedEffect/Android.mk
deleted file mode 100755
index 941e8c2253bec010eec60269037cf0abbf74015e..0000000000000000000000000000000000000000
--- a/proprietary/external/VideoSpeedEffect/Android.mk
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2014. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-ifneq ($(strip $(MTK_USE_ANDROID_MM_DEFAULT_CODE)),yes)
-
-ifeq ($(strip $(MTK_SLOW_MOTION_VIDEO_SUPPORT)),yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-
-LOCAL_SRC_FILES += \
-				VideoSpeedEffect.cpp
-				
-LOCAL_C_INCLUDES:= \
-				$(TOP)/$(MTK_PATH_SOURCE)/frameworks-ext/av/include \
-				$(TOP)/frameworks/av/services/audioflinger \
-				$(TOP)/$(MTK_PATH_SOURCE)/external/AudioTimeStretch/inc \
-        $(TOP)/frameworks/av/include \
-         $(TOP)/frameworks/native/include \
-        $(TOP)/frameworks/av/include/mediapwd \
-        $(TOP)/$(MTK_ROOT)/frameworks/native/include/media/openmax \
-        	$(TOP)/$(MTK_PATH_SOURCE)/frameworks/av/media/libstagefright/include/omx_core \
-				$(TOP)/$(MTK_PATH_SOURCE)/hardware/dpframework/inc \
-				$(TOP)/$(MTK_PATH_SOURCE)/external/mhal/src/core/drv/inc \
-				$(TOP)/$(MTK_PATH_SOURCE)/external/mhal/inc \
-  
-LOCAL_SHARED_LIBRARIES := \
-      libbinder                 \
-      libmedia                  \
-      libutils                  \
-      libcutils                 \
-      libui		        \
-      libgui                    \
-      libskia                   \
-      libstagefright            \
-      libstagefright_foundation \
-      libtimestretch	        \
-      libMTKAudioTimeStretch	\
-      libdpframework            \
-      libvcodecdrv              \
-      
-      
-LOCAL_CFLAGS += -Wno-multichar
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE:= libMtkVideoSpeedEffect
-
-include $(BUILD_SHARED_LIBRARY)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-################################################################################
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:=         \
-        VideoSpeedEffectTest.cpp
-
-LOCAL_SHARED_LIBRARIES := \
-	libstagefright liblog libutils libcutils libbinder libstagefright_foundation
-
-LOCAL_SHARED_LIBRARIES  += \
-        libMtkVideoSpeedEffect \
-
-LOCAL_C_INCLUDES:= \
-	frameworks/av/media/libstagefright \
-	$(TOP)/frameworks/native/include/media/openmax
-
-LOCAL_CFLAGS += -Wno-multichar
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE:= VideoSpeedEffectTest
-LOCAL_32_BIT_ONLY := true
-
-include $(BUILD_EXECUTABLE)
-
-################################################################################
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:=         \
-        VideoParseInfoTest.cpp
-
-LOCAL_SHARED_LIBRARIES := \
-	libstagefright liblog libutils libcutils libbinder libstagefright_foundation
-
-LOCAL_SHARED_LIBRARIES  += \
-
-LOCAL_C_INCLUDES:= \
-	$(TOP)/frameworks/av/include \
-  $(TOP)/frameworks/native/include \
-  $(TOP)/frameworks/av/media/libstagefright \
-  $(TOP)/frameworks/av/include/media/stagefright \
-
-LOCAL_CFLAGS += -Wno-multichar
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE:= VideoParseInfoTest
-LOCAL_32_BIT_ONLY := true
-
-include $(BUILD_EXECUTABLE)
-
-
-endif
-
-
-endif
diff --git a/proprietary/external/adpcmdec/Android.mk b/proprietary/external/adpcmdec/Android.mk
deleted file mode 100755
index fc384163b8a3f92a8ff0264b546ed5887166fb75..0000000000000000000000000000000000000000
--- a/proprietary/external/adpcmdec/Android.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-LOCAL_PATH := $(my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libadpcmdec_mtk
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_SRC_FILES_32 := arm/libadpcmdec_mtk.a
-LOCAL_SRC_FILES_64 := libadpcmdec_mtk.a
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MULTILIB := both
-include $(BUILD_PREBUILT)
diff --git a/proprietary/external/adpcmenc/Android.mk b/proprietary/external/adpcmenc/Android.mk
deleted file mode 100755
index e4b0b46493925c66b74aac3468ef82ca738e94a7..0000000000000000000000000000000000000000
--- a/proprietary/external/adpcmenc/Android.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-LOCAL_PATH := $(my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libadpcmenc_mtk
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_SRC_FILES_32 := arm/libadpcmenc_mtk.a
-LOCAL_SRC_FILES_64 := libadpcmenc_mtk.a
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MULTILIB := both
-include $(BUILD_PREBUILT)
diff --git a/proprietary/external/aee/binary/Android.mk b/proprietary/external/aee/binary/Android.mk
deleted file mode 100755
index 2df564773eb77264752a90ae77456f087381bf87..0000000000000000000000000000000000000000
--- a/proprietary/external/aee/binary/Android.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-LOCAL_PATH:= $(call my-dir)
-
-ifeq ($(HAVE_AEE_FEATURE),yes)
-include $(CLEAR_VARS)
-
-LOCAL_PREBUILT_EXECUTABLES := \
-	bin/aee \
-	bin/aee_core_forwarder \
-	bin/aee_dumpstate \
-	bin/rtt \
-	bin/aee_archive
-include $(BUILD_MULTI_PREBUILT)
-
-endif # HAVE_AEE_FEATURE=yes
-
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libaed
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES_arm := lib/libaed.so
-LOCAL_SRC_FILES_arm64 := lib64/libaed.so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MULTILIB := both
-LOCAL_SHARED_LIBRARIES := libz libselinux libmrdump
-include $(BUILD_PREBUILT)
diff --git a/proprietary/external/aee/direct-coredump/Android.mk b/proprietary/external/aee/direct-coredump/Android.mk
deleted file mode 100755
index 86149deed014f568c53544230e3fc31eea5f8205..0000000000000000000000000000000000000000
--- a/proprietary/external/aee/direct-coredump/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-		  direct-coredump.c
-
-LOCAL_SHARED_LIBRARIES := libcutils libdl
-
-LOCAL_MODULE := libdirect-coredump
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file
diff --git a/proprietary/external/amr/Android.mk b/proprietary/external/amr/Android.mk
deleted file mode 100755
index a71d0aae1a8608dcf89fe6cd9a41e993dc03f0a1..0000000000000000000000000000000000000000
--- a/proprietary/external/amr/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-LOCAL_PATH := $(my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libamr_mtk
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_SRC_FILES_arm := libamr_mtk.a
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MULTILIB := 32
-include $(BUILD_PREBUILT)
diff --git a/proprietary/external/ant-wireless/ANTHALService/Android.mk b/proprietary/external/ant-wireless/ANTHALService/Android.mk
deleted file mode 100755
index 2169f06629db39ed4f29c9dfe7b5cd8fd567e027..0000000000000000000000000000000000000000
--- a/proprietary/external/ant-wireless/ANTHALService/Android.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# ANT Stack
-#
-# Copyright 2011 Dynastream Innovations
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-ifneq ($(BOARD_ANT_WIRELESS_DEVICE),)
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-#
-# ANT java system service
-#
-
-LOCAL_SRC_FILES := \
-    $(call all-java-files-under, src) \
-    src/com/dsi/ant/server/IAntHal.aidl \
-    src/com/dsi/ant/server/IAntHalCallback.aidl
-
-LOCAL_REQUIRED_MODULES := libantradio
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := AntHalService
-
-include $(BUILD_PACKAGE)
-
-endif # BOARD_ANT_WIRELESS_DEVICE defined
diff --git a/proprietary/external/ant-wireless/antradio-library/Android.mk b/proprietary/external/ant-wireless/antradio-library/Android.mk
deleted file mode 100755
index 33442f262d4bdfa6d56662438af41c22fefe25d2..0000000000000000000000000000000000000000
--- a/proprietary/external/ant-wireless/antradio-library/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (C) 2011 Dynastream Innovations inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-ifneq ($(BOARD_ANT_WIRELESS_DEVICE),)
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-#
-# Dummy ANT java library
-#
-
-LOCAL_SRC_FILES := \
-	$(call all-subdir-java-files)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE:= com.dsi.ant.antradio_library
-
-include $(BUILD_JAVA_LIBRARY)
-
-endif # BOARD_ANT_WIRELESS_DEVICE defined
diff --git a/proprietary/external/apedec/Android.mk b/proprietary/external/apedec/Android.mk
deleted file mode 100755
index 87f827e04a1dc135e2a62ae231c82d1fa4aa8557..0000000000000000000000000000000000000000
--- a/proprietary/external/apedec/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-
-LOCAL_PATH := $(call my-dir)
-
-include $(all-subdir-makefiles)
diff --git a/proprietary/external/apedec/arm_32/Android.mk b/proprietary/external/apedec/arm_32/Android.mk
deleted file mode 100755
index 8d06fc4c18d023711f68c64005f670aa2ca2aede..0000000000000000000000000000000000000000
--- a/proprietary/external/apedec/arm_32/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-ifeq ($(proj), box_tv)
-LOCAL_CFLAGS +=-D__ANDROID_BOX_TV__
-else
-LOCAL_CFLAGS +=-D__ANDROID_SP_TABLET__
-endif
-
-LOCAL_SRC_FILES := \
-    src/apedec_all.c \
-    src/gnu_asm/ARMv6_aligned_dot_and_add_64.s\
-    src/gnu_asm/ARMv6_aligned_dot_and_sub_64.s\
-    src/gnu_asm/ARMv6_unaligned_dot_and_add_64.s\
-    src/gnu_asm/ARMv6_unaligned_dot_and_sub_64.s\
-    src/gnu_asm/ARMv6_dot_product.s\
-    src/gnu_asm/ARMv6_predictor.s
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/inc
-LOCAL_CFLAGS += -D__arm__ -D__ANDROID__ -D'__inline=inline' -D'__int64=long long' -mcpu=arm1136j-s -O3 -D'STATIC_DECLARE=static' -DSTATIC_ENHANCE -D'EXTERN=static'
-ifeq ($(symbol), scramble)
-LOCAL_CFLAGS +=-D__SCRAMBLE_SYMBOL__
-endif
-LOCAL_MODULE:= libapedec_mtk
-LOCAL_MULTILIB := 32
-LOCAL_PRELINK_MODULE:=false
-LOCAL_ARM_MODE:=arm
-LOCAL_SHARED_LIBRARIES:=\
-	libnativehelper \
-	libcutils \
-	libutils
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/proprietary/external/apedec/arm_32/exe/Android.mk b/proprietary/external/apedec/arm_32/exe/Android.mk
deleted file mode 100755
index c59afe0d043b596408a35fb1ec4ff19518fb1975..0000000000000000000000000000000000000000
--- a/proprietary/external/apedec/arm_32/exe/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-LOCAL_PATH := $(my-dir)
-
-include $(CLEAR_VARS)
-ifeq ($(proj), box_tv)
-LOCAL_STATIC_LIBRARIES += libdrvb_boxtv
-PRODUCT_COPY_FILES += $(LOCAL_PATH)/../libdrvb_boxtv.a:obj/STATIC_LIBRARIES/libdrvb_intermediates/libdrvb_boxtv.a
-LOCAL_CFLAGS +=-D__ANDROID_BOX_TV__
-else
-LOCAL_STATIC_LIBRARIES += libapedec_mtk
-LOCAL_STATIC_LIBRARIES += libdrvb
-//PRODUCT_COPY_FILES += $(LOCAL_PATH)/../libdrvb.a:obj/STATIC_LIBRARIES/libdrvb_intermediates/libdrvb.a
-LOCAL_CFLAGS +=-D__ANDROID_SP_TABLET__
-endif
-
-LOCAL_SRC_FILES := \
-    ../demo/demac.c\
-    ../demo/cue_parser.c\
-    ../demo/libprofiler.c\
-    ../demo/parser.c\
-    ../demo/wavwrite.c
-    
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../inc\
-                    $(LOCAL_PATH)/../demo                    
-                    
-LOCAL_CFLAGS += -D__arm__ -D__ANDROID__ -D'__inline=inline' -D'__int64=long long' -mcpu=arm1136j-s -O3 -D'STATIC_DECLARE=static' -DSTATIC_ENHANCE -D'EXTERN=static'
-LOCAL_MODULE_TAGS:=user
-LOCAL_MODULE := $(sp2_swip)
-LOCAL_PRELINK_MODULE:=false
-LOCAL_ARM_MODE:=arm
-
-
-	
-include $(BUILD_EXECUTABLE)
diff --git a/proprietary/external/apedec/arm_64/Android.mk b/proprietary/external/apedec/arm_64/Android.mk
deleted file mode 100755
index 7862705035745c21e9eacab01bd720c7b06dbcc3..0000000000000000000000000000000000000000
--- a/proprietary/external/apedec/arm_64/Android.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-    src/apedec_all.c \
-    src/ape_decoder_swip.c
-    #src/apedec_all.c \
-    #src/gnu_asm/ARMv6_aligned_dot_and_add_64.s\
-    #src/gnu_asm/ARMv6_aligned_dot_and_sub_64.s\
-    #src/gnu_asm/ARMv6_unaligned_dot_and_add_64.s\
-    #src/gnu_asm/ARMv6_unaligned_dot_and_sub_64.s\
-    #src/gnu_asm/ARMv6_dot_product.s\
-    #src/gnu_asm/ARMv6_predictor.s
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/inc \
-                     $(LOCAL_PATH)/src \
-                     $(LOCAL_PATH)/demo
-                     
-LOCAL_CFLAGS += -DARM -D__arm__ -D__ANDROID__ -D'__inline=inline' -D'__int64=long long' -D'STATIC_DECLARE=static' -DSTATIC_ENHANCE -D'EXTERN=static'
-
-ifeq ($(symbol), scramble)
-LOCAL_CFLAGS +=-D__SCRAMBLE_SYMBOL__
-endif
-
-LOCAL_MODULE_PATH_32 := $(LOCAL_PATH)/out32/
-LOCAL_MODULE_PATH_64 := $(LOCAL_PATH)/out64/
-
-#LOCAL_MODULE_TAGS:=user
-LOCAL_MODULE := libapedec_mtk
-LOCAL_PRELINK_MODULE:=false
-LOCAL_ARM_MODE:=arm
-LOCAL_SHARED_LIBRARIES:=\
-	libnativehelper \
-	libcutils \
-	libutils
-LOCAL_MULTILIB := 64
-include $(BUILD_STATIC_LIBRARY)
diff --git a/proprietary/external/apedec/arm_64/exe/Android.mk b/proprietary/external/apedec/arm_64/exe/Android.mk
deleted file mode 100755
index c59afe0d043b596408a35fb1ec4ff19518fb1975..0000000000000000000000000000000000000000
--- a/proprietary/external/apedec/arm_64/exe/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-LOCAL_PATH := $(my-dir)
-
-include $(CLEAR_VARS)
-ifeq ($(proj), box_tv)
-LOCAL_STATIC_LIBRARIES += libdrvb_boxtv
-PRODUCT_COPY_FILES += $(LOCAL_PATH)/../libdrvb_boxtv.a:obj/STATIC_LIBRARIES/libdrvb_intermediates/libdrvb_boxtv.a
-LOCAL_CFLAGS +=-D__ANDROID_BOX_TV__
-else
-LOCAL_STATIC_LIBRARIES += libapedec_mtk
-LOCAL_STATIC_LIBRARIES += libdrvb
-//PRODUCT_COPY_FILES += $(LOCAL_PATH)/../libdrvb.a:obj/STATIC_LIBRARIES/libdrvb_intermediates/libdrvb.a
-LOCAL_CFLAGS +=-D__ANDROID_SP_TABLET__
-endif
-
-LOCAL_SRC_FILES := \
-    ../demo/demac.c\
-    ../demo/cue_parser.c\
-    ../demo/libprofiler.c\
-    ../demo/parser.c\
-    ../demo/wavwrite.c
-    
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../inc\
-                    $(LOCAL_PATH)/../demo                    
-                    
-LOCAL_CFLAGS += -D__arm__ -D__ANDROID__ -D'__inline=inline' -D'__int64=long long' -mcpu=arm1136j-s -O3 -D'STATIC_DECLARE=static' -DSTATIC_ENHANCE -D'EXTERN=static'
-LOCAL_MODULE_TAGS:=user
-LOCAL_MODULE := $(sp2_swip)
-LOCAL_PRELINK_MODULE:=false
-LOCAL_ARM_MODE:=arm
-
-
-	
-include $(BUILD_EXECUTABLE)
diff --git a/proprietary/external/atvctrlservice/Android.mk b/proprietary/external/atvctrlservice/Android.mk
deleted file mode 100755
index 4a267724f341fdf71678156199de3c64af20be18..0000000000000000000000000000000000000000
--- a/proprietary/external/atvctrlservice/Android.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-ifneq ($(TARGET_BUILD_PDK),true)
-
-LOCAL_PATH:= $(call my-dir)
-
-## ==> build this lib only when HAVE_MATV_FEATURE is yes
-#ifeq ($(HAVE_MATV_FEATURE),yes)
-
-include $(CLEAR_VARS)
-
-
-LOCAL_SRC_FILES:= \
-    ATVCtrlService.cpp
-
-LOCAL_SHARED_LIBRARIES := \
-    libcutils \
-    libutils \
-    libbinder \
-    libmedia \
-    libhardware \
-    libaudiosetting \
-    libmatv_cust
-
-
-LOCAL_PRELINK_MODULE := false
-LOCAL_MODULE:= libatvctrlservice
-
-LOCAL_C_INCLUDES:= \
-	$(TOP)/$(MTK_PATH_SOURCE)/frameworks-ext/av/include  \
-	$(TOP)/$(MTK_PATH_SOURCE)/frameworks/av/media/libs   \
-	$(TOP)/$(MTK_ROOT)/external/matv/matvctrl
-
-# LOCAL_CFLAGS:= -D$(MTK_FM_CHIP)
-
-include $(BUILD_SHARED_LIBRARY)
-
-#endif
-## <== build this lib only when HAVE_MATV_FEATURE is yes
-
-endif
diff --git a/proprietary/external/audiocommand/Android.mk b/proprietary/external/audiocommand/Android.mk
deleted file mode 100755
index 06be981e74440eba5d73e57c27188c5d2f67f836..0000000000000000000000000000000000000000
--- a/proprietary/external/audiocommand/Android.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-ifeq ($(TARGET_BUILD_PDK),)
-ifneq ($(strip $(MTK_PLATFORM)),)
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := eng
-
-ifeq ($(findstring MTK_AOSP_ENHANCEMENT,  $(COMMON_GLOBAL_CPPFLAGS)),)
-	LOCAL_CFLAGS += -DMTK_BASIC_PACKAGE
-endif
-
-LOCAL_SRC_FILES:=       \
-	audiocommand.cpp
-	
-LOCAL_C_INCLUDES=       \
-       $(MTK_PATH_SOURCE)/frameworks/base/include/media \
-       external/tinyalsa/include
-
-       
-LOCAL_C_INCLUDES+=       \
-    $(MTK_PATH_SOURCE)/platform/common/hardware/audio/include
-
-LOCAL_SHARED_LIBRARIES := libcutils libutils libbinder libmedia libaudioflinger libtinyalsa
-
-#LOCAL_SHARED_LIBRARIES += libaudio.primary.default
-
-ifeq ($(HAVE_AEE_FEATURE),yes)
-    LOCAL_SHARED_LIBRARIES += libaed
-    LOCAL_C_INCLUDES += \
-    $(MTK_PATH_SOURCE)/external/aee/binary/inc
-    LOCAL_CFLAGS += -DHAVE_AEE_FEATURE
-endif
-ifeq ($(MTK_AUDIO),yes)
-LOCAL_C_INCLUDES+= \
-   $(TOP)/$(MTK_PATH_SOURCE)/hardware/audio/common/include
-endif
-
-LOCAL_MODULE:= audiocommand
-
-LOCAL_MULTILIB := 32
-
-include $(BUILD_EXECUTABLE)
-endif
-endif #ifeq ($(TARGET_BUILD_PDK),)
diff --git a/proprietary/external/audiocustparam/Android.mk b/proprietary/external/audiocustparam/Android.mk
deleted file mode 100755
index f3d26f8e84e816cd52ab951e83039668c28c5b99..0000000000000000000000000000000000000000
--- a/proprietary/external/audiocustparam/Android.mk
+++ /dev/null
@@ -1,188 +0,0 @@
-LOCAL_PATH := $(my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-ifeq ($(findstring MTK_AOSP_ENHANCEMENT,  $(COMMON_GLOBAL_CPPFLAGS)),)
-	LOCAL_CFLAGS += -DMTK_BASIC_PACKAGE
-endif
-
-LOCAL_C_INCLUDES:= \
-    $(MTK_PATH_SOURCE)/external/nvram/libnvram \
-    $(MTK_PATH_CUSTOM)/hal/audioflinger/audio \
-    $(MTK_PATH_CUSTOM)/cgen/inc \
-    $(MTK_PATH_CUSTOM)/cgen/cfgfileinc \
-    $(MTK_PATH_CUSTOM)/cgen/cfgdefault
-
-LOCAL_SRC_FILES := \
-    AudioCustParam.cpp
-
-LOCAL_SHARED_LIBRARIES := \
-    libcutils \
-    libutils \
-    libnvram \
-    libcustom_nvram
-# Speaker Monitor
-ifeq ($(MTK_SPEAKER_MONITOR_SUPPORT),yes)
-LOCAL_CFLAGS += -DMTK_SPEAKER_MONITOR_SUPPORT
-endif
-# Speaker Monitor
-
-# Audio HD Record
-ifeq ($(MTK_AUDIO_HD_REC_SUPPORT),yes)
-LOCAL_CFLAGS += -DMTK_AUDIO_HD_REC_SUPPORT
-endif
-# Audio HD Record
-
-# Wearable support
-ifeq ($(strip $(MTK_WEARABLE_PLATFORM )),yes)
-  LOCAL_CFLAGS += -DMTK_WEARABLE_PLATFORM
-endif
-
-
-# Dual Mic Support
-ifeq ($(MTK_DUAL_MIC_SUPPORT),yes)
-LOCAL_CFLAGS += -DMTK_DUAL_MIC_SUPPORT
-endif
-# Dual Mic Support
-
-# DMNR3.0 Support
-ifeq ($(MTK_HANDSFREE_DMNR_SUPPORT),yes)
-LOCAL_CFLAGS += -DMTK_HANDSFREE_DMNR_SUPPORT
-endif
-# DMNR3.0 Support
-
-# VOIP enhance Support
-ifeq ($(MTK_VOIP_ENHANCEMENT_SUPPORT),yes)
-LOCAL_CFLAGS += -DMTK_VOIP_ENHANCEMENT_SUPPORT
-endif
-# VOIP enhance Support
-
-# Automatic Speech Recognition Support
-ifeq ($(MTK_ASR_SUPPORT),yes)
-LOCAL_CFLAGS += -DMTK_ASR_SUPPORT
-endif
-# Automatic Speech Recognition Support
-
-# VoIP normal mode DMNR Support
-ifeq ($(MTK_VOIP_NORMAL_DMNR),yes)
-LOCAL_CFLAGS += -DMTK_VOIP_NORMAL_DMNR
-endif
-# VoIP normal mode DMNR Support
-
-# VoIP handsfree mode DMNR Support
-ifeq ($(MTK_VOIP_HANDSFREE_DMNR),yes)
-LOCAL_CFLAGS += -DMTK_VOIP_HANDSFREE_DMNR
-endif
-# VoIP handsfree mode DMNR Support
-
-# Incall handsfree mode DMNR Support
-ifeq ($(MTK_INCALL_HANDSFREE_DMNR),yes)
-LOCAL_CFLAGS += -DMTK_INCALL_HANDSFREE_DMNR
-endif
-# Incall handsfree mode DMNR Support
-
-# Incall normal mode DMNR Support
-ifneq ($(MTK_INCALL_NORMAL_DMNR),no)
-LOCAL_CFLAGS += -DMTK_INCALL_NORMAL_DMNR
-endif
-# Incall normal mode DMNR Support
-
-# wifi only
-ifeq ($(MTK_TB_WIFI_3G_MODE),WIFI_ONLY)
-  LOCAL_CFLAGS += -DMTK_WIFI_ONLY_SUPPORT
-endif
-# wifi only
-
-# 3g data
-ifeq ($(MTK_TB_WIFI_3G_MODE),3GDATA_SMS)
-  LOCAL_CFLAGS += -DMTK_3G_DATA_ONLY_SUPPORT
-endif
-
-ifeq ($(MTK_TB_WIFI_3G_MODE),3GDATA_ONLY)
-  LOCAL_CFLAGS += -DMTK_3G_DATA_ONLY_SUPPORT
-endif
-# 3g data
-
-# check if there is receiver
-ifeq ($(DISABLE_EARPIECE),yes)
-  LOCAL_CFLAGS += -DMTK_DISABLE_EARPIECE
-endif
-# check if there is receiver
-
-# WB Speech Support
-ifeq ($(MTK_WB_SPEECH_SUPPORT),yes)
-  LOCAL_CFLAGS += -DMTK_WB_SPEECH_SUPPORT
-endif
-#WB Speech Support
-
-# DMNR tuning at modem side
-ifeq ($(DMNR_TUNNING_AT_MODEMSIDE),yes)
-  LOCAL_CFLAGS += -DDMNR_TUNNING_AT_MODEMSIDE
-endif
-# DMNR tuning at modem side
-
-# Voice Unlock
-ifeq ($(MTK_VOICE_UNLOCK_SUPPORT),yes)
-  LOCAL_CFLAGS += -DMTK_VOICE_UNLOCK_SUPPORT
-endif
-# Voice Unlock
-
-# Voice UI
-ifeq ($(MTK_VOICE_UI_SUPPORT),yes)
-  LOCAL_CFLAGS += -DMTK_VOICE_UI_SUPPORT
-endif
-# Voice UI
-
-# DMNR 2.5 complex arch
-#ifeq ($(DMNR_COMPLEX_ARCH_SUPPORT),yes)
-  LOCAL_CFLAGS += -DDMNR_COMPLEX_ARCH_SUPPORT
-#endif
-# DMNR 2.5 complex arch
-
-# Magic Conference Support
-ifeq ($(MTK_MAGICONFERENCE_SUPPORT),yes)
-LOCAL_CFLAGS += -DMTK_MAGICONFERENCE_SUPPORT
-endif
-# Magic Conference Support
-
-# HAC Support
-ifeq ($(MTK_HAC_SUPPORT),yes)
-LOCAL_CFLAGS += -DMTK_HAC_SUPPORT
-endif
-# HAC Support
-
-# TC1 Gain Table Support
-ifeq ($(MTK_SUPPORT_TC1_TUNNING),yes)
-   LOCAL_CFLAGS += -DMTK_AUDIO_GAIN_TABLE
-endif
-# TC1 Gain Table Support
-
-# MTK Audio Tuning Tool Version
-ifneq ($(MTK_AUDIO_TUNING_TOOL_VERSION),)
-  ifneq ($(strip $(MTK_AUDIO_TUNING_TOOL_VERSION)),V1)
-    MTK_AUDIO_TUNING_TOOL_V2_PHASE:=$(shell echo $(MTK_AUDIO_TUNING_TOOL_VERSION) | sed 's/V2.//g')
-    LOCAL_CFLAGS += -DMTK_AUDIO_HIERARCHICAL_PARAM_SUPPORT
-    LOCAL_CFLAGS += -DMTK_AUDIO_TUNING_TOOL_V2_PHASE=$(MTK_AUDIO_TUNING_TOOL_V2_PHASE)
-  endif
-endif
-
-ifeq ($(MTK_AUDIO_BLOUD_CUSTOMPARAMETER_REV),MTK_AUDIO_BLOUD_CUSTOMPARAMETER_V5)
-  LOCAL_CFLAGS += -DMTK_AUDIO_BLOUD_CUSTOMPARAMETER_V5
-else
-  ifeq ($(strip $(MTK_AUDIO_BLOUD_CUSTOMPARAMETER_REV)),MTK_AUDIO_BLOUD_CUSTOMPARAMETER_V4)
-    LOCAL_CFLAGS += -DMTK_AUDIO_BLOUD_CUSTOMPARAMETER_V4
-  endif
-endif
-
-LOCAL_MODULE := libaudiocustparam
-
-#ifeq ($(MTK_AUDIO_A64_SUPPORT),yes)
-#LOCAL_MULTILIB := both
-#else
-#LOCAL_MULTILIB := 32
-#endif
-
-LOCAL_ARM_MODE := arm
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/proprietary/external/audiodcremoveflt/Android.mk b/proprietary/external/audiodcremoveflt/Android.mk
deleted file mode 100755
index 46de841abd4ab60fed0847139b677ca76a4a56d5..0000000000000000000000000000000000000000
--- a/proprietary/external/audiodcremoveflt/Android.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-LOCAL_PATH := $(my-dir)
-
-include $(CLEAR_VARS)
-#LOCAL_PREBUILT_LIBS := libaudiodcrflt.so
-#LOCAL_MODULE_TAGS := optional
-#include $(BUILD_MULTI_PREBUILT)
-LOCAL_MODULE := libaudiodcrflt
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES_arm := libaudiodcrflt.so
-LOCAL_MODULE_SUFFIX := .so
-#ifeq ($(MTK_AUDIO_A64_SUPPORT),yes)#
-LOCAL_SRC_FILES_arm64 := lib64audiodcrflt.so
-LOCAL_MULTILIB := both
-#else#
-#LOCAL_MULTILIB := 32#
-#endif#
-include $(BUILD_PREBUILT)
-
-
diff --git a/proprietary/external/audioregsetting/Android.mk b/proprietary/external/audioregsetting/Android.mk
deleted file mode 100755
index a0d9671fa48aaf9343f1b9fc7cdff6940b12bbdb..0000000000000000000000000000000000000000
--- a/proprietary/external/audioregsetting/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-ifneq ($(strip $(MTK_PLATFORM)),)
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := eng
-
-LOCAL_SRC_FILES:=       \
-	audioregsetting.cpp
-	
-LOCAL_C_INCLUDES=       \
-       $(MTK_PATH_SOURCE)/frameworks/av/include/media \
-       $(TOP)/frameworks/av/include/media
-
-LOCAL_SHARED_LIBRARIES := libcutils libutils libbinder libmedia libaudioflinger
-
-LOCAL_MODULE:= audioregsetting
-
-LOCAL_MULTILIB := 32
-
-include $(BUILD_EXECUTABLE)
-
-endif
diff --git a/proprietary/external/audiosetting/Android.mk b/proprietary/external/audiosetting/Android.mk
deleted file mode 100755
index 5baa43b0b7603544ae93751a085440e3c935cb01..0000000000000000000000000000000000000000
--- a/proprietary/external/audiosetting/Android.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-LOCAL_PATH := $(my-dir)
-
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES += \
-   audiosetting.cpp
-
-LOCAL_MODULE := libaudiosetting
-
-LOCAL_SHARED_LIBRARIES := \
-	libnativehelper \
-	libcutils \
-	libutils 
-
-LOCAL_STATIC_LIBRARIES +=
-
-LOCAL_C_INCLUDES :=  \
-	$(TOP)/frameworks/base/include/media
-
-#ifeq ($(MTK_AUDIO_A64_SUPPORT),yes)
-#LOCAL_MULTILIB := both
-#else
-#LOCAL_MULTILIB := 32
-#endif
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/proprietary/external/awb/Android.mk b/proprietary/external/awb/Android.mk
deleted file mode 100755
index 6ef0fdea0fefaa480a9208e59e06606141a96139..0000000000000000000000000000000000000000
--- a/proprietary/external/awb/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-LOCAL_PATH := $(my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libawb_mtk
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_SRC_FILES_arm := libawb_mtk.a
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MULTILIB := 32
-include $(BUILD_PREBUILT)
diff --git a/proprietary/external/bessound_HD/Android.mk b/proprietary/external/bessound_HD/Android.mk
deleted file mode 100755
index c27a177c642d30f38773846fa15295b0206296bd..0000000000000000000000000000000000000000
--- a/proprietary/external/bessound_HD/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-LOCAL_PATH := $(my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libbessound_hd_mtk
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES_arm := libbessound_hd_mtk.so
-LOCAL_MODULE_SUFFIX := .so
-#ifeq ($(MTK_AUDIO_A64_SUPPORT),yes)
-LOCAL_SRC_FILES_arm64 := lib64bessound_hd_mtk.so
-LOCAL_MULTILIB := both
-#else
-#LOCAL_MULTILIB := 32
-#endif
-include $(BUILD_PREBUILT)
diff --git a/proprietary/external/bessurround_mtk/Android.mk b/proprietary/external/bessurround_mtk/Android.mk
deleted file mode 100755
index 0834063b6411bc3dc62c30b0888feda3ec3106c1..0000000000000000000000000000000000000000
--- a/proprietary/external/bessurround_mtk/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-LOCAL_PATH := $(my-dir)
-
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libbessurround_mtk
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES_arm := libbessurround_mtk.so
-LOCAL_MODULE_SUFFIX := .so
-#ifeq ($(MTK_AUDIO_A64_SUPPORT),yes)
-LOCAL_SRC_FILES_arm64 := lib64bessurround_mtk.so
-LOCAL_MULTILIB := both
-#else
-#LOCAL_MULTILIB := 32
-#endif
-include $(BUILD_PREBUILT)
diff --git a/proprietary/external/blisrc/Android.mk b/proprietary/external/blisrc/Android.mk
deleted file mode 100755
index 6f84c219ec2012bfec3d6537e7db021541f19fe5..0000000000000000000000000000000000000000
--- a/proprietary/external/blisrc/Android.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-LOCAL_PATH := $(my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libblisrc
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES_arm := blisrc16/libblisrc.so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_SRC_FILES_arm64 := blisrc16/lib64blisrc.so
-LOCAL_MULTILIB := both
-include $(BUILD_PREBUILT)
-include $(CLEAR_VARS)
-LOCAL_MODULE := libblisrc32
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES_arm := blisrc32/libblisrc32.so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_SRC_FILES_arm64 := blisrc32/lib64blisrc32.so
-LOCAL_MULTILIB := both
-include $(BUILD_PREBUILT)
diff --git a/proprietary/external/bluetooth/Android.mk b/proprietary/external/bluetooth/Android.mk
deleted file mode 100755
index a6cdd44d5a551863df0eb1009f8b4d8ed5373a61..0000000000000000000000000000000000000000
--- a/proprietary/external/bluetooth/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-include $(call all-subdir-makefiles)
diff --git a/proprietary/external/bluetooth/bt_cust/Android.mk b/proprietary/external/bluetooth/bt_cust/Android.mk
deleted file mode 100755
index 1e09f52c827ffdefb00774e632bfa2ac60dfe406..0000000000000000000000000000000000000000
--- a/proprietary/external/bluetooth/bt_cust/Android.mk
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-################################################
-# build libbtcusttable start
-################################################
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SHARED_LIBRARIES := libcutils
-
-LOCAL_SRC_FILES := \
-	bt_cust.c \
-
-LOCAL_C_INCLUDES := \
-	$(LOCAL_PATH)/inc
-
-ifeq ($(MTK_BT_30_HS_SUPPORT), yes)
-LOCAL_CFLAGS += \
-        -D__BT_3_0_HS__
-endif
-
-ifeq ($(MTK_BT_40_SUPPORT),yes)
-LOCAL_CFLAGS += \
-        -D__BT_4_0_BLE__
-endif
-
-ifeq ($(MTK_TC1_FEATURE),yes)
-LOCAL_CFLAGS += -D__BT_USE_CUST_TC1__
-endif
-
-ifeq ($(MTK_BT_CHIP),MTK_MT6620)
-else ifeq ($(MTK_BT_CHIP),MTK_MT6628)
-else ifeq ($(MTK_BT_CHIP),MTK_CONSYS_MT6572)
-else ifeq ($(MTK_BT_CHIP),MTK_CONSYS_MT6582)
-else
-LOCAL_CFLAGS += \
-        -D__USE_CUST_INT_WIN__
-endif
-
-ifeq ($(MTK_WEARABLE_PLATFORM),yes)
-LOCAL_CFLAGS += -D__BT_WEARABLE_SETTINGS__
-endif
-
-
-#LOCAL_MODULE_TAGS := user
-
-
-LOCAL_MODULE := libbtcusttable
-
-LOCAL_PRELINK_MODULE:= false
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := auto_pair_blacklist.conf
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES :=  $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := btconfig.xml
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES :=  $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
diff --git a/proprietary/external/bluetooth/bt_cust_tc1/Android.mk b/proprietary/external/bluetooth/bt_cust_tc1/Android.mk
deleted file mode 100755
index 4fbc89a83dce1d1594b358fc1b9768d75af74463..0000000000000000000000000000000000000000
--- a/proprietary/external/bluetooth/bt_cust_tc1/Android.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-################################################
-# build BT cust tc1 lib start
-################################################
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-        bt_cust_tc1.c \
-
-ifeq ($(MTK_TC1_FEATURE),yes)
-LOCAL_SHARED_LIBRARIES += libtc1part
-endif
-
-ifeq ($(MTK_TC1_FEATURE),yes)
-ifeq ($(MTK_GPT_SCHEME_SUPPORT), yes)
-LOCAL_C_INCLUDES += \
-        $(MTK_PATH_SOURCE)/external/tc1_interface/gpt
-else
-LOCAL_C_INCLUDES += \
-        $(MTK_PATH_SOURCE)/external/tc1_interface/pmt
-endif
-endif
-
-LOCAL_MODULE := libbtcusttc1
-
-LOCAL_PRELINK_MODULE:= false
-include $(BUILD_SHARED_LIBRARY)
-
diff --git a/proprietary/external/bluetooth/sbc/Android.mk b/proprietary/external/bluetooth/sbc/Android.mk
deleted file mode 100755
index 0f564b6b45e7772bce72f0a57087bede8812b0c0..0000000000000000000000000000000000000000
--- a/proprietary/external/bluetooth/sbc/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := libsbccodec
-LOCAL_SRC_FILES := libsbccodec.so
-LOCAL_MULTILIB := 32
-#LOCAL_SHARED_LIBRARIES := 
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_SUFFIX := .so
-include $(BUILD_PREBUILT)
diff --git a/proprietary/external/ccci_lib/Android.mk b/proprietary/external/ccci_lib/Android.mk
deleted file mode 100755
index 210c40a1801d5533732d33e7917ad6c1fbbb7afe..0000000000000000000000000000000000000000
--- a/proprietary/external/ccci_lib/Android.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := ccci_lib.c
-
-LOCAL_STATIC_LIBRARIES := libcutils liblog
-
-LOCAL_C_INCLUDES := \
-	$(MTK_PATH_SOURCE)/external/nvram/libnvram \
-	$(MTK_PATH_SOURCE)/hardware/ccci/include
-	
-LOCAL_SHARED_LIBRARIES := libc
-
-LOCAL_MODULE := libccci_util
-LOCAL_MULTILIB := both
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_PRELINK_MODULE:=false
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/proprietary/external/cvsd_plc_codec/Android.mk b/proprietary/external/cvsd_plc_codec/Android.mk
deleted file mode 100755
index 84a9feaa897cbe5e0e6a20645942c7db268dd5d7..0000000000000000000000000000000000000000
--- a/proprietary/external/cvsd_plc_codec/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-LOCAL_PATH := $(my-dir)
-
-include $(CLEAR_VARS)
-#LOCAL_PREBUILT_LIBS := libcvsd_mtk.so
-#LOCAL_MODULE_TAGS := optional
-#include $(BUILD_MULTI_PREBUILT)
-LOCAL_MODULE := libcvsd_mtk
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES_arm := libcvsd_mtk.so
-LOCAL_MODULE_SUFFIX := .so
-#ifeq ($(MTK_AUDIO_A64_SUPPORT),yes)
-LOCAL_SRC_FILES_arm64 := lib64cvsd_mtk.so
-LOCAL_MULTILIB := both
-#else
-#LOCAL_MULTILIB := 32
-#endif
-include $(BUILD_PREBUILT)
diff --git a/proprietary/external/dm_agent_binder/Android.mk b/proprietary/external/dm_agent_binder/Android.mk
deleted file mode 100755
index 8796a19c479c4b4cea057014578e3a45b3194627..0000000000000000000000000000000000000000
--- a/proprietary/external/dm_agent_binder/Android.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-ifeq ($(strip $(MTK_BSP_PACKAGE)),no)
-
-ifeq ($(strip $(OPTR_SPEC_SEG_DEF)),OP09_SPEC0212_SEGDEFAULT)
-MTK_DEVREG_APP := yes
-MTK_CT4GREG_APP := yes
-endif
-
-ifeq ($(strip $(OPTR_SPEC_SEG_DEF)),OP09_SPEC0212_SEGC)
-MTK_DEVREG_APP := yes
-MTK_CT4GREG_APP := yes
-endif
-
-ifneq ($(strip $(MTK_DM_APP))_$(strip $(MTK_MDM_APP))_$(strip $(MTK_SMSREG_APP))_$(strip $(MTK_DEVREG_APP))_$(strip $(MTK_CT4GREG_APP)),no_no_no_no_no)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
-	dm_agent.cpp
-
-LOCAL_C_INCLUDES += \
-	../../external/nvram/libfile_op/ \
-	$(MTK_PATH_SOURCE)/frameworks/base/custom/inc
-
-ifeq ($(MTK_EMMC_SUPPORT),yes)
-LOCAL_CFLAGS += \
-    -DMTK_EMMC_SUPPORT
-endif
-
-LOCAL_SHARED_LIBRARIES := \
-	libutils \
-	libcutils \
-	libbinder \
-	libfile_op \
-	libcustom_prop
-
-#LOCAL_PRELINK_MODULE := false
-
-#LOCAL_PRELINK_MODULE := false
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE:= dm_agent_binder
-
-include $(BUILD_EXECUTABLE)
-
-endif
-endif
-
diff --git a/proprietary/external/ext_md_daemon/Android.mk b/proprietary/external/ext_md_daemon/Android.mk
deleted file mode 100755
index 7d454e606467e711ec9cf2105c9d03ca7a3d77e7..0000000000000000000000000000000000000000
--- a/proprietary/external/ext_md_daemon/Android.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-#
-# extern modem control daemont
-#
-
-ifeq ($(MTK_DT_SUPPORT), yes)
-
-#---------------------------------
-
-ifneq ($(MTK_C2K_SUPPORT), yes)
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := emd_d.c
-
-LOCAL_SHARED_LIBRARIES := libc libcutils libhardware_legacy
-
-ifeq ($(HAVE_AEE_FEATURE),yes)
-	LOCAL_SHARED_LIBRARIES += libaed
-	LOCAL_CFLAGS += -DEMD_HAVE_AEE_FEATURE
-endif
-
-LOCAL_C_INCLUDES := $(MTK_PATH_SOURCE)/hardware/ccci/include
-
-LOCAL_MODULE := ext_mdinit
-LOCAL_MULTILIB := 32
-
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_EXECUTABLE)
-
-endif
-
-#----------------------------------------
-
-endif
diff --git a/proprietary/external/fft/Android.mk b/proprietary/external/fft/Android.mk
deleted file mode 100755
index 9090bdbe045952319f4ac53c1e684159e1e6f278..0000000000000000000000000000000000000000
--- a/proprietary/external/fft/Android.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-LOCAL_PATH := $(my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libfft
-LOCAL_SRC_FILES := Audio_FFT.c \
-                   Dif_fft.c
-
-include $(BUILD_STATIC_LIBRARY)
-
-
diff --git a/proprietary/external/flacdec/Android.mk b/proprietary/external/flacdec/Android.mk
deleted file mode 100755
index 348c85f8af1d76a2195e3bd299f6ab220282e473..0000000000000000000000000000000000000000
--- a/proprietary/external/flacdec/Android.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-LOCAL_PATH := $(my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libflacdec_mtk
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_SRC_FILES_arm := libflacdec_mtk.a
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MULTILIB := 32
-include $(BUILD_PREBUILT)
diff --git a/proprietary/external/flp/Android.mk b/proprietary/external/flp/Android.mk
deleted file mode 100755
index a6bd139a59b951b378013ddff5f1f62973dcdbb7..0000000000000000000000000000000000000000
--- a/proprietary/external/flp/Android.mk
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-###############################################################################
-# build start
-###############################################################################
-
-LOCAL_PATH := $(call my-dir)
-
-########################################
-# Support Offload FLP
-########################################
-
-########################################
-# Copy prebuilt FLP share library
-########################################
-include $(CLEAR_VARS)
-LOCAL_MODULE := libmtkflp
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES := lib/libmtkflp.so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MULTILIB := 32
-include $(BUILD_PREBUILT)
-
-########################################
-# Build MTK FLP daemon executable
-########################################
-include $(CLEAR_VARS)
-MY_LOCAL_PATH := $(LOCAL_PATH)
-
-LOCAL_SRC_FILES :=  \
-     ./src/mtk_flp_android_main.c  \
-     ./src/mtk_flp_sys.c  \
-     ./src/slp_api.c  \
-     ./src/mtk_flp_dc_cell.c  \
-     ./src/mtk_flp_dc_offload.c
-     
-LOCAL_C_INCLUDES:= \
-     $(LOCAL_PATH) \
-     $(LOCAL_PATH)/inc/ \ 
-
-LOCAL_MODULE := mtkFlpDaemon
-LOCAL_MULTILIB := 32
-LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-LOCAL_PRELINK_MODULE := false
-LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED)
-#LOCAL_CFLAGS += -DUSE_GCC -DSUPPORT_SHARED_LIBRARY
-LOCAL_CFLAGS += -DUSE_GCC -DSUPPORT_SHARED_LIBRARY -DMTK_K2_PLATFORM
-LOCAL_LDLIBS:= -llog
-LOCAL_MODULE_TAGS := optional
-LOCAL_SHARED_LIBRARIES += libcutils libmtkflp liblog
-  
-include $(BUILD_EXECUTABLE)
-
-
-########################################
-# Build MTK FLP JNI shared library
-########################################
-include $(CLEAR_VARS)
-#LOCAL_PATH := $(call my-dir)
-LOCAL_PRELINK_MODULE := false
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
-LOCAL_SHARED_LIBRARIES := liblog libcutils libhardware
-
-#$(info flag: $(BOARD_GPS_LIBRARIES))
-
-#LOCAL_CFLAGS:= -DFLP_HARDWARE_SUPPORT
-LOCAL_CFLAGS:= -DFLP_HARDWARE_SUPPORT -DMTK_K2_PLATFORM
-LOCAL_LDLIBS:= -llog
-LOCAL_SRC_FILES := src/mtk_flp_hal_jni.c \
-        src/mtk_flp_sys.c \
-        src/geofence_offload.c
-        
-LOCAL_C_INCLUDES:= \
-     $(LOCAL_PATH) \
-     $(LOCAL_PATH)/inc/ \
-     
-LOCAL_MODULE := flp.default
-LOCAL_MULTILIB := 64
-LOCAL_MODULE_TAGS := optional 
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/proprietary/external/fuelgauged/libfgauge/Android.mk b/proprietary/external/fuelgauged/libfgauge/Android.mk
deleted file mode 100755
index 2fa559e3a9145e27d12bb48b51875adeaf6b30e3..0000000000000000000000000000000000000000
--- a/proprietary/external/fuelgauged/libfgauge/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE:= libfgauge
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES_arm := libfgauge.so
-
-#bobule workaround pdk build error, needing review
-LOCAL_MULTILIB := 32
-LOCAL_MODULE_SUFFIX := .so
-
-include $(BUILD_PREBUILT)
-
-
diff --git a/proprietary/external/hotknot/Android.mk b/proprietary/external/hotknot/Android.mk
deleted file mode 100755
index ceec856d638eab34b109d663542e30191db1580d..0000000000000000000000000000000000000000
--- a/proprietary/external/hotknot/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE    := hotknot_native_service
-ifneq ($(MTK_K64_SUPPORT), yes)
-LOCAL_SRC_FILES := hotknot_native/arm/hotknot_native_service
-else
-LOCAL_SRC_FILES := hotknot_native/arm64/hotknot_native_service
-endif
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := EXECUTABLES
-include $(BUILD_PREBUILT)
-######################################################################
-#LOCAL_PATH := $(my-dir)
-
-include $(CLEAR_VARS)
-
-DEFAULT_PLATFORM := common
-LOCAL_MODULE := libhotknot_dev
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-ifeq ($(wildcard $(LOCAL_PATH)/hotknot_dev/$(TARGET_BOARD_PLATFORM)),)
-    LOCAL_SRC_FILES_arm := hotknot_dev/$(DEFAULT_PLATFORM)/lib/libhotknot_dev.so
-    LOCAL_SRC_FILES_arm64 := hotknot_dev/$(DEFAULT_PLATFORM)/lib64/libhotknot_dev.so
-else
-    LOCAL_SRC_FILES_arm := hotknot_dev/$(TARGET_BOARD_PLATFORM)/lib/libhotknot_dev.so
-    LOCAL_SRC_FILES_arm64 := hotknot_dev/$(TARGET_BOARD_PLATFORM)/lib64/libhotknot_dev.so
-endif
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MULTILIB := both
-include $(BUILD_PREBUILT)
-
diff --git a/proprietary/external/icusbd/Android.mk b/proprietary/external/icusbd/Android.mk
deleted file mode 100755
index 2f0757cd62d3e123a4dfd210701a4fd1177fc75a..0000000000000000000000000000000000000000
--- a/proprietary/external/icusbd/Android.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-ifeq ($(MTK_ICUSB_SUPPORT),yes)
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MULTILIB := 32
-LOCAL_MODULE_TAGS:= optional
-LOCAL_MODULE := icusbd
-
-LOCAL_SRC_FILES:= \
-  icusb_util.c \
-  icusb_ccci.c \
-  icusb_ccid.c \
-  icusb_storage.c
-  
-LOCAL_SRC_FILES += icusb_main.c 
-
-LOCAL_C_INCLUDES = \
- $(TOP)/vendor/mediatek/proprietary/external/libusb/ \
- $(LOCAL_PATH)/ \
- $(TOPDIR)/hardware/libhardware_legacy/include \
- $(TOPDIR)/hardware/libhardware/include \
- $(MTK_PATH_SOURCE)/hardware/ccci/include
-
-LOCAL_SHARED_LIBRARIES := libc libusb libcutils
-
-include $(BUILD_EXECUTABLE)
-endif
diff --git a/proprietary/external/invensense/Android.mk b/proprietary/external/invensense/Android.mk
deleted file mode 100755
index 0ef43bb1d0aed54602faba2a96c8cd8c18fc4690..0000000000000000000000000000000000000000
--- a/proprietary/external/invensense/Android.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_CFLAGS += -DANDROID_KITKAT
-LOCAL_MODULE := invmpld
-LOCAL_MODULE_PATH := $(TARGET_OUT)/bin
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := invmpld.c
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/mllite
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/mllite/linux
-LOCAL_SHARED_LIBRARIES += libcutils
-LOCAL_SHARED_LIBRARIES += libutils
-LOCAL_SHARED_LIBRARIES += libdl
-LOCAL_SHARED_LIBRARIES += liblog
-LOCAL_SHARED_LIBRARIES += libmllite
-LOCAL_SHARED_LIBRARIES += libpaw8001motion
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libmllite
-LOCAL_SRC_FILES := libmllite.so
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := invensense
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib
-OVERRIDE_BUILT_MODULE_PATH := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libpaw8001motion
-LOCAL_SRC_FILES := libpaw8001motion.so
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := pixart
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib
-OVERRIDE_BUILT_MODULE_PATH := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := icm30628fw.bin
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/firmware
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := icm30628dmp4.bin
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/firmware
-include $(BUILD_PREBUILT)
-
diff --git a/proprietary/external/ipo_swap/Android.mk b/proprietary/external/ipo_swap/Android.mk
deleted file mode 100755
index 0e02548f6e0bf33b26b9b0a1697fe5865136adf7..0000000000000000000000000000000000000000
--- a/proprietary/external/ipo_swap/Android.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# create loop device bind on IPO-H file for nand project
-
-ifeq ($(MTK_IPOH_SUPPORT), yes)
-ifeq ($(MTK_MLC_NAND_SUPPORT),yes)
-
-LOCAL_PATH:=$(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= ipo_swap.c
-
-LOCAL_MODULE:= ipo_swap
-
-LOCAL_C_INCLUDES += vendor/mediatek/proprietary/external/mtd-utils/include
-
-LOCAL_SHARED_LIBRARIES += liblog 
-
-include $(BUILD_EXECUTABLE)
-
-endif
-endif
diff --git a/proprietary/external/ipod/Android.mk b/proprietary/external/ipod/Android.mk
deleted file mode 100755
index c3d1f3be56bb29d2e48c9eda49975a5e9ee7c677..0000000000000000000000000000000000000000
--- a/proprietary/external/ipod/Android.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# ipo daemon
-#
-
-ifeq (yes, $(strip $(MTK_IPO_SUPPORT)))
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= ipodmain.cpp \
-                  ipodcommon.cpp \
-                  ipodlights.cpp \
-                  bootlogo.cpp \
-				  peripheral_control.cpp \
-				  charging_control.cpp \
-				  key_control.cpp
-
-ifeq ($(MTK_PUMP_EXPRESS_SUPPORT), yes)
-LOCAL_CFLAGS += -DMTK_PUMP_EXPRESS_SUPPORT
-endif
-
-ifeq ($(MTK_PUMP_EXPRESS_PLUS_SUPPORT), yes)
-LOCAL_CFLAGS += -DMTK_PUMP_EXPRESS_PLUS_SUPPORT
-endif
-
-ifeq ($(MTK_TB_WIFI_3G_MODE), WIFI_ONLY)
-LOCAL_CFLAGS += -DMTK_TB_WIFI_ONLY
-endif
-
-ifeq ($(strip $(MTK_IPO_MDRST_SUPPORT)),yes)
-#$(warning reset_modem = 1)
-	LOCAL_CFLAGS += -DMTK_RESET_MODEM=1
-else
-#$(warning reset_modem = 0)
-	LOCAL_CFLAGS += -DMTK_RESET_MODEM=0
-endif
-
-ifeq ($(MTK_IPOH_SUPPORT), yes)
-LOCAL_CFLAGS += -DMTK_IPOH_SUPPORT
-endif
-LOCAL_CFLAGS += -Wno-unused-variable
-
-ifeq ($(TRUSTONIC_TEE_SUPPORT), yes)
-LOCAL_CFLAGS += -DTRUSTONIC_TEE_SUPPORT
-endif
-
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libshowlogo/ \
- $(LOCAL_PATH)/include \
- $(TOP)/external/zlib/
-
-
-LOCAL_MODULE:= ipod
-LOCAL_MULTILIB := 32
-
-LOCAL_SHARED_LIBRARIES := libcutils libutils libc libstdc++ libz \
-	libdl liblog libgui libui libshowlogo \
-	libbinder libpowermanager \
-	libhardware_legacy
-
-LOCAL_PRELINK_MODULE := false
-
-include $(BUILD_EXECUTABLE)
-
-endif
diff --git a/proprietary/external/kisd/Android.mk b/proprietary/external/kisd/Android.mk
deleted file mode 100755
index ac502e969076d30633fad28aa7f72217120641dd..0000000000000000000000000000000000000000
--- a/proprietary/external/kisd/Android.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-ifeq ($(MTK_DRM_KEY_MNG_SUPPORT), yes)
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-	main.c
-
-LOCAL_C_INCLUDES := $(MTK_PATH_CUSTOM)/drm/
-
-LOCAL_STATIC_LIBRARIES := libkisd  
-
-LOCAL_SHARED_LIBRARIES := libcutils libnetutils libc libtz_uree liburee_meta_drmkeyinstall_v2
-
-LOCAL_CFLAGS += -Wall -Wno-unused-parameter -Werror -Wall
-
-LOCAL_MODULE := kisd
-
-include $(BUILD_EXECUTABLE)
-
-# for kisd_starter.sh
-include $(CLEAR_VARS)
-LOCAL_MODULE := kisd_starter.sh
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-endif
diff --git a/proprietary/external/libifaddrs/Android.mk b/proprietary/external/libifaddrs/Android.mk
deleted file mode 100755
index 824eddf8bad21020bbb9e4976b02ff5d24c5e9c3..0000000000000000000000000000000000000000
--- a/proprietary/external/libifaddrs/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := ifaddrs.c
-LOCAL_CFLAGS := -O2 -g
-LOCAL_C_INCLUDES := 
-LOCAL_SHARED_LIBRARIES :=
-LOCAL_MODULE := libifaddrs
-LOCAL_MULTILIB := 32
-include $(BUILD_STATIC_LIBRARY)
diff --git a/proprietary/external/libion_mtk/Android.mk b/proprietary/external/libion_mtk/Android.mk
deleted file mode 100755
index b42f71b8d668682a985d4710cab187af3416e56a..0000000000000000000000000000000000000000
--- a/proprietary/external/libion_mtk/Android.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (C) 2011-2014 MediaTek Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := ion.c
-LOCAL_MODULE := libion_mtk
-LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES += \
-$(TOP)/vendor/mediatek/proprietary/external/libion_mtk/include \
-$(TOP)/vendor/mediatek/proprietary/external/include \
-$(TOP)/vendor/mediatek/proprietary/external/udf \
-$(TOP)/system/core/include
-LOCAL_SHARED_LIBRARIES := libion liblog libdl
-
-ifeq ($(MTK_BASIC_PACKAGE),NO)
-LOCAL_CFLAGS += \
-    -D_MTK_TK_
-endif
-
-include $(BUILD_SHARED_LIBRARY)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/external/libion_mtk/mtk_ion_test/Android.mk b/proprietary/external/libion_mtk/mtk_ion_test/Android.mk
deleted file mode 100755
index 0cbccc444fc4732fa87f2aaef72d64c348725fed..0000000000000000000000000000000000000000
--- a/proprietary/external/libion_mtk/mtk_ion_test/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES = \
-    mtk_ion_test.c  \
-
-LOCAL_C_INCLUDES += \
-    $(TOP)/system/core/include \
-    $(TOP)/vendor/mediatek/proprietary/external/libion_mtk/include \
-    $(TOP)/vendor/mediatek/proprietary/external/include \
-
-LOCAL_MODULE_TAGS := eng
-LOCAL_MODULE := mtk_ion_test
-
-LOCAL_MULTILIB := both
-
-LOCAL_SHARED_LIBRARIES := libcutils libc libion libion_mtk
-include $(BUILD_NATIVE_TEST)
diff --git a/proprietary/external/libipod/Android.mk b/proprietary/external/libipod/Android.mk
deleted file mode 100755
index a4af9d1973bc537e1345592951d2c37829059b3f..0000000000000000000000000000000000000000
--- a/proprietary/external/libipod/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# libipod
-#
-ifeq (yes, $(strip $(MTK_IPO_SUPPORT)))
-
-LOCAL_PATH := $(my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libipod
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES_arm := libipod.so
-LOCAL_MULTILIB := 32
-LOCAL_MODULE_SUFFIX := .so
-
-include $(BUILD_PREBUILT)
-
-endif
diff --git a/proprietary/external/libipsec_ims/src/setkey_gd/Android.mk b/proprietary/external/libipsec_ims/src/setkey_gd/Android.mk
deleted file mode 100755
index 52b2c2abb1073ccba40aa34f8ae87173a1389234..0000000000000000000000000000000000000000
--- a/proprietary/external/libipsec_ims/src/setkey_gd/Android.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-
-
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-                   ../libipsec_good/pfkey.c \
-                   ../libipsec_good/ipsec_strerror.c \
-                   ../libipsec_good/policy_token.c \
-                   ../libipsec_good/policy_parse.c \
-                   ../libipsec_good/pfkey_dump.c \
-                   ../libipsec_good/key_debug.c \
-                   ../libipsec_good/ipsec_get_policylen.c \
-                   ../libipsec_good/ipsec_dump_policy.c \
-                   setkey.c \
-	           parse.c \
-                   token.c 
-LOCAL_C_INCLUDES += \
-	$(LOCAL_PATH) \
-	$(LOCAL_PATH)/../include-glibc \
-	$(LOCAL_PATH)/../libipsec \
-        $(LOCAL_PATH)/../setkey 
-
-LOCAL_SHARED_LIBRARIES := libcutils libcrypto
-
-LOCAL_CFLAGS := -DANDROID_CHANGES -DHAVE_CONFIG_H 
-
-LOCAL_CFLAGS += -Wno-sign-compare -Wno-missing-field-initializers 
-
-LOCAL_MODULE := setkey_gd
-
-LOCAL_MODULE_TAGS := eng
-
-
-include $(BUILD_EXECUTABLE)
-
-
-
diff --git a/proprietary/external/libsched/Android.mk b/proprietary/external/libsched/Android.mk
deleted file mode 100755
index 3b41f6390a95bbb72de705e4ec04e22cb644ac72..0000000000000000000000000000000000000000
--- a/proprietary/external/libsched/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES = \
-    libsched.c  \
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libsched
-
-LOCAL_SHARED_LIBRARIES := libcutils libc
-LOCAL_CFLAGS += -g
-include $(BUILD_STATIC_LIBRARY)
-
-
diff --git a/proprietary/external/libshowlogo/Android.mk b/proprietary/external/libshowlogo/Android.mk
deleted file mode 100755
index a77de0f09b2f5ea1b61225617f15fe42f13966ec..0000000000000000000000000000000000000000
--- a/proprietary/external/libshowlogo/Android.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-####################################################################
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-
-LOCAL_SRC_FILES  := show_logo_common.c\
-                  decompress_common.c\
-                  show_animation_common.c\
-                  charging_animation.cpp
-
-ifeq ($(MTK_PUMP_EXPRESS_SUPPORT), yes)
-LOCAL_CFLAGS += -DMTK_PUMP_EXPRESS_SUPPORT
-endif
-ifeq ($(MTK_PUMP_EXPRESS_PLUS_SUPPORT), yes)
-LOCAL_CFLAGS += -DMTK_PUMP_EXPRESS_PLUS_SUPPORT
-endif
-LOCAL_SHARED_LIBRARIES := libcutils libutils libc libstdc++ libz libdl liblog libgui libui
-
-LOCAL_STATIC_LIBRARIES += libfs_mgr
-
-LOCAL_C_INCLUDES += $(MTK_PATH_CUSTOM)/lk/include/target
-LOCAL_C_INCLUDES += $(MTK_PATH_PLATFORM)/lk/include/target
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
-LOCAL_C_INCLUDES += $(TOP)/external/zlib/
-LOCAL_C_INCLUDES += system/core/fs_mgr/include
-
-LOCAL_MODULE := libshowlogo
-LOCAL_MULTILIB := 32
-
-LOCAL_PRELINK_MODULE := false
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/proprietary/external/libusb/libusb/Android.mk b/proprietary/external/libusb/libusb/Android.mk
deleted file mode 100755
index 29dbad26c6b457b396cd25c5de5cf949a36cb22b..0000000000000000000000000000000000000000
--- a/proprietary/external/libusb/libusb/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
- core.c \
- descriptor.c \
- io.c \
- sync.c \
- os/linux_usbfs.c \
- os/threads_posix.c
-
-LOCAL_C_INCLUDES += \
-$(LOCAL_PATH)/../ \
-$(LOCAL_PATH)/os \
-$(LOCAL_PATH)/
-
-#LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/
-
-#LOCAL_MODULE_TAGS = eng
-LOCAL_MODULE:= libusb
-LOCAL_PRELINK_MODULE := false
-#include $(BUILD_STATIC_LIBRARY)
-include $(BUILD_SHARED_LIBRARY)
-
diff --git a/proprietary/external/libxlog/xlogcmd/Android.mk b/proprietary/external/libxlog/xlogcmd/Android.mk
deleted file mode 100755
index e924c200b7659812d327386fad43a54c6753dc96..0000000000000000000000000000000000000000
--- a/proprietary/external/libxlog/xlogcmd/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := \
-	xlog.c \
-	xlog_filter.c
-
-ifeq ($(HAVE_AEE_FEATURE),yes)
-LOCAL_CFLAGS += -DHAVE_AEE_FEATURE
-LOCAL_SHARED_LIBRARIES := \
-	liblog \
-	libcutils \
-	libaed
-else
-LOCAL_SHARED_LIBRARIES := \
-	liblog \
-	libcutils
-endif
-	
-LOCAL_MODULE := xlog
-LOCAL_MULTILIB := 32
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := \
-	xlog_filter.c \
-	xlog_filter_test.c
-LOCAL_MODULE := xlog_filter_test
-LOCAL_MODULE_TAGS = optional
-include $(BUILD_HOST_EXECUTABLE)
diff --git a/proprietary/external/limiter/Android.mk b/proprietary/external/limiter/Android.mk
deleted file mode 100755
index eada543aa26dd8540692bb194d65db0f5ff8b194..0000000000000000000000000000000000000000
--- a/proprietary/external/limiter/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-LOCAL_PATH := $(my-dir)
-
-include $(CLEAR_VARS)
-#LOCAL_PREBUILT_LIBS := libmtklimiter.so
-#LOCAL_MODULE_TAGS := optional
-#include $(BUILD_MULTI_PREBUILT)
-LOCAL_MODULE := libmtklimiter
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES_arm := libmtklimiter.so
-LOCAL_MODULE_SUFFIX := .so
-#ifeq ($(MTK_AUDIO_A64_SUPPORT),yes)
-LOCAL_SRC_FILES_arm64 := lib64mtklimiter.so
-LOCAL_MULTILIB := both
-#else
-#LOCAL_MULTILIB := 32
-#endif
-include $(BUILD_PREBUILT)
diff --git a/proprietary/external/matv/matv_cli/Android.mk b/proprietary/external/matv/matv_cli/Android.mk
deleted file mode 100755
index ff3e9f2504e7ad6b430a6597f3f5c150db9bf00d..0000000000000000000000000000000000000000
--- a/proprietary/external/matv/matv_cli/Android.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-
-LOCAL_PATH:= $(call my-dir)
-
-## ==> build this lib only when HAVE_MATV_FEATURE is yes
-ifeq ($(HAVE_MATV_FEATURE),yes)
-## build this lib for MT5192 or MT5193
-#ifeq ($(MTK_ATV_CHIP),MTK_MT5192)
-ifeq ($(MTK_ATV_CHIP), $(filter $(MTK_ATV_CHIP),MTK_MT5192 MTK_MT5193))
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:=       \
-	matv_cli.cpp
-
-LOCAL_SHARED_LIBRARIES := libcutils libutils libbinder libmedia
-
-LOCAL_C_INCLUDES:= $(TOP)/$(MTK_PATH_SOURCE)/frameworks-ext/av/include  
-
-LOCAL_CFLAGS += -Wno-multichar
-
-LOCAL_MODULE:= matv_cli
-
-include $(BUILD_EXECUTABLE)
-endif
-endif
-## <== build this lib only when HAVE_MATV_FEATURE is yes
diff --git a/proprietary/external/matv/matv_cust/Android.mk b/proprietary/external/matv/matv_cust/Android.mk
deleted file mode 100755
index 9fc16eeff51da2f9d6cc363e825d0d594b8e7e75..0000000000000000000000000000000000000000
--- a/proprietary/external/matv/matv_cust/Android.mk
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-LOCAL_PATH := $(call my-dir)
-
-## ==> build this lib only when HAVE_MATV_FEATURE is yes
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES+= matvctrl.c \
-                  fmctrl.c \
-                  mATVdrv_ps_api.cpp
-
-
-LOCAL_C_INCLUDES+= $(TOPDIR)$(MTK_PATH_SOURCE)/external/matvctrl
-
-ifeq ($(HAVE_MATV_FEATURE),yes)
-ifeq ($(MTK_ATV_CHIP), $(filter $(MTK_ATV_CHIP),MTK_MT5192 MTK_MT5193))
-LOCAL_SRC_FILES += custom/mATVdrv_cust.c
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/custom/
-ifeq ($(MTK_ATV_CHIP),MTK_MT5192)
-LOCAL_C_INCLUDES += $(TOP)/mediatek/custom/$(MTK_PROJECT)/kernel/matv/mt5192
-else
-LOCAL_C_INCLUDES += $(TOP)/mediatek/custom/$(MTK_PROJECT)/kernel/matv/mt5193
-endif
-
-LOCAL_GENERATE_CUSTOM_FOLDER := custom:hal/matv
-
-LOCAL_CFLAGS += -D__ATV_SUPPORT__
-LOCAL_CFLAGS += -D__MTK_TARGET__
-#for disabling the 6 dummy lines in image
-LOCAL_CFLAGS += -D__ATV_SP_SUPPORT__
-endif
-endif
-
-
-LOCAL_SHARED_LIBRARIES := \
-	libnativehelper \
-	libcutils \
-	libutils \
-	libbinder \
-
-ifeq ($(HAVE_MATV_FEATURE),yes)
-ifeq ($(MTK_ATV_CHIP),MTK_MT5192)
-LOCAL_STATIC_LIBRARIES += libmatvctrl
-else
-LOCAL_STATIC_LIBRARIES += libmatvctrl_93
-endif
-endif
-
-## ==> build this lib only when HAVE_MATV_FEATURE is yes
-ifeq ($(HAVE_MATV_FEATURE),yes)
-
-## build this lib for MT5192 only
-ifeq ($(MTK_ATV_CHIP),MTK_MT5192)
-#for disabling the 6 dummy lines in image
-LOCAL_CFLAGS += -DHAVE_MTK_MT5192
-endif
-
-ifeq ($(MTK_ATV_CHIP),MTK_MT5193)
-LOCAL_CFLAGS += -DHAVE_MTK_MT5193
-endif
-
-endif
-
-LOCAL_MODULE := libmatv_cust
-
-LOCAL_PRELINK_MODULE:=false 
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/proprietary/external/matv/matvctrl/Android.mk b/proprietary/external/matv/matvctrl/Android.mk
deleted file mode 100755
index 9d330e9034016b87a494b9034c0da34fc75b238e..0000000000000000000000000000000000000000
--- a/proprietary/external/matv/matvctrl/Android.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-LOCAL_PATH := $(my-dir)
-
-## ==> build this lib only when HAVE_MATV_FEATURE is yes
-#ifeq ($(HAVE_MATV_FEATURE),yes)
-## build this lib for MT5192 or MT5193
-#ifeq ($(MTK_ATV_CHIP),MTK_MT5192)
-ifeq ($(MTK_ATV_CHIP), $(filter $(MTK_ATV_CHIP),MTK_MT5192 MTK_MT5193))
-
-include $(CLEAR_VARS)
-ifeq ($(MTK_ATV_CHIP),MTK_MT5192)
-LOCAL_PREBUILT_LIBS := libmatvctrl.a
-else
-LOCAL_PREBUILT_LIBS := libmatvctrl_93.a
-endif
-include $(BUILD_MULTI_PREBUILT)
-endif
-#endif
-## <== build this lib only when HAVE_MATV_FEATURE is yes
diff --git a/proprietary/external/maxim/Android.mk b/proprietary/external/maxim/Android.mk
deleted file mode 100755
index 05a6085099fddc18c38b7d315c1920460890838f..0000000000000000000000000000000000000000
--- a/proprietary/external/maxim/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-ifeq ($(strip $(MAXIM_SPEAKER_SUPPORT)),yes)
-
-LOCAL_PATH := $(my-dir)
-
-############################## dsm prebuilt library
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libdsm
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES_arm := libdsm.so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_SRC_FILES_arm64 := lib64dsm.so
-LOCAL_MULTILIB := both
-include $(BUILD_PREBUILT)
-
-###############################################
-
-############################## dsm interface 
-include $(CLEAR_VARS)
-LOCAL_C_INCLUDES:=  $(LOCAL_PATH)
-
-LOCAL_SRC_FILES := 	mtk_dsm_interface.c
-LOCAL_MODULE := libdsm_interface
-
-LOCAL_C_INCLUDES = \
-    $(MTK_PATH_SOURCE)/external/maxim \
-    $(MTK_PATH_SOURCE)/external/maxim/tunning
-
-LOCAL_LDLIBS := -llog
-LOCAL_SHARED_LIBRARIES:= libcutils libutils libdsm
-LOCAL_MODULE_TAGS := optional
-LOCAL_PRELINK_MODULE := false
-LOCAL_MULTILIB := both
-include $(BUILD_SHARED_LIBRARY)
-
-###############################################
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
\ No newline at end of file
diff --git a/proprietary/external/maxim/tunning/Android.mk b/proprietary/external/maxim/tunning/Android.mk
deleted file mode 100755
index f89708b2acb7baa419c6e49beb8e53e506eb9cc8..0000000000000000000000000000000000000000
--- a/proprietary/external/maxim/tunning/Android.mk
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-ifeq ($(strip $(MAXIM_SPEAKER_SUPPORT)),yes)
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_C_INCLUDES:=  \
-    $(TOP)/external/tinyalsa/include \
-    $(TOP)/external/tinyxml
-
-LOCAL_SRC_FILES:= flex.cpp Parameters.cpp
-LOCAL_MODULE := dsm_ctrl
-LOCAL_SHARED_LIBRARIES:= libcutils libutils libbinder libmedia libtinyxml
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MULTILIB := 32
-
-include $(BUILD_EXECUTABLE)
-
-## dsm config parser lib
-
-include $(CLEAR_VARS)
-
-LOCAL_C_INCLUDES:=  \
-    $(TOP)/external/tinyalsa/include \
-    $(TOP)/external/tinyxml \
-    $(MTK_PATH_SOURCE)/external/maxim \
-    $(MTK_PATH_SOURCE)/external/maxim\tunning
-
-LOCAL_SRC_FILES:= dsm_config_parser.cpp
-LOCAL_MODULE := libdsmconfigparser
-LOCAL_SHARED_LIBRARIES:= libcutils libutils libbinder libmedia libtinyxml libdsm
-LOCAL_MODULE_TAGS := optional
-
-#LOCAL_MULTILIB := 32
-LOCAL_MULTILIB := both
-
-LOCAL_ARM_MODE := arm
-
-include $(BUILD_SHARED_LIBRARY)
-
-endif
\ No newline at end of file
diff --git a/proprietary/external/midiSeektable/Android.mk b/proprietary/external/midiSeektable/Android.mk
deleted file mode 100755
index e5cce3cb0390682ca59aa300a54022d39b555a32..0000000000000000000000000000000000000000
--- a/proprietary/external/midiSeektable/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libMST
-LOCAL_SRC_FILES := MIDISeektable.c
-
-
-
-#LOCAL_C_INCLUDES := $(KERNEL_HEADERS)
-#LOCAL_STATIC_LIBRARIES := libMST
-include $(BUILD_STATIC_LIBRARY)
-
-
diff --git a/proprietary/external/mkimage/Android.mk b/proprietary/external/mkimage/Android.mk
deleted file mode 100755
index c8ed5b0c9de7822bf120996f128a52dbd3dbdd76..0000000000000000000000000000000000000000
--- a/proprietary/external/mkimage/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := mkimage
-LOCAL_SRC_FILES := mkimage.c
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_HOST_EXECUTABLE)
diff --git a/proprietary/external/mmc_ffu/Android.mk b/proprietary/external/mmc_ffu/Android.mk
deleted file mode 100755
index e3ba1a38c9147eec66936a3dd481c8c9f9e6db24..0000000000000000000000000000000000000000
--- a/proprietary/external/mmc_ffu/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES:= mmc.c
-LOCAL_MODULE := mmc_ffu
-LOCAL_SHARED_LIBRARIES := libcutils libc
-LOCAL_C_INCLUDES += \
-    bionic/libc/kernel/uapi/linux/mmc \
-    device/mediatek/common/kernel-headers/linux/mmc
-include $(BUILD_EXECUTABLE)
diff --git a/proprietary/external/mp3dec/Android.mk b/proprietary/external/mp3dec/Android.mk
deleted file mode 100755
index ce4febaa05f4dea6d12ecee689c44d0483289008..0000000000000000000000000000000000000000
--- a/proprietary/external/mp3dec/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-LOCAL_PATH := $(my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libmp3dec_mtk
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_SRC_FILES_32 := arm/libmp3dec_mtk.a
-LOCAL_SRC_FILES_64 := libmp3dec_mtk.a
-#LOCAL_SRC_FILES_arm64 := libmp3dec64_mtk.a
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MULTILIB := both
-
-#LOCAL_PREBUILT_LIBS += libmp3dec.so \
-#                       libmp3frmlen.so \
-#                       libdrvb.a
-
-include $(BUILD_PREBUILT)
-
diff --git a/proprietary/external/mpud6050/Android.mk b/proprietary/external/mpud6050/Android.mk
deleted file mode 100755
index 730a3ce3fdc364d889ea1ba9470ad52182d097b2..0000000000000000000000000000000000000000
--- a/proprietary/external/mpud6050/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# InvenSense MPU6050 Daemon
-#
-ifeq ($(CUSTOM_KERNEL_GYROSCOPE), y)
-
-LOCAL_PATH := $(my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_PREBUILT_LIBS := libmllitd.so libmplmpd.so
-
-include $(BUILD_MULTI_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_PREBUILT_EXECUTABLES := mpud6050
-#LOCAL_MODULE_TAGS := user
-
-include $(BUILD_MULTI_PREBUILT)
-
-endif
diff --git a/proprietary/external/msbc_codec/Android.mk b/proprietary/external/msbc_codec/Android.mk
deleted file mode 100755
index c18c88801e75c733ce5baf84b8e25d669bf56b91..0000000000000000000000000000000000000000
--- a/proprietary/external/msbc_codec/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-LOCAL_PATH := $(my-dir)
-
-include $(CLEAR_VARS)
-#LOCAL_PREBUILT_LIBS := libmsbc_mtk.so
-#LOCAL_MODULE_TAGS := optional
-#include $(BUILD_MULTI_PREBUILT)
-LOCAL_MODULE := libmsbc_mtk
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES_arm := libmsbc_mtk.so
-LOCAL_MODULE_SUFFIX := .so
-#ifeq ($(MTK_AUDIO_A64_SUPPORT),yes)
-LOCAL_SRC_FILES_arm64 := lib64msbc_mtk.so
-LOCAL_MULTILIB := both
-#else
-#LOCAL_MULTILIB := 32
-#endif
-include $(BUILD_PREBUILT)
diff --git a/proprietary/external/mtd-utils/Android.mk b/proprietary/external/mtd-utils/Android.mk
deleted file mode 100755
index 59da3dff04d2a3131cd589d21179636cb90a5871..0000000000000000000000000000000000000000
--- a/proprietary/external/mtd-utils/Android.mk
+++ /dev/null
@@ -1,366 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-#ifeq ($(strip $(TARGET_USERIMAGES_USE_UBIFS)),true)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-	lib/libcrc32.c \
-	mkfs.ubifs/compr.c \
-	mkfs.ubifs/crc16.c \
-	mkfs.ubifs/devtable.c \
-	mkfs.ubifs/hashtable/hashtable.c \
-	mkfs.ubifs/hashtable/hashtable_itr.c \
-	mkfs.ubifs/lpt.c \
-	mkfs.ubifs/mkfs.ubifs.c \
-	ubi-utils/libubi.c \
-	lz4k_encoder/lz4k_compress.c \
-	lz4k_encoder/lz4k_decompress.c \
-	lz4k_encoder/lz4k_matcher.c \
-	lz4k_encoder/divsufsort.c \
-	lz4k_encoder/sssort.c \
-	lz4k_encoder/trsort.c \
-	../../../../../external/e2fsprogs/lib/uuid/gen_uuid.c \
-	../../../../../external/e2fsprogs/lib/uuid/pack.c \
-	../../../../../external/e2fsprogs/lib/uuid/unpack.c \
-	../../../../../external/e2fsprogs/lib/uuid/unparse.c \
-	../lzo/src/lzo1x_9x.c \
-
-LOCAL_C_INCLUDES := \
-	external/e2fsprogs/lib \
-	$(MTK_ROOT)/external/mtd-utils/include \
-	$(MTK_ROOT)/external/mtd-utils/ubi-utils/include \
-	$(MTK_ROOT)/external/lzo/include \
-
-LOCAL_CFLAGS := -O2 -Wall \
-	-DHAVE_INTTYPES_H \
-	-DHAVE_UNISTD_H \
-	-DHAVE_ERRNO_H \
-	-DHAVE_NETINET_IN_H \
-	-DHAVE_SYS_IOCTL_H \
-	-DHAVE_SYS_MMAN_H \
-	-DHAVE_SYS_MOUNT_H \
-	-DHAVE_SYS_PRCTL_H \
-	-DHAVE_SYS_RESOURCE_H \
-	-DHAVE_SYS_SELECT_H \
-	-DHAVE_SYS_STAT_H \
-	-DHAVE_SYS_TYPES_H \
-	-DHAVE_STDLIB_H \
-	-DHAVE_STRDUP \
-	-DHAVE_MMAP \
-	-DHAVE_UTIME_H \
-	-DHAVE_GETPAGESIZE \
-	-DHAVE_LSEEK64 \
-	-DHAVE_LSEEK64_PROTOTYPE \
-	-DHAVE_EXT2_IOCTLS \
-	-DHAVE_LINUX_FD_H \
-	-DHAVE_TYPE_SSIZE_T \
-	-DHAVE_SYS_TIME_H \
-	-DHAVE_SYSCONF
-
-LOCAL_STATIC_LIBRARIES := libz libselinux libcutils liblog
-
-ifeq ($(strip $(MTK_NAND_UBIFS_LZ4K_SUPPORT)),yes)
-LOCAL_CFLAGS += -D__NAND_UBIFS_LZ4K_SUPPORT
-endif
-
-LOCAL_MODULE := mkfs_ubifs
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_HOST_EXECUTABLE)
-
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-	lib/libcrc32.c \
-	ubi-utils/dictionary.c \
-	ubi-utils/libiniparser.c \
-	ubi-utils/libubigen.c \
-	ubi-utils/ubinize.c \
-	ubi-utils/ubiutils-common.c \
-
-LOCAL_C_INCLUDES := \
-	$(MTK_ROOT)/external/mtd-utils/include \
-	$(MTK_ROOT)/external/mtd-utils/ubi-utils/include \
-
-LOCAL_CFLAGS := -O2 -Wall
-ifeq ($(strip $(MTK_SLC_BUFFER_SUPPORT)),yes)
-LOCAL_CFLAGS +=	-DMTK_SLC_BUFFER_SUPPORT
-endif
-
-LOCAL_MODULE := ubinize
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_HOST_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-	ftl-utils/mkftl.c \
-	../lzo/src/lzo1x_9x.c \
-	lz4k_encoder/lz4k_compress.c \
-	lz4k_encoder/lz4k_decompress.c \
-	lz4k_encoder/lz4k_matcher.c \
-	lz4k_encoder/divsufsort.c \
-	lz4k_encoder/sssort.c \
-	lz4k_encoder/trsort.c \
-
-LOCAL_C_INCLUDES := \
-	$(MTK_ROOT)/external/mtd-utils/include \
-	$(MTK_ROOT)/external/mtd-utils/ubi-utils/include \
-	$(MTK_ROOT)/external/lzo/include \
-
-LOCAL_CFLAGS := -O2 -Wall
-ifeq ($(strip $(MTK_NAND_UBIFS_LZ4K_SUPPORT)),yes)
-LOCAL_CFLAGS += -D__NAND_UBIFS_LZ4K_SUPPORT
-endif
-
-LOCAL_MODULE := mkftl
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_HOST_EXECUTABLE)
-
-#endif
-
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := lib/libmtd.c \
-                   lib/libmtd_legacy.c \
-                   lib/libcrc32.c \
-                   lib/libfec.c \
-
-LOCAL_C_INCLUDES := \
-        $(MTK_ROOT)/external/mtd-utils/include \
-        $(MTK_ROOT)/external/mtd-utils/ubi-utils/include \
-
-LOCAL_CFLAGS := -O2 -Wall
-
-LOCAL_MODULE := libmtd
-
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_STATIC_LIBRARY)
-
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := nandwrite.c
-
-LOCAL_C_INCLUDES := \
-        $(MTK_ROOT)/external/mtd-utils/include \
-        $(MTK_ROOT)/external/mtd-utils/ubi-utils/include \
-
-LOCAL_CFLAGS := -O2 -Wall
-
-LOCAL_MODULE := nandwrite
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_STATIC_LIBRARIES := libmtd 
-
-include $(BUILD_EXECUTABLE)
-
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := flash_erase.c \
-
-LOCAL_C_INCLUDES := $(MTK_ROOT)/external/mtd-utils/include \
-
-LOCAL_CFLAGS := -O2 -Wall
-
-LOCAL_MODULE := flash_erase
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_STATIC_LIBRARIES := libmtd
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := ubi-utils/ubiformat.c \
-		ubi-utils/libubi.c \
-		ubi-utils/ubiutils-common.c \
-		ubi-utils/libscan.c \
-		ubi-utils/libubigen.c \
-
-LOCAL_C_INCLUDES := $(MTK_ROOT)/external/mtd-utils/include \
-                    $(MTK_ROOT)/external/mtd-utils/ubi-utils/include
-
-LOCAL_CFLAGS := -O2 -Wall
-
-LOCAL_MODULE := ubiformat
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_STATIC_LIBRARIES := libmtd
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := ubi-utils/ubiformat.c \
-		ubi-utils/libubi.c \
-		ubi-utils/ubiutils-common.c \
-		ubi-utils/libscan.c \
-		ubi-utils/libubigen.c \
-
-LOCAL_C_INCLUDES := $(MTK_ROOT)/external/mtd-utils/include \
-                    $(MTK_ROOT)/external/mtd-utils/ubi-utils/include
-
-LOCAL_CFLAGS := -O2 -Wall
-
-LOCAL_MODULE := ubiformat_static
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_STATIC_LIBRARIES := libc libstdc++ libmtd
-LOCAL_FORCE_STATIC_EXECUTABLE := true
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := ubi-utils/libubi.c \
-		ubi-utils/ubiutils-common.c \
-
-LOCAL_C_INCLUDES := $(MTK_ROOT)/external/mtd-utils/include \
-                    $(MTK_ROOT)/external/mtd-utils/ubi-utils/include
-
-LOCAL_CFLAGS := -O2 -Wall
-
-LOCAL_MODULE := ubi_ota_update
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_STATIC_LIBRARIES := libmtd
-
-include $(BUILD_STATIC_LIBRARY)
-
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := ubi-utils/ubinfo.c \
-		ubi-utils/libubi.c \
-		ubi-utils/ubiutils-common.c \
-
-LOCAL_C_INCLUDES := $(MTK_ROOT)/external/mtd-utils/include \
-                    $(MTK_ROOT)/external/mtd-utils/ubi-utils/include
-
-LOCAL_CFLAGS := -O2 -Wall
-
-LOCAL_MODULE := ubinfo
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_STATIC_LIBRARIES := libmtd
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := ubi-utils/ubiattach.c \
-		ubi-utils/libubi.c \
-		ubi-utils/ubiutils-common.c \
-
-LOCAL_C_INCLUDES := $(MTK_ROOT)/external/mtd-utils/include \
-                    $(MTK_ROOT)/external/mtd-utils/ubi-utils/include
-
-LOCAL_CFLAGS := -O2 -Wall
-
-LOCAL_MODULE := ubiattach
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_STATIC_LIBRARIES := libmtd
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := ubi-utils/ubidetach.c \
-		ubi-utils/libubi.c \
-
-LOCAL_C_INCLUDES := $(MTK_ROOT)/external/mtd-utils/include \
-                    $(MTK_ROOT)/external/mtd-utils/ubi-utils/include
-
-LOCAL_CFLAGS := -O2 -Wall
-
-LOCAL_MODULE := ubidetach
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_STATIC_LIBRARIES := libmtd
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := ubi-utils/ubimkvol.c \
-		ubi-utils/libubi.c \
-		ubi-utils/ubiutils-common.c \
-
-LOCAL_C_INCLUDES := $(MTK_ROOT)/external/mtd-utils/include \
-                    $(MTK_ROOT)/external/mtd-utils/ubi-utils/include
-
-LOCAL_CFLAGS := -O2 -Wall
-
-LOCAL_MODULE := ubimkvol
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_STATIC_LIBRARIES := libmtd
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := ubi-utils/ubirmvol.c \
-		ubi-utils/libubi.c \
-
-
-LOCAL_C_INCLUDES := $(MTK_ROOT)/external/mtd-utils/include \
-                    $(MTK_ROOT)/external/mtd-utils/ubi-utils/include
-
-LOCAL_CFLAGS := -O2 -Wall
-
-LOCAL_MODULE := ubirmvol
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_STATIC_LIBRARIES := libmtd
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := ubi-utils/ubiupdatevol.c \
-		ubi-utils/libubi.c \
-
-
-LOCAL_C_INCLUDES := $(MTK_ROOT)/external/mtd-utils/include \
-                    $(MTK_ROOT)/external/mtd-utils/ubi-utils/include
-
-LOCAL_CFLAGS := -O2 -Wall
-
-LOCAL_MODULE := ubiupdatevol
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_STATIC_LIBRARIES := libmtd
-
-include $(BUILD_EXECUTABLE)
-
-ifneq ($(strip $(MTK_SLC_BUFFER_SUPPORT)),yes)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := ubi-utils/mtdinfo.c \
-		ubi-utils/libubi.c \
-		ubi-utils/ubiutils-common.c \
-		ubi-utils/libubigen.c \
-
-LOCAL_C_INCLUDES := $(MTK_ROOT)/external/mtd-utils/include \
-                    $(MTK_ROOT)/external/mtd-utils/ubi-utils/include
-
-LOCAL_CFLAGS := -O2 -Wall
-
-LOCAL_MODULE := mtdinfo
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_STATIC_LIBRARIES := libmtd
-
-include $(BUILD_EXECUTABLE)
-endif
diff --git a/proprietary/external/mtknfc/Android.mk b/proprietary/external/mtknfc/Android.mk
deleted file mode 100755
index e57ba3917955dc2d61e4ccc6891d32dc3d97949a..0000000000000000000000000000000000000000
--- a/proprietary/external/mtknfc/Android.mk
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-###############################################################################
-# build start
-###############################################################################
-
-ifeq ($(MTK_NFC_SUPPORT), yes)
-MTK_NFC_HAL=0
-MTK_NFC_SKIP=0
-BUILD_PORTING=no
-BUILD_HALIMPL=no
-BUILD_MW_LIB=no
-AOSP_NFC_PATH=$(strip $(wildcard $(MTK_PATH_SOURCE)/hardware/nfc/Android.mk))
-MTK_NFC_PATH=$(strip $(wildcard $(MTK_PATH_SOURCE)/external/mtknfc/Android.mk))
-
-LOCAL_PATH := $(call my-dir)
-
-ifndef MTK_NFC_PACKAGE
-    
-    ifeq ($(strip $(MTK_BASIC_PACKAGE)), yes)
-        MTK_NFC_HAL=AOSP_B
-    else ifeq ($(strip $(MTK_BSP_PACKAGE)), yes)
-        MTK_NFC_HAL=AOSP_B
-    else
-        MTK_NFC_HAL=MTK
-    endif         
-else
-    MTK_NFC_HAL=$(MTK_NFC_PACKAGE)
-endif
-#compare conflict fold
-ifneq ($(MTK_NFC_PATH),null)
-    ifneq ($(AOSP_NFC_PATH),null)
-        MTK_NFC_SKIP=1
-    endif  
-else
-    MTK_NFC_SKIP=0
-endif    
-
-########################################
-# build option (yes/no)
-########################################
-ifeq ($(MTK_NFC_HAL), MTK)
-    ifeq ($(MTK_NFC_SKIP),1)
-        ifneq ($(LOCAL_PATH), $(MTK_PATH_SOURCE)/hardware/nfc)
-BUILD_PORTING=yes
-BUILD_HALIMPL=yes
-            BUILD_MW_LIB=yes
-        endif
-    else
-        BUILD_PORTING=yes
-        BUILD_HALIMPL=yes
-        BUILD_MW_LIB=yes
-    endif    
-else ifeq ($(MTK_NFC_HAL), AOSP_B)
-    ifeq ($(MTK_NFC_SKIP),1)
-        ifneq ($(LOCAL_PATH), $(MTK_PATH_SOURCE)/external/mtknfc)
-            BUILD_PORTING=yes
-            BUILD_HALIMPL=yes
-            BUILD_MW_LIB=yes
-        endif
-    else
-        BUILD_PORTING=yes
-        BUILD_HALIMPL=yes
-        BUILD_MW_LIB=yes
-    endif   
-endif
-
-$(info BUILD_PORTING=$(BUILD_PORTING))
-$(info BUILD_HALIMPL=$(BUILD_HALIMPL))
-$(info BUILD_MW_LIB=$(BUILD_MW_LIB))
-$(info MTK_NFC_HAL=$(MTK_NFC_HAL))
-########################################
-# prebuilt MTK NFC lib
-########################################
-ifeq ($(BUILD_MW_LIB), yes)
-include $(LOCAL_PATH)/lib/Android.mk
-include $(LOCAL_PATH)/lib64/Android.mk
-# $(call add-prebuilt-files, SHARED_LIBRARIES, libmtknfc.so)
-
-MY_LOCAL_PATH := $(LOCAL_PATH)
-endif ########ifeq ($(BUILD_MW_LIB), yes)
-
-
-########################################
-# MTK NFC Executable
-########################################
-ifeq ($(BUILD_PORTING), yes)
-include $(LOCAL_PATH)/PL.mk
-LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-
-LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED)
-LOCAL_MULTILIB := 32
-include $(BUILD_EXECUTABLE)
-
-endif ########ifeq ($(BUILD_PORTING), yes)
-
-  
-########################################
-# MTK NFC AOSP HAL
-########################################
-ifeq ($(BUILD_HALIMPL), yes)
-# Build shared library system/lib/hw/nfc_nci.*.so for Hardware Abstraction Layer.
-# Android's generic HAL (libhardware.so) dynamically loads this shared library.
-include $(LOCAL_PATH)/halimpl.mk
-#LOCAL_MULTILIB := both
-LOCAL_MODULE_RELATIVE_PATH := hw
-
-include $(BUILD_SHARED_LIBRARY)
-endif ########ifeq ($(BUILD_HALIMPL), yes)
-endif ########ifeq ($(MTK_NFC_SUPPORT), yes)
diff --git a/proprietary/external/mtknfc/lib/Android.mk b/proprietary/external/mtknfc/lib/Android.mk
deleted file mode 100755
index be3a2b7fc592e06e0a0090be95dae5675ae23c5a..0000000000000000000000000000000000000000
--- a/proprietary/external/mtknfc/lib/Android.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-#LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libmtknfc
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES_arm := lib/libmtknfc.so
-#LOCAL_SRC_FILES_arm64 := lib64/libmtknfc.so
-LOCAL_MODULE_SUFFIX := .so
-#LOCAL_MULTILIB := both
-LOCAL_MULTILIB := 32
-include $(BUILD_PREBUILT)
-
-
diff --git a/proprietary/external/mtknfc/lib64/Android.mk b/proprietary/external/mtknfc/lib64/Android.mk
deleted file mode 100755
index bc84526a20eb0692b1b142213244f6dd87d51119..0000000000000000000000000000000000000000
--- a/proprietary/external/mtknfc/lib64/Android.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-#LOCAL_PATH := $(call my-dir)
-
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libmtknfc
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-#LOCAL_SRC_FILES_arm := libmtknfc.so
-LOCAL_SRC_FILES_arm64 := lib64/libmtknfc.so
-LOCAL_MODULE_SUFFIX := .so
-#LOCAL_MULTILIB := both
-LOCAL_MULTILIB := 64
-
-include $(BUILD_PREBUILT)
-
diff --git a/proprietary/external/mu3d/Android.mk b/proprietary/external/mu3d/Android.mk
deleted file mode 100755
index 1ea395a1d1f00c8d623066058785a3e0f36bf268..0000000000000000000000000000000000000000
--- a/proprietary/external/mu3d/Android.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-$(info Building ts_mu3d)
-
-# Build the target version
-include $(CLEAR_VARS)
-
-MU3D_TS_SRC_FILES :=  auto_test_cmd.c \
-											cli_input.c \
-											cli_parser.c \
-											dev_test_cmd.c \
-											hub_test_cmd.c \
-											main.c \
-											ring_test_cmd.c \
-											stress_test_cmd.c \
-											cli_command.c \
-											cli_modulecmd.c \
-											dbg_cmd.c \
-											hcd_test_cmd.c \
-											loop_test_cmd.c \
-											power_test_cmd.c \
-											slot_test_cmd.c
-
-MU3D_TS_MODULE := ts_mu3d
-
-ifeq ($(DEBUG_TS_MU3D),yes)
-MU3D_TS_CFLAGS := -DDEBUG_TS_MU3D
-else
-MU3D_TS_CFLAGS :=
-endif
-
-
-LOCAL_SRC_FILES := $(MU3D_TS_SRC_FILES)
-LOCAL_MODULE := $(MU3D_TS_MODULE)
-LOCAL_CFLAGS += $(MU3D_TS_CFLAGS)
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_EXECUTABLE)
diff --git a/proprietary/external/mvg_app/Android.mk b/proprietary/external/mvg_app/Android.mk
deleted file mode 100755
index a4d2feee1e567c509fa6fe71841748cbfe0411ea..0000000000000000000000000000000000000000
--- a/proprietary/external/mvg_app/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-LOCAL_PATH:=$(call my-dir)
-include $(CLEAR_VARS)
-#LOCAL_ARM_MODE:=arm
-LOCAL_SHARED_LIBRARIES:= libc libcutils
-LOCAL_SRC_FILES:= \
-    MVG_Powerloss_App.c
-LOCAL_C_INCLUDES:= external/mediatek/MVG_APP
-LOCAL_MODULE:=mvg_app
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_EXECUTABLE)
-
-
diff --git a/proprietary/external/nvram/libcustom_nvram/Android.mk b/proprietary/external/nvram/libcustom_nvram/Android.mk
deleted file mode 100755
index 34f6dceebdf19a585627a2ce807a42e15c775fa0..0000000000000000000000000000000000000000
--- a/proprietary/external/nvram/libcustom_nvram/Android.mk
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-LOCAL_PATH:=$(call my-dir)
-include $(CLEAR_VARS)
-#LOCAL_ARM_MODE:=arm
-
-# DMNR 3.0
-ifeq ($(strip $(MTK_HANDSFREE_DMNR_SUPPORT)),yes)
-  LOCAL_CFLAGS += -DMTK_HANDSFREE_DMNR_SUPPORT
-endif
-# DMNR 3.0
-
-# Dual Mic Support
-ifeq ($(MTK_DUAL_MIC_SUPPORT),yes)
-LOCAL_CFLAGS += -D__MTK_DUAL_MIC_SUPPORT__
-endif
-# Dual Mic Support
-
-# VoIP normal mode DMNR Support
-ifeq ($(MTK_VOIP_NORMAL_DMNR),yes)
-LOCAL_CFLAGS += -D__MTK_VOIP_NORMAL_DMNR__
-endif
-# VoIP normal mode DMNR Support
-
-# VoIP handsfree mode DMNR Support
-ifeq ($(MTK_VOIP_HANDSFREE_DMNR),yes)
-LOCAL_CFLAGS += -D__MTK_VOIP_HANDSFREE_DMNR__
-endif
-# VoIP handsfree mode DMNR Support
-
-# Merge Interface Support
-ifeq ($(MTK_MERGE_INTERFACE_SUPPORT),yes)
-LOCAL_CFLAGS += -D__MTK_MERGE_INTERFACE_SUPPORT__
-endif
-# Merge Interface Support
-
-# BT I2S interface Support
-ifeq ($(MTK_BT_I2S_SUPPORT),yes)
-LOCAL_CFLAGS += -D__MTK_BT_I2S_SUPPORT__
-endif
-# BT I2S interface Support
-
-# NXP Speaker Support
-ifeq ($(NXP_SMARTPA_SUPPORT),yes)
-LOCAL_CFLAGS += -D__NXP_SMARTPA_SUPPORT__
-endif
-# NXP Speaker Support
-
-LOCAL_SHARED_LIBRARIES:= libc libcutils
-LOCAL_SRC_FILES:= \
-      CFG_file_info.c
-LOCAL_C_INCLUDES:= \
-      $(MTK_PATH_SOURCE)/external/nvram/libnvram
-LOCAL_MODULE:=libcustom_nvram
-LOCAL_MODULE_TAGS := optional
-LOCAL_PRELINK_MODULE:= false
-include $(BUILD_SHARED_LIBRARY)
-
-
diff --git a/proprietary/external/nvram/libnvram_daemon_callback/Android.mk b/proprietary/external/nvram/libnvram_daemon_callback/Android.mk
deleted file mode 100755
index 70658fde1c4d846e03ae8276435cc421a70f07f4..0000000000000000000000000000000000000000
--- a/proprietary/external/nvram/libnvram_daemon_callback/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-LOCAL_PATH:=$(call my-dir)
-include $(CLEAR_VARS)
-#LOCAL_ARM_MODE:=arm
-LOCAL_SHARED_LIBRARIES:= libc libcutils libcustom_nvram libnvram
-LOCAL_SRC_FILES:= \
-      libnvram_daemon_callback.c
-LOCAL_C_INCLUDES:= \
-      $(MTK_PATH_SOURCE)/external/nvram/libfile_op \
-      $(MTK_PATH_SOURCE)/external/nvram/libnvram \
-      $(MTK_PATH_SOURCE)/external/mtd_util \
-LOCAL_STATIC_LIBRARIES := libmtd_util
-LOCAL_MODULE:=libnvram_daemon_callback
-LOCAL_MODULE_TAGS := optional
-LOCAL_PRELINK_MODULE:= false
-include $(BUILD_SHARED_LIBRARY)
-
-
diff --git a/proprietary/external/nxp/Android.mk b/proprietary/external/nxp/Android.mk
deleted file mode 100755
index ed568e138d1e3092e4ebfb1b62f02047b122c943..0000000000000000000000000000000000000000
--- a/proprietary/external/nxp/Android.mk
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-ifeq ($(strip $(NXP_SMARTPA_SUPPORT)),tfa9890)
-
-LOCAL_PATH:= $(call my-dir)
-
-############################## libtfa9890_interface
-include $(CLEAR_VARS)
-LOCAL_CFLAGS += -DNXP_TFA9890_SUPPORT
-LOCAL_C_INCLUDES:=  $(LOCAL_PATH)/tfa9890 \
-                    $(LOCAL_PATH)/tfa9890/hal/inc \
-                    $(LOCAL_PATH)/tfa9890/tfa/inc \
-                    $(LOCAL_PATH)/tfa9890/srv/inc
-                    
-LOCAL_SRC_FILES := 	tfa9890/tfa9890_interface.c \
-                    mtk_tfa98xx_interface.c
-
-LOCAL_MODULE := libtfa9890_interface
-LOCAL_SHARED_LIBRARIES:= libcutils libutils
-LOCAL_STATIC_LIBRARIES:= libtfasrv libtfa98xx libtfahal
-LOCAL_MODULE_TAGS := optional
-LOCAL_PRELINK_MODULE := false
-
-include $(BUILD_SHARED_LIBRARY)
-
-###############################################
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
-
-ifeq ($(NXP_SMARTPA_SUPPORT),yes)
-
-LOCAL_PATH:= $(call my-dir)
-
-############################## libtfa9887_interface
-include $(CLEAR_VARS)
-LOCAL_CFLAGS += -DNXP_TFA9887_SUPPORT
-LOCAL_C_INCLUDES:= \
-    $(LOCAL_PATH)/tfa9887/interface \
-    $(LOCAL_PATH)/tfa9887/climax/inc \
-    $(LOCAL_PATH)/tfa9887/climax/src/lxScribo \
-    $(LOCAL_PATH)/tfa9887/climax/src/lxScribo/scribosrv \
-    $(LOCAL_PATH)/tfa9887/Tfa98xxhal/inc \
-    $(LOCAL_PATH)/tfa9887/Tfa98xxhal/src/lxScribo \
-    $(LOCAL_PATH)/tfa9887/Tfa98xxhal/inc \
-    $(LOCAL_PATH)/tfa9887/Tfa98xx/inc \
-    $(LOCAL_PATH)/tfa9887/Tfa98xx/src
-                    
-LOCAL_SRC_FILES := 	tfa9887/interface/tfa9887_interface.c \
-                    mtk_tfa98xx_interface.c
-
-LOCAL_MODULE := libtfa9887_interface
-LOCAL_SHARED_LIBRARIES:= libcutils libutils
-LOCAL_STATIC_LIBRARIES:= libtfa9887 liblxScribo9887
-LOCAL_MODULE_TAGS := optional
-LOCAL_PRELINK_MODULE := false
-
-include $(BUILD_SHARED_LIBRARY)
-
-###############################################
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
-
diff --git a/proprietary/external/nxp/tfa9887/Android.mk b/proprietary/external/nxp/tfa9887/Android.mk
deleted file mode 100755
index 6c884f47c9a0556cbc9e02ed66d193d19aa5e64b..0000000000000000000000000000000000000000
--- a/proprietary/external/nxp/tfa9887/Android.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-ifeq ($(NXP_SMARTPA_SUPPORT),yes)
-
-LOCAL_PATH:= $(call my-dir)
-
-# linux scribo
-include $(CLEAR_VARS)
-$(info $(LOCAL_PATH))
-LOCAL_C_INCLUDES:= \
-    $(LOCAL_PATH)/climax/inc \
-    $(LOCAL_PATH)/climax/src/lxScribo \
-    $(LOCAL_PATH)/climax/src/lxScribo/scribosrv \
-    $(LOCAL_PATH)/Tfa98xxhal/inc \
-    $(LOCAL_PATH)/Tfa98xxhal/src/lxScribo \
-    $(LOCAL_PATH)/Tfa98xxhal/inc \
-    $(LOCAL_PATH)/Tfa98xx/inc \
-    $(LOCAL_PATH)/Tfa98xx/src
-    
-LOCAL_SRC_FILES:= \
-    Tfa98xxhal/src/lxScribo/lxScribo.c \
-    Tfa98xxhal/src/lxScribo/lxDummy.c \
-    Tfa98xxhal/src/lxScribo/lxScriboSerial.c \
-    Tfa98xxhal/src/lxScribo/lxScriboSocket.c \
-    Tfa98xxhal/src/lxScribo/lxI2c.c \
-	  Tfa98xxhal/src/NXP_I2C_linux.c \
-    Tfa98xxhal/src/lxScribo/i2cserver.c \
-    Tfa98xxhal/src/lxScribo/cmd.c
-    
-LOCAL_MODULE := liblxScribo9887
-LOCAL_SHARED_LIBRARIES:= libcutils libutils
-LOCAL_MODULE_TAGS := optional
-LOCAL_PRELINK_MODULE := false
-include $(BUILD_STATIC_LIBRARY)
-
-
-# libtfa98xx 
-include $(CLEAR_VARS)
-
-$(info $(LOCAL_PATH))
-
-LOCAL_C_INCLUDES+= \
-    $(LOCAL_PATH)/climax/inc \
-    $(LOCAL_PATH)/climax/src/lxScribo \
-    $(LOCAL_PATH)/climax/src/lxScribo/scribosrv \
-    $(LOCAL_PATH)/Tfa98xxhal/inc \
-    $(LOCAL_PATH)/Tfa98xxhal/src/lxScribo \
-    $(LOCAL_PATH)/Tfa98xxhal/inc \
-    $(LOCAL_PATH)/Tfa98xx/inc \
-    $(LOCAL_PATH)/Tfa98xx/src
-
-LOCAL_SRC_FILES:= \
-    Tfa98xx/src/Tfa98xx.c \
-	  Tfa98xx/src/Tfa98xx_TextSupport.c \
-	  Tfa98xx/src/Tfa9887.c \
-	  Tfa98xx/src/initTfa9887.c
-
-LOCAL_MODULE := libtfa9887
-LOCAL_SHARED_LIBRARIES:= libcutils libutils
-LOCAL_STATIC_LIBRARIES:= liblxScribo9887
-LOCAL_MODULE_TAGS := optional
-LOCAL_PRELINK_MODULE := false
-include $(BUILD_STATIC_LIBRARY)
-
-# cli app
-include $(CLEAR_VARS)
-
-LOCAL_C_INCLUDES:= \
-    $(LOCAL_PATH)/climax/inc \
-    $(LOCAL_PATH)/climax/src/lxScribo \
-    $(LOCAL_PATH)/climax/src/lxScribo/scribosrv \
-    $(LOCAL_PATH)/Tfa98xxhal/inc \
-    $(LOCAL_PATH)/Tfa98xxhal/src/lxScribo \
-    $(LOCAL_PATH)/Tfa98xxhal/inc \
-    $(LOCAL_PATH)/Tfa98xx/inc \
-    $(LOCAL_PATH)/Tfa98xx/src
-    
-LOCAL_SRC_FILES:= \
-    climax/src/climax.c \
-    climax/src/cliCommands.c \
-    climax/src/cli/cmdline.c \
-    climax/src/nxpTfa98xx.c \
-    climax/src/tfa98xxCalibration.c \
-    climax/src/tfa98xxDiagnostics.c \
-    climax/src/tfa98xxLiveData.c \
-    climax/src/tfa98xxRuntime.c
-    
-
-LOCAL_SHARED_LIBRARIES:= libcutils libutils
-LOCAL_STATIC_LIBRARIES:= libtfa9887 liblxScribo9887
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := climaxtest
-include $(BUILD_EXECUTABLE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
diff --git a/proprietary/external/nxp/tfa9890/Android.mk b/proprietary/external/nxp/tfa9890/Android.mk
deleted file mode 100755
index ad7768fc215a94550756fd3b1588083ab248e120..0000000000000000000000000000000000000000
--- a/proprietary/external/nxp/tfa9890/Android.mk
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-ifeq ($(strip $(NXP_SMARTPA_SUPPORT)),tfa9890)
-
-LOCAL_PATH:= $(call my-dir)
-
-#NOTE: for now we use static libs
-############################## libtfahal linux
-include $(CLEAR_VARS)
-LOCAL_C_INCLUDES:= 	$(LOCAL_PATH)/hal/inc \
-                    $(LOCAL_PATH)/tfa/inc \
-                    $(LOCAL_PATH)/hal/src/lxScribo
-
-LOCAL_SRC_FILES:= 	hal/src/NXP_I2C_linux.c  \
-                    hal/src/lxScribo/lxScribo.c \
-                    hal/src/lxScribo/lxDummy.c  \
-                    hal/src/lxScribo/lxScriboSerial.c  \
-                    hal/src/lxScribo/lxScriboSocket.c\
-                    hal/src/lxScribo/lxI2c.c \
-                    hal/src/lxScribo/scribosrv/i2cserver.c \
-                    hal/src/lxScribo/scribosrv/cmd.c
-LOCAL_MODULE := libtfahal
-LOCAL_SHARED_LIBRARIES:= libcutils libutils
-LOCAL_MODULE_TAGS := optional
-LOCAL_PRELINK_MODULE := false
-
-include $(BUILD_STATIC_LIBRARY)
-#include $(BUILD_SHARED_LIBRARY)
-
-
-############################### libtfa98xx 
-include $(CLEAR_VARS)
-LOCAL_C_INCLUDES:= 	$(LOCAL_PATH)/tfa/inc \
-                    $(LOCAL_PATH)/hal/inc \
-                    $(LOCAL_PATH)/hal/src \
-                    $(LOCAL_PATH)/hal/src/lxScribo \
-                    $(LOCAL_PATH)/hal/src/lxScribo/scribosrv
-
-LOCAL_SRC_FILES := 	\
-			              tfa/src/initTfa9890.c\
-			              tfa/src/initTfa9890N1B12.c\
-			              tfa/src/Tfa98xx.c\
-			              tfa/src/Tfa98xx_TextSupport.c
-
-LOCAL_MODULE := libtfa98xx
-LOCAL_SHARED_LIBRARIES:= libcutils libutils
-LOCAL_STATIC_LIBRARIES:= libtfahal
-LOCAL_MODULE_TAGS := optional
-LOCAL_PRELINK_MODULE := false
-
-include $(BUILD_STATIC_LIBRARY)
-
-############################### libtfasrv 
-include $(CLEAR_VARS)
-LOCAL_C_INCLUDES:= 	$(LOCAL_PATH)/srv/inc \
-                    $(LOCAL_PATH)/tfa/inc \
-                    $(LOCAL_PATH)/hal/inc \
-                    $(LOCAL_PATH)/hal/src \
-                    $(LOCAL_PATH)/hal/src/lxScribo
-
-LOCAL_SRC_FILES:=  \
-                    srv/src/nxpTfa98xx.c\
-                    srv/src/tfa98xxRuntime.c \
-                    srv/src/tfa98xxCalibration.c \
-                    srv/src/tfa98xxDiagnostics.c \
-                    srv/src/tfa98xxLiveData.c
-LOCAL_MODULE := libtfasrv
-LOCAL_SHARED_LIBRARIES:= libcutils libutils
-LOCAL_STATIC_LIBRARIES:= libtfahal libtfa98xx 
-LOCAL_MODULE_TAGS := optional
-LOCAL_PRELINK_MODULE := false
-
-include $(BUILD_STATIC_LIBRARY)
-
-############################## cli app
-include $(CLEAR_VARS)
-LOCAL_C_INCLUDES:= 	$(LOCAL_PATH)/app/climax/inc \
-                    $(LOCAL_PATH)/srv/inc \
-                    $(LOCAL_PATH)/tfa/inc \
-                    $(LOCAL_PATH)/hal/inc \
-                    $(LOCAL_PATH)/hal/src
-
-LOCAL_SRC_FILES:=  \
-                    app/climax/src/climax.c \
-                    app/climax/src/cliCommands.c \
-                    app/climax/src/cli/cmdline.c
-LOCAL_MODULE := climax
-LOCAL_SHARED_LIBRARIES:= libcutils libutils
-LOCAL_STATIC_LIBRARIES:= libtfasrv libtfa98xx libtfahal  
-LOCAL_MODULE_TAGS := optional
-LOCAL_PRELINK_MODULE := false
-
-include $(BUILD_EXECUTABLE)
-
-###############################################
-
-endif
diff --git a/proprietary/external/otp/Android.mk b/proprietary/external/otp/Android.mk
deleted file mode 100755
index 5af7e8210430ed857702c4d4bcc7284ef41e9890..0000000000000000000000000000000000000000
--- a/proprietary/external/otp/Android.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-ifeq ($(NAND_OTP_SUPPORT),yes)
-  HAVE_NANDOTP_FEATURE = yes
-else
-  HAVE_NANDOTP_FEATURE = no
-endif
-
-LOCAL_PATH:=$(call my-dir)
-ifeq ($(HAVE_NANDOTP_FEATURE),yes)
-include $(CLEAR_VARS)
-LOCAL_SHARED_LIBRARIES:= libc libcutils
-LOCAL_SRC_FILES:= otp.c
-LOCAL_MODULE:=otp
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_EXECUTABLE)
-endif
-
-include $(CLEAR_VARS)
-LOCAL_SHARED_LIBRARIES:= libc libcutils
-LOCAL_SRC_FILES:= emmc_otp.c
-LOCAL_MODULE:=emmc_otp
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_EXECUTABLE)
-
diff --git a/proprietary/external/permission_check/Android.mk b/proprietary/external/permission_check/Android.mk
deleted file mode 100755
index 5c43d2fef7113222873539bba8609af18dca9cf3..0000000000000000000000000000000000000000
--- a/proprietary/external/permission_check/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-#
-# File permission check daemon
-#
-
-
-#---------------------------------
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := permission_check.c
-
-LOCAL_SHARED_LIBRARIES := libc libcutils
-
-LOCAL_MODULE := permission_check
-
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_EXECUTABLE)
-
-#----------------------------------------
-
-
diff --git a/proprietary/external/pppd_btdun/Android.mk b/proprietary/external/pppd_btdun/Android.mk
deleted file mode 100755
index edbd82faaa8b7c8162f2214f81d235fcdd46f152..0000000000000000000000000000000000000000
--- a/proprietary/external/pppd_btdun/Android.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-ifeq ($(MTK_BT_BLUEDROID_DUN_GW_12), yes)
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
-	auth.c \
-	ccp.c \
-	chap-md5.c \
-	chap-new.c \
-	chap_ms.c \
-	demand.c \
-	eap.c \
-	ecp.c \
-	eui64.c \
-	fsm.c \
-	ipcp.c \
-	ipv6cp.c \
-	lcp.c \
-	magic.c \
-	main.c \
-	options.c \
-	pppcrypt.c \
-	pppox.c \
-	session.c \
-	sys-linux.c \
-	tty.c \
-	upap.c \
-	utils.c
-
-# options.c:623:21: error: passing 'const char *' to parameter of type 'char *' discards qualifiers.
-# [-Werror,-Wincompatible-pointer-types-discards-qualifiers]
-LOCAL_CLANG_CFLAGS += -Wno-incompatible-pointer-types-discards-qualifiers
-
-LOCAL_SHARED_LIBRARIES := \
-	libcutils liblog libcrypto
-
-LOCAL_C_INCLUDES := \
-	$(LOCAL_PATH)/include
-
-LOCAL_CFLAGS := -DCHAPMS=1 -DMPPE=1 -DINET6=1 -DUSE_OPENSSL=1 -Wno-unused-parameter -Wno-empty-body -Wno-missing-field-initializers -Wno-attributes -Wno-sign-compare -Wno-pointer-sign -Werror
-
-# Turn off warnings for now until this is fixed upstream. b/18632512
-LOCAL_CFLAGS += -Wno-unused-variable
-
-LOCAL_SRC_FILES += pppbt.c
-LOCAL_SHARED_LIBRARIES += libpppbtdun
-LOCAL_CFLAGS += -D__BTMTK__ -D__BT_DUN_PROFILE__
-
-LOCAL_MODULE:= pppd_btdun
-
-include $(BUILD_EXECUTABLE)
-###########################################
-# Loader for ppp_btdun
-###########################################
-#LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
-	ppp_btdun_loader.c
-
-# options.c:623:21: error: passing 'const char *' to parameter of type 'char *' discards qualifiers.
-# [-Werror,-Wincompatible-pointer-types-discards-qualifiers]
-LOCAL_CLANG_CFLAGS += -Wno-incompatible-pointer-types-discards-qualifiers
-
-LOCAL_SHARED_LIBRARIES := \
-	libcutils liblog
-
-LOCAL_C_INCLUDES := \
-	$(LOCAL_PATH)/include
-
-LOCAL_CFLAGS := -Wno-unused-parameter -Wno-empty-body -Wno-missing-field-initializers -Wno-attributes -Wno-sign-compare -Wno-pointer-sign -Werror
-
-# Turn off warnings for now until this is fixed upstream. b/18632512
-LOCAL_CFLAGS += -Wno-unused-variable
-
-LOCAL_MODULE:= pppd_btdun_loader
-
-include $(BUILD_EXECUTABLE)
-
-include $(LOCAL_PATH)/libpppbtdun/Android.mk
-
-endif
diff --git a/proprietary/external/pppd_btdun/libpppbtdun/Android.mk b/proprietary/external/pppd_btdun/libpppbtdun/Android.mk
deleted file mode 100755
index 0c6c1d325189e7e68b30a8bb89404ff468b46ded..0000000000000000000000000000000000000000
--- a/proprietary/external/pppd_btdun/libpppbtdun/Android.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-#ifeq ($(TARGET_ARCH),arm)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
-	btdunutils.c \
-	ip-dun.c
-
-LOCAL_SHARED_LIBRARIES := \
-	libcutils
-
-LOCAL_CFLAGS := -D__BTMTK__ -D__BT_DUN_PROFILE__
-
-LOCAL_MODULE:= libpppbtdun
-LOCAL_MULTILIB := both
-LOCAL_PRELINK_MODULE:= false
-
-include $(BUILD_SHARED_LIBRARY)
-
-#endif
diff --git a/proprietary/external/pppoe/Android.mk b/proprietary/external/pppoe/Android.mk
deleted file mode 100755
index eeeb91bf3f861f10ab07862ac4d4ed61101b49f5..0000000000000000000000000000000000000000
--- a/proprietary/external/pppoe/Android.mk
+++ /dev/null
@@ -1,94 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include vendor/mediatek/proprietary/external/pppoe/src/libevent/Android.mk
-
-src_dir := src
-
-local_c_includes := \
-	src
-
-local_c_includes += $(log_c_includes)
-
-include $(CLEAR_VARS)
-
-VERSION=3.11
-
-sbindir=
-PPPOE_PATH=$(sbindir)/pppoe
-PPPD_PATH=pppd
-PLUGIN_PATH=
-PPPOESERVER_PPPD_OPTIONS=
-PATHS='-DPPPOE_PATH="$(PPPOE_PATH)"' '-DPPPD_PATH="$(PPPD_PATH)"' \
-	'-DPLUGIN_PATH="$(PLUGIN_PATH)"' \
-	'-DPPPOE_SERVER_OPTIONS="$(PPPOESERVER_PPPD_OPTIONS)"'
-
-LOCAL_SRC_FILES := \
-	${src_dir}/pppoe.c \
-	${src_dir}/if.c \
-	${src_dir}/debug.c \
-	${src_dir}/common.c \
-	${src_dir}/ppp.c \
-	${src_dir}/discovery.c
-
-LOCAL_CFLAGS := '-DVERSION="$(VERSION)"'
-LOCAL_C_INCLUDES := $(local_c_includes)
-LOCAL_SHARED_LIBRARIES := libcutils
-LOCAL_SHARED_LIBRARIES += $(log_shared_libraries)
-
-LOCAL_MODULE := pppoe
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-LOCAL_CFLAGS := '-DVERSION="$(VERSION)"'
-LOCAL_C_INCLUDES := $(local_c_includes)
-LOCAL_SHARED_LIBRARIES := libcutils
-LOCAL_SHARED_LIBRARIES += $(log_shared_libraries)
-
-LOCAL_SRC_FILES := \
-	${src_dir}/relay.c \
-	${src_dir}/if.c \
-	${src_dir}/debug.c \
-	${src_dir}/common.c
-
-LOCAL_MODULE := pppoe-relay
-
-include $(BUILD_EXECUTABLE)
-
-
-include $(CLEAR_VARS)
-LOCAL_CFLAGS := '-DVERSION="$(VERSION)"'
-LOCAL_C_INCLUDES := $(local_c_includes)
-LOCAL_SHARED_LIBRARIES := libcutils
-LOCAL_SHARED_LIBRARIES += $(log_shared_libraries)
-
-LOCAL_SRC_FILES := \
-	${src_dir}/pppoe-sniff.c \
-	${src_dir}/if.c \
-	${src_dir}/debug.c \
-	${src_dir}/common.c
-
-LOCAL_MODULE := pppoe-sniff
-
-include $(BUILD_EXECUTABLE)
-
-
-include $(CLEAR_VARS)
-LOCAL_CFLAGS := '-DVERSION="$(VERSION)"' $(PATHS)
-#LOCAL_C_INCLUDES := $(local_c_includes)
-LOCAL_C_INCLUDES := \
-	${LOCAL_PATH}/src/libevent
-
-LOCAL_SHARED_LIBRARIES := libcutils
-LOCAL_STATIC_LIBRARIES := libpppoeevent
-LOCAL_SHARED_LIBRARIES += $(log_shared_libraries)
-
-LOCAL_SRC_FILES := \
-	${src_dir}/pppoe-server.c \
-	${src_dir}/if.c \
-	${src_dir}/debug.c \
-	${src_dir}/common.c \
-	${src_dir}/md5.c
-
-LOCAL_MODULE := pppoe-server
-
-include $(BUILD_EXECUTABLE)
diff --git a/proprietary/external/pppoe/src/libevent/Android.mk b/proprietary/external/pppoe/src/libevent/Android.mk
deleted file mode 100755
index 95674d0225811d47ea250c891679dd5fd13f95c7..0000000000000000000000000000000000000000
--- a/proprietary/external/pppoe/src/libevent/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-	src/libevent/event_sig.c \
-	src/libevent/event.c \
-	src/libevent/event_tcp.c \
-	src/libevent/hash.c
-
-LOCAL_CFLAGS := -DUNIX -DLINUX
-LOCAL_C_INCLUDES := $(local_c_includes)
-LOCAL_SHARED_LIBRARIES := libcutils
-LOCAL_SHARED_LIBRARIES += $(log_shared_libraries)
-
-LOCAL_MODULE := libpppoeevent
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/proprietary/external/shifter/Android.mk b/proprietary/external/shifter/Android.mk
deleted file mode 100755
index f050d6df7c3dffc8611480947b65ed76c0ff72b2..0000000000000000000000000000000000000000
--- a/proprietary/external/shifter/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-LOCAL_PATH := $(my-dir)
-
-include $(CLEAR_VARS)
-#LOCAL_PREBUILT_LIBS := libmtkshifter.so
-#LOCAL_MODULE_TAGS := optional
-#include $(BUILD_MULTI_PREBUILT)
-LOCAL_MODULE := libmtkshifter
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES_arm := libmtkshifter.so
-LOCAL_MODULE_SUFFIX := .so
-#ifeq ($(MTK_AUDIO_A64_SUPPORT),yes)
-LOCAL_SRC_FILES_arm64 := lib64mtkshifter.so
-LOCAL_MULTILIB := both
-#else
-#LOCAL_MULTILIB := 32
-#endif
-include $(BUILD_PREBUILT)
\ No newline at end of file
diff --git a/proprietary/external/simservs/Android.mk b/proprietary/external/simservs/Android.mk
deleted file mode 100755
index 573551b5d0bf2f7943a9bf538fa65c1b514a1704..0000000000000000000000000000000000000000
--- a/proprietary/external/simservs/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_JAVA_LIBRARIES := okhttp
-LOCAL_STATIC_JAVA_LIBRARIES := xcap
-
-# Include all the java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_MODULE_TAGS := optional
-
-# The name of the jar file to create.
-LOCAL_MODULE := Simservs
-
-# Build a static jar file.
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
diff --git a/proprietary/external/sqlite_custom/Android.mk b/proprietary/external/sqlite_custom/Android.mk
deleted file mode 100755
index 8e301d5c3e6122e4348dbf7b5d302066190880e1..0000000000000000000000000000000000000000
--- a/proprietary/external/sqlite_custom/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-libmtksqlite3_custom_local_src_files := \
-	sqlite3_android_custom.cpp
-
-libmtksqlite3_custom_c_includes := external/sqlite/dist
-
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= $(libmtksqlite3_custom_local_src_files)
-LOCAL_C_INCLUDES := $(libmtksqlite3_custom_c_includes)
-
-ifeq ($(OPTR_SPEC_SEG_DEF),OP01_SPEC0200_SEGC)
-LOCAL_CFLAGS += -D CONFIG_CMCC_SUPPORT
-endif
-
-LOCAL_MODULE:= libmtksqlite3_custom
-include $(BUILD_SHARED_LIBRARY)
diff --git a/proprietary/external/strongswan/src/curl/Android.mk b/proprietary/external/strongswan/src/curl/Android.mk
deleted file mode 100755
index 7feaac52e396549818de008c0c02f62541ba7caf..0000000000000000000000000000000000000000
--- a/proprietary/external/strongswan/src/curl/Android.mk
+++ /dev/null
@@ -1,120 +0,0 @@
-# Google Android makefile for curl and libcurl
-#
-# This file can be used when building curl using the full Android source
-# release or the NDK. Most users do not want or need to do this; please
-# instead read the Android section in docs/INSTALL for alternate
-# methods.
-#
-# Place the curl source (including this makefile) into external/curl/ in the
-# Android source tree.  Then build them with 'make curl' or just 'make libcurl'
-# from the Android root. Tested with Android versions 1.5, 2.1-2.3
-#
-# Note: you must first create a curl_config.h file by running configure in the
-# Android environment. The only way I've found to do this is tricky. Perform a
-# normal Android build with libcurl in the source tree, providing the target
-# "showcommands" to make. The build will eventually fail (because curl_config.h
-# doesn't exist yet), but the compiler commands used to build curl will be
-# shown. Now, from the external/curl/ directory, run curl's normal configure
-# command with flags that match what Android itself uses. This will mean
-# putting the compiler directory into the PATH, putting the -I, -isystem and
-# -D options into CPPFLAGS, putting the -W, -m, -f, -O and -nostdlib options
-# into CFLAGS, and putting the -Wl, -L and -l options into LIBS, along with the
-# path to the files libgcc.a, crtbegin_dynamic.o, and ccrtend_android.o.
-# Remember that the paths must be absolute since you will not be running
-# configure from the same directory as the Android make.  The normal
-# cross-compiler options must also be set. Note that the -c, -o, -MD and
-# similar flags must not be set.
-#
-# To see all the LIBS options, you'll need to do the "showcommands" trick on an
-# executable that's already buildable and watch what flags Android uses to link
-# it (dhcpcd is a good choice to watch). You'll also want to add -L options to
-# LIBS that point to the out/.../obj/lib/ and out/.../obj/system/lib/
-# directories so that additional libraries can be found and used by curl.
-#
-# The end result will be a configure command that looks something like this
-# (the environment variable A is set to the Android root path which makes the
-# command shorter):
-#
-#  A=`realpath ../..` && \
-#  PATH="$A/prebuilt/linux-x86/toolchain/arm-eabi-X/bin:$PATH" \
-#  ./configure --host=arm-linux CC=arm-eabi-gcc \
-#  CPPFLAGS="-I $A/system/core/include ..." \
-#  CFLAGS="-nostdlib -fno-exceptions -Wno-multichar ..." \
-#  LIBS="$A/prebuilt/linux-x86/toolchain/arm-eabi-X/lib/gcc/arm-eabi/X\
-#  /interwork/libgcc.a ..."
-#
-# Finally, copy the file COPYING to NOTICE so that the curl license gets put
-# into the right place (but see the note about this below).
-#
-# Dan Fandrich
-# November 2011
-
-LOCAL_PATH:= $(call my-dir)
-
-common_CFLAGS := -Wpointer-arith -Wwrite-strings -Wunused -Winline -Wnested-externs -Wmissing-declarations -Wmissing-prototypes -Wno-long-long -Wfloat-equal -Wno-multichar -Wsign-compare -Wno-format-nonliteral -Wendif-labels -Wstrict-prototypes -Wdeclaration-after-statement -Wno-system-headers -DHAVE_CONFIG_H
-
-#########################
-# Build the libcurl library
-
-include $(CLEAR_VARS)
-include $(LOCAL_PATH)/lib/Makefile.inc
-CURL_HEADERS := \
-	curlbuild.h \
-	curl.h \
-	curlrules.h \
-	curlver.h \
-	easy.h \
-	mprintf.h \
-	multi.h \
-	stdcheaders.h \
-	typecheck-gcc.h
-
-LOCAL_SRC_FILES := $(addprefix lib/,$(CSOURCES))
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/lib/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/include/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../openssl/include
-LOCAL_C_INCLUDES += external/zlib
-LOCAL_CFLAGS += $(common_CFLAGS)
-LOCAL_LDLIBS += -lcrypto-ss -lssl-ss -lz -lm -llog
-LOCAL_COPY_HEADERS_TO := libcurl-ss/curl
-LOCAL_COPY_HEADERS := $(addprefix include/curl/,$(CURL_HEADERS))
-
-LOCAL_MODULE:= libcurl-ss
-LOCAL_MODULE_TAGS := optional
-
-# Copy the licence to a place where Android will find it.
-# Actually, this doesn't quite work because the build system searches
-# for NOTICE files before it gets to this point, so it will only be seen
-# on subsequent builds.
-#ALL_PREBUILT += $(LOCAL_PATH)/NOTICE
-#$(LOCAL_PATH)/NOTICE: $(LOCAL_PATH)/COPYING | $(ACP)
-#	$(copy-file-to-target)
-
-
-LOCAL_SHARED_LIBRARIES += libz
-LOCAL_SHARED_LIBRARIES += libssl-ss
-LOCAL_SHARED_LIBRARIES += libcrypto-ss
-#include $(wildcard $(LOCAL_PATH)/../openssl/Android.mk)
-
-include $(BUILD_SHARED_LIBRARY)
-
-# #########################
-# # Build the curl binary
-#
-# include $(CLEAR_VARS)
-# include $(LOCAL_PATH)/src/Makefile.inc
-# LOCAL_SRC_FILES := $(addprefix src/,$(CURL_CFILES))
-#
-# LOCAL_MODULE := curl
-# LOCAL_MODULE_TAGS := optional
-# LOCAL_STATIC_LIBRARIES := libcurl
-# LOCAL_SYSTEM_SHARED_LIBRARIES := libc
-#
-# LOCAL_C_INCLUDES += $(LOCAL_PATH)/include $(LOCAL_PATH)/lib
-#
-# # This may also need to include $(CURLX_CFILES) in order to correctly link
-# # if libcurl is changed to be built as a dynamic library
-# LOCAL_CFLAGS += $(common_CFLAGS)
-#
-# include $(BUILD_EXECUTABLE)
-
diff --git a/proprietary/external/strongswan/src/libcharon/Android.mk b/proprietary/external/strongswan/src/libcharon/Android.mk
deleted file mode 100755
index 556358d619f74bbcefe0d17f61eba053c7aae067..0000000000000000000000000000000000000000
--- a/proprietary/external/strongswan/src/libcharon/Android.mk
+++ /dev/null
@@ -1,245 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# copy-n-paste from Makefile.am
-libcharon_la_SOURCES := \
-bus/bus.c bus/bus.h \
-bus/listeners/listener.h \
-bus/listeners/logger.h \
-bus/listeners/file_logger.c bus/listeners/file_logger.h \
-bus/listeners/sys_logger.c bus/listeners/sys_logger.h \
-config/backend_manager.c config/backend_manager.h config/backend.h \
-config/child_cfg.c config/child_cfg.h \
-config/ike_cfg.c config/ike_cfg.h \
-config/peer_cfg.c config/peer_cfg.h \
-config/proposal.c config/proposal.h \
-control/controller.c control/controller.h \
-daemon.c daemon.h \
-encoding/generator.c encoding/generator.h \
-encoding/message.c encoding/message.h \
-encoding/parser.c encoding/parser.h \
-encoding/payloads/auth_payload.c encoding/payloads/auth_payload.h \
-encoding/payloads/cert_payload.c encoding/payloads/cert_payload.h \
-encoding/payloads/certreq_payload.c encoding/payloads/certreq_payload.h \
-encoding/payloads/configuration_attribute.c encoding/payloads/configuration_attribute.h \
-encoding/payloads/cp_payload.c encoding/payloads/cp_payload.h \
-encoding/payloads/delete_payload.c encoding/payloads/delete_payload.h \
-encoding/payloads/eap_payload.c encoding/payloads/eap_payload.h \
-encoding/payloads/encodings.c encoding/payloads/encodings.h \
-encoding/payloads/encryption_payload.c encoding/payloads/encryption_payload.h \
-encoding/payloads/id_payload.c encoding/payloads/id_payload.h \
-encoding/payloads/ike_header.c encoding/payloads/ike_header.h \
-encoding/payloads/ke_payload.c  encoding/payloads/ke_payload.h \
-encoding/payloads/nonce_payload.c encoding/payloads/nonce_payload.h \
-encoding/payloads/notify_payload.c encoding/payloads/notify_payload.h \
-encoding/payloads/payload.c encoding/payloads/payload.h \
-encoding/payloads/proposal_substructure.c encoding/payloads/proposal_substructure.h \
-encoding/payloads/sa_payload.c encoding/payloads/sa_payload.h \
-encoding/payloads/traffic_selector_substructure.c encoding/payloads/traffic_selector_substructure.h \
-encoding/payloads/transform_attribute.c encoding/payloads/transform_attribute.h \
-encoding/payloads/transform_substructure.c encoding/payloads/transform_substructure.h \
-encoding/payloads/ts_payload.c encoding/payloads/ts_payload.h \
-encoding/payloads/unknown_payload.c encoding/payloads/unknown_payload.h \
-encoding/payloads/vendor_id_payload.c encoding/payloads/vendor_id_payload.h \
-encoding/payloads/hash_payload.c encoding/payloads/hash_payload.h \
-encoding/payloads/fragment_payload.c encoding/payloads/fragment_payload.h \
-kernel_wrap/kernel_handler.c kernel_wrap/kernel_handler.h \
-network/receiver.c network/receiver.h network/sender.c network/sender.h \
-network/socket.c network/socket.h \
-network/socket_manager.c network/socket_manager.h \
-network/wod_channel.c network/wod_channel.h \
-processing/jobs/acquire_job.c processing/jobs/acquire_job.h \
-processing/jobs/delete_child_sa_job.c processing/jobs/delete_child_sa_job.h \
-processing/jobs/delete_ike_sa_job.c processing/jobs/delete_ike_sa_job.h \
-processing/jobs/migrate_job.c processing/jobs/migrate_job.h \
-processing/jobs/process_message_job.c processing/jobs/process_message_job.h \
-processing/jobs/rekey_child_sa_job.c processing/jobs/rekey_child_sa_job.h \
-processing/jobs/rekey_ike_sa_job.c processing/jobs/rekey_ike_sa_job.h \
-processing/jobs/retransmit_job.c processing/jobs/retransmit_job.h \
-processing/jobs/retry_initiate_job.c processing/jobs/retry_initiate_job.h \
-processing/jobs/send_dpd_job.c processing/jobs/send_dpd_job.h \
-processing/jobs/send_keepalive_job.c processing/jobs/send_keepalive_job.h \
-processing/jobs/start_action_job.c processing/jobs/start_action_job.h \
-processing/jobs/roam_job.c processing/jobs/roam_job.h \
-processing/jobs/update_sa_job.c processing/jobs/update_sa_job.h \
-processing/jobs/inactivity_job.c processing/jobs/inactivity_job.h \
-sa/eap/eap_method.c sa/eap/eap_method.h sa/eap/eap_inner_method.h \
-sa/eap/eap_manager.c sa/eap/eap_manager.h \
-sa/xauth/xauth_method.c sa/xauth/xauth_method.h \
-sa/xauth/xauth_manager.c sa/xauth/xauth_manager.h \
-sa/authenticator.c sa/authenticator.h \
-sa/child_sa.c sa/child_sa.h \
-sa/ike_sa.c sa/ike_sa.h \
-sa/ike_sa_id.c sa/ike_sa_id.h \
-sa/keymat.h sa/keymat.c \
-sa/ike_sa_manager.c sa/ike_sa_manager.h \
-sa/task_manager.h sa/task_manager.c \
-sa/shunt_manager.c sa/shunt_manager.h \
-sa/trap_manager.c sa/trap_manager.h \
-sa/task.c sa/task.h
-
-libcharon_la_SOURCES += \
-sa/ikev2/keymat_v2.c sa/ikev2/keymat_v2.h \
-sa/ikev2/task_manager_v2.c sa/ikev2/task_manager_v2.h \
-sa/ikev2/authenticators/eap_authenticator.c sa/ikev2/authenticators/eap_authenticator.h \
-sa/ikev2/authenticators/psk_authenticator.c sa/ikev2/authenticators/psk_authenticator.h \
-sa/ikev2/authenticators/pubkey_authenticator.c sa/ikev2/authenticators/pubkey_authenticator.h \
-sa/ikev2/tasks/child_create.c sa/ikev2/tasks/child_create.h \
-sa/ikev2/tasks/child_delete.c sa/ikev2/tasks/child_delete.h \
-sa/ikev2/tasks/child_rekey.c sa/ikev2/tasks/child_rekey.h \
-sa/ikev2/tasks/ike_auth.c sa/ikev2/tasks/ike_auth.h \
-sa/ikev2/tasks/ike_cert_pre.c sa/ikev2/tasks/ike_cert_pre.h \
-sa/ikev2/tasks/ike_cert_post.c sa/ikev2/tasks/ike_cert_post.h \
-sa/ikev2/tasks/ike_config.c sa/ikev2/tasks/ike_config.h \
-sa/ikev2/tasks/ike_delete.c sa/ikev2/tasks/ike_delete.h \
-sa/ikev2/tasks/ike_dpd.c sa/ikev2/tasks/ike_dpd.h \
-sa/ikev2/tasks/ike_init.c sa/ikev2/tasks/ike_init.h \
-sa/ikev2/tasks/ike_natd.c sa/ikev2/tasks/ike_natd.h \
-sa/ikev2/tasks/ike_mobike.c sa/ikev2/tasks/ike_mobike.h \
-sa/ikev2/tasks/ike_rekey.c sa/ikev2/tasks/ike_rekey.h \
-sa/ikev2/tasks/ike_reauth.c sa/ikev2/tasks/ike_reauth.h \
-sa/ikev2/tasks/ike_auth_lifetime.c sa/ikev2/tasks/ike_auth_lifetime.h \
-sa/ikev2/tasks/ike_vendor.c sa/ikev2/tasks/ike_vendor.h
-
-libcharon_la_SOURCES += \
-sa/ikev1/keymat_v1.c sa/ikev1/keymat_v1.h \
-sa/ikev1/task_manager_v1.c sa/ikev1/task_manager_v1.h \
-sa/ikev1/authenticators/psk_v1_authenticator.c sa/ikev1/authenticators/psk_v1_authenticator.h \
-sa/ikev1/authenticators/pubkey_v1_authenticator.c sa/ikev1/authenticators/pubkey_v1_authenticator.h \
-sa/ikev1/authenticators/hybrid_authenticator.c sa/ikev1/authenticators/hybrid_authenticator.h \
-sa/ikev1/phase1.c sa/ikev1/phase1.h \
-sa/ikev1/tasks/main_mode.c sa/ikev1/tasks/main_mode.h \
-sa/ikev1/tasks/aggressive_mode.c sa/ikev1/tasks/aggressive_mode.h \
-sa/ikev1/tasks/informational.c sa/ikev1/tasks/informational.h \
-sa/ikev1/tasks/isakmp_cert_pre.c sa/ikev1/tasks/isakmp_cert_pre.h \
-sa/ikev1/tasks/isakmp_cert_post.c sa/ikev1/tasks/isakmp_cert_post.h \
-sa/ikev1/tasks/isakmp_natd.c sa/ikev1/tasks/isakmp_natd.h \
-sa/ikev1/tasks/isakmp_vendor.c sa/ikev1/tasks/isakmp_vendor.h \
-sa/ikev1/tasks/isakmp_delete.c sa/ikev1/tasks/isakmp_delete.h \
-sa/ikev1/tasks/isakmp_dpd.c sa/ikev1/tasks/isakmp_dpd.h \
-sa/ikev1/tasks/xauth.c sa/ikev1/tasks/xauth.h \
-sa/ikev1/tasks/quick_mode.c sa/ikev1/tasks/quick_mode.h \
-sa/ikev1/tasks/quick_delete.c sa/ikev1/tasks/quick_delete.h \
-sa/ikev1/tasks/mode_config.c sa/ikev1/tasks/mode_config.h \
-processing/jobs/dpd_timeout_job.c processing/jobs/dpd_timeout_job.h \
-processing/jobs/adopt_children_job.c processing/jobs/adopt_children_job.h
-
-LOCAL_SRC_FILES := $(filter %.c,$(libcharon_la_SOURCES))
-
-# adding the plugin source files
-
-LOCAL_SRC_FILES += $(call add_plugin, android-dns)
-ifneq ($(call plugin_enabled, android-dns),)
-LOCAL_SHARED_LIBRARIES += libcutils
-endif
-
-LOCAL_SRC_FILES += $(call add_plugin, android-log)
-ifneq ($(call plugin_enabled, android-log),)
-LOCAL_LDLIBS += -llog
-endif
-
-LOCAL_SRC_FILES += $(call add_plugin, attr)
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-aka)
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-aka-3gpp2)
-ifneq ($(call plugin_enabled, eap-aka-3gpp2),)
-LOCAL_C_INCLUDES += $(libgmp_PATH)
-LOCAL_SHARED_LIBRARIES += libgmp
-endif
-
-LOCAL_SRC_FILES += $(call add_plugin, updown)
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-gtc)
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-identity)
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-md5)
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-mschapv2)
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-sim)
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-simaka-sql)
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-simaka-pseudonym)
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-simaka-reauth)
-ifneq ($(call plugin_enabled, eap-simaka-reauth),)
-LOCAL_SHARED_LIBRARIES += libcutils
-endif
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-sim-file)
-
-# adding libakasim if either eap-aka or eap-sim is enabled
-ifneq ($(or $(call plugin_enabled, eap-aka), $(call plugin_enabled, eap-sim)),)
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libsimaka/
-LOCAL_SHARED_LIBRARIES += libsimaka
-endif
-
-#LOCAL_SRC_FILES += $(addprefix ../libsimaka/, 
-#		simaka_message.h simaka_message.c \
-#		simaka_crypto.h simaka_crypto.c \
-#		simaka_manager.h simaka_manager.c \
-#		simaka_card.h simaka_provider.h simaka_hooks.h \
-#	)
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-tls)
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-ttls)
-ifneq ($(call plugin_enabled, eap-ttls),)
-# for radius_message.h
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libradius/
-endif
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-peap)
-
-LOCAL_SRC_FILES += $(call add_plugin, eap-tnc)
-ifneq ($(call plugin_enabled, eap-tnc),)
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libtnccs/ $(LOCAL_PATH)/../libtncif/
-LOCAL_SHARED_LIBRARIES += libtnccs libtncif
-endif
-
-# adding libtls if any of the four plugins above is enabled
-ifneq ($(or $(call plugin_enabled, eap-tls), $(call plugin_enabled, eap-ttls), \
-			$(call plugin_enabled, eap-peap), $(call plugin_enabled, eap-tnc)),)
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libtls/
-LOCAL_SRC_FILES += $(addprefix ../libtls/, \
-		tls_protection.c tls_compression.c tls_fragmentation.c tls_alert.c \
-		tls_crypto.c tls_prf.c tls_socket.c tls_eap.c tls_cache.c tls_peer.c \
-		tls_server.c tls.c \
-	)
-endif
-
-LOCAL_SRC_FILES += $(call add_plugin, load-tester)
-
-LOCAL_SRC_FILES += $(call add_plugin, socket-default)
-
-LOCAL_SRC_FILES += $(call add_plugin, socket-dynamic)
-
-LOCAL_SRC_FILES += $(call add_plugin, stroke)
-ifneq ($(call plugin_enabled, stroke),)
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../stroke/
-endif
-
-# build libcharon --------------------------------------------------------------
-
-LOCAL_C_INCLUDES += \
-	$(strongswan_PATH)/src/include \
-	$(strongswan_PATH)/src/libhydra \
-	$(strongswan_PATH)/src/libstrongswan
-
-LOCAL_CFLAGS := $(strongswan_CFLAGS)
-
-LOCAL_MODULE := libcharon
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_ARM_MODE := arm
-
-LOCAL_PRELINK_MODULE := false
-
-LOCAL_SHARED_LIBRARIES += libstrongswan libhydra
-
-include $(BUILD_SHARED_LIBRARY)
-
diff --git a/proprietary/external/strongswan/src/libhydra/Android.mk b/proprietary/external/strongswan/src/libhydra/Android.mk
deleted file mode 100755
index 75b81e971464978d7fbf2305f18f03a5fa5653ba..0000000000000000000000000000000000000000
--- a/proprietary/external/strongswan/src/libhydra/Android.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# copy-n-paste from Makefile.am
-libhydra_la_SOURCES := \
-hydra.c hydra.h \
-attributes/attributes.c attributes/attributes.h \
-attributes/attribute_provider.h attributes/attribute_handler.h \
-attributes/attribute_manager.c attributes/attribute_manager.h \
-attributes/mem_pool.c attributes/mem_pool.h \
-kernel_wrap/kernel_interface.c kernel_wrap/kernel_interface.h \
-kernel_wrap/kernel_ipsec.c kernel_wrap/kernel_ipsec.h \
-kernel_wrap/kernel_net.c kernel_wrap/kernel_net.h \
-kernel_wrap/kernel_listener.h
-
-LOCAL_SRC_FILES := $(filter %.c,$(libhydra_la_SOURCES))
-
-# adding the plugin source files
-
-LOCAL_SRC_FILES += $(call add_plugin, attr)
-
-LOCAL_SRC_FILES += $(call add_plugin, kernel-pfkey)
-
-LOCAL_SRC_FILES += $(call add_plugin, kernel-netlink)
-
-LOCAL_SRC_FILES += $(call add_plugin, resolve)
-ifneq ($(call plugin_enabled, resolve),)
-LOCAL_SHARED_LIBRARIES += libcutils
-endif
-
-
-# build libhydra ---------------------------------------------------------------
-
-LOCAL_C_INCLUDES += \
-	$(strongswan_PATH)/src/include \
-	$(strongswan_PATH)/src/libstrongswan
-
-
-LOCAL_CFLAGS := $(strongswan_CFLAGS)
-
-LOCAL_MODULE := libhydra
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_ARM_MODE := arm
-
-LOCAL_PRELINK_MODULE := false
-
-LOCAL_SHARED_LIBRARIES += libstrongswan
-
-include $(BUILD_SHARED_LIBRARY)
-
diff --git a/proprietary/external/strongswan/src/libipsec/Android.mk b/proprietary/external/strongswan/src/libipsec/Android.mk
deleted file mode 100755
index c5d987977b7aaa1a3dfa95133308bd5e55b19073..0000000000000000000000000000000000000000
--- a/proprietary/external/strongswan/src/libipsec/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# copy-n-paste from Makefile.am
-libipsec_la_SOURCES := \
-ipsec.c ipsec.h \
-esp_context.c esp_context.h \
-esp_packet.c esp_packet.h \
-ip_packet.c ip_packet.h \
-ipsec_event_listener.h \
-ipsec_event_relay.c ipsec_event_relay.h \
-ipsec_policy.c ipsec_policy.h \
-ipsec_policy_mgr.c ipsec_policy_mgr.h \
-ipsec_processor.c ipsec_processor.h \
-ipsec_sa.c ipsec_sa.h \
-ipsec_sa_mgr.c ipsec_sa_mgr.h
-
-LOCAL_SRC_FILES := $(filter %.c,$(libipsec_la_SOURCES))
-
-# build libipsec ---------------------------------------------------------------
-
-LOCAL_C_INCLUDES += \
-	$(strongswan_PATH)/src/include \
-	$(strongswan_PATH)/src/libstrongswan
-
-LOCAL_CFLAGS := $(strongswan_CFLAGS)
-
-LOCAL_MODULE := libipsec
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_ARM_MODE := arm
-
-LOCAL_PRELINK_MODULE := false
-
-LOCAL_SHARED_LIBRARIES += libstrongswan
-
-include $(BUILD_SHARED_LIBRARY)
-
diff --git a/proprietary/external/strongswan/src/libsimaka/Android.mk b/proprietary/external/strongswan/src/libsimaka/Android.mk
deleted file mode 100755
index 7790bfc2e997d78d93d2278aaf7903d33c2edbbc..0000000000000000000000000000000000000000
--- a/proprietary/external/strongswan/src/libsimaka/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# copy-n-paste from Makefile.am
-libsimaka_la_SOURCES = simaka_message.h simaka_message.c \
-  simaka_crypto.h simaka_crypto.c simaka_manager.h simaka_manager.c \
-  simaka_card.h simaka_provider.h simaka_hooks.h
-
-LOCAL_SRC_FILES := $(filter %.c,$(libsimaka_la_SOURCES))
-
-# build libsimaka ---------------------------------------------------------------
-
-LOCAL_C_INCLUDES += \
-	$(strongswan_PATH)/src/include \
-	$(strongswan_PATH)/src/libstrongswan
-
-LOCAL_CFLAGS := $(strongswan_CFLAGS)
-
-LOCAL_MODULE := libsimaka
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_ARM_MODE := arm
-
-LOCAL_PRELINK_MODULE := false
-
-LOCAL_SHARED_LIBRARIES += libstrongswan
-
-include $(BUILD_SHARED_LIBRARY)
-
diff --git a/proprietary/external/strongswan/src/libstrongswan/Android.mk b/proprietary/external/strongswan/src/libstrongswan/Android.mk
deleted file mode 100755
index 3ff8c3b9077b7f26de43684a2854f1f227fa6155..0000000000000000000000000000000000000000
--- a/proprietary/external/strongswan/src/libstrongswan/Android.mk
+++ /dev/null
@@ -1,122 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# copy-n-paste from Makefile.am
-LOCAL_SRC_FILES := \
-library.c \
-asn1/asn1.c asn1/asn1_parser.c asn1/oid.c bio/bio_reader.c bio/bio_writer.c \
-collections/blocking_queue.c collections/enumerator.c collections/hashtable.c \
-collections/array.c \
-collections/linked_list.c crypto/crypters/crypter.c crypto/hashers/hasher.c \
-crypto/proposal/proposal_keywords.c crypto/proposal/proposal_keywords_static.c \
-crypto/prfs/prf.c crypto/prfs/mac_prf.c crypto/pkcs5.c \
-crypto/rngs/rng.c crypto/prf_plus.c crypto/signers/signer.c \
-crypto/signers/mac_signer.c crypto/crypto_factory.c crypto/crypto_tester.c \
-crypto/diffie_hellman.c crypto/aead.c crypto/transform.c \
-crypto/iv/iv_gen_rand.c crypto/iv/iv_gen_seq.c \
-credentials/credential_factory.c credentials/builder.c \
-credentials/cred_encoding.c credentials/keys/private_key.c \
-credentials/keys/public_key.c credentials/keys/shared_key.c \
-credentials/certificates/certificate.c credentials/certificates/crl.c \
-credentials/certificates/ocsp_response.c \
-credentials/containers/container.c credentials/containers/pkcs12.c \
-credentials/ietf_attributes/ietf_attributes.c credentials/credential_manager.c \
-credentials/sets/auth_cfg_wrapper.c credentials/sets/ocsp_response_wrapper.c \
-credentials/sets/cert_cache.c credentials/sets/mem_cred.c \
-credentials/sets/callback_cred.c credentials/auth_cfg.c database/database.c \
-database/database_factory.c fetcher/fetcher.c fetcher/fetcher_manager.c eap/eap.c \
-ipsec/ipsec_types.c \
-networking/host.c networking/host_resolver.c networking/packet.c \
-networking/tun_device.c networking/streams/stream.c \
-networking/streams/stream_service.c networking/streams/stream_manager.c \
-pen/pen.c plugins/plugin_loader.c plugins/plugin_feature.c processing/jobs/job.c \
-processing/jobs/callback_job.c processing/processor.c processing/scheduler.c \
-processing/watcher.c resolver/resolver_manager.c resolver/rr_set.c \
-selectors/traffic_selector.c threading/thread.c threading/thread_value.c \
-threading/mutex.c threading/semaphore.c threading/rwlock.c threading/spinlock.c \
-utils/utils.c utils/chunk.c utils/debug.c utils/enum.c utils/identification.c \
-utils/lexparser.c utils/optionsfrom.c utils/capabilities.c utils/backtrace.c \
-utils/cust_settings.c \
-utils/printf_hook/printf_hook_builtin.c utils/settings.c utils/test.c \
-utils/utils/strerror.c
-
-# adding the plugin source files
-
-LOCAL_SRC_FILES += $(call add_plugin, aes)
-
-LOCAL_SRC_FILES += $(call add_plugin, curl)
-ifneq ($(call plugin_enabled, curl),)
-LOCAL_C_INCLUDES +=$(LOCAL_PATH)/plugins
-LOCAL_SHARED_LIBRARIES += libssl-ss libcurl-ss
-endif
-
-LOCAL_SRC_FILES += $(call add_plugin, des)
-
-LOCAL_SRC_FILES += $(call add_plugin, fips-prf)
-
-LOCAL_SRC_FILES += $(call add_plugin, gmp)
-ifneq ($(call plugin_enabled, gmp),)
-LOCAL_C_INCLUDES += $(libgmp_PATH)
-LOCAL_SHARED_LIBRARIES += libgmp
-endif
-
-LOCAL_SRC_FILES += $(call add_plugin, hmac)
-
-LOCAL_SRC_FILES += $(call add_plugin, md4)
-
-LOCAL_SRC_FILES += $(call add_plugin, md5)
-
-LOCAL_SRC_FILES += $(call add_plugin, nonce)
-
-LOCAL_SRC_FILES += $(call add_plugin, openssl)
-ifneq ($(call plugin_enabled, openssl),)
-LOCAL_C_INCLUDES += $(openssl_PATH)
-LOCAL_SHARED_LIBRARIES += libcrypto-ss
-endif
-
-LOCAL_SRC_FILES += $(call add_plugin, pem)
-
-LOCAL_SRC_FILES += $(call add_plugin, pkcs1)
-
-LOCAL_SRC_FILES += $(call add_plugin, pkcs7)
-
-LOCAL_SRC_FILES += $(call add_plugin, pkcs8)
-
-LOCAL_SRC_FILES += $(call add_plugin, pkcs11)
-
-LOCAL_SRC_FILES += $(call add_plugin, pubkey)
-
-LOCAL_SRC_FILES += $(call add_plugin, random)
-
-LOCAL_SRC_FILES += $(call add_plugin, sha1)
-
-LOCAL_SRC_FILES += $(call add_plugin, sha2)
-
-LOCAL_SRC_FILES += $(call add_plugin, x509)
-
-LOCAL_SRC_FILES += $(call add_plugin, xcbc)
-
-LOCAL_SRC_FILES += $(call add_plugin, ctr)
-
-LOCAL_SRC_FILES += $(call add_plugin, revocation)
-
-
-# build libstrongswan ----------------------------------------------------------
-
-LOCAL_CFLAGS := $(strongswan_CFLAGS) \
-	-include $(LOCAL_PATH)/AndroidConfigLocal.h
-
-LOCAL_MODULE := libstrongswan
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_ARM_MODE := arm
-
-LOCAL_PRELINK_MODULE := false
-
-LOCAL_SHARED_LIBRARIES += libdl libcutils
-
-
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/proprietary/external/strongswan/src/libtnccs/Android.mk b/proprietary/external/strongswan/src/libtnccs/Android.mk
deleted file mode 100755
index 68f85c252d39a3a013b3f1520271b4ad8e5aac34..0000000000000000000000000000000000000000
--- a/proprietary/external/strongswan/src/libtnccs/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# copy-n-paste from Makefile.am
-libtnccs_la_SOURCES := \
-tnc/tnc.h tnc/tnc.c \
-tnc/imc/imc.h tnc/imc/imc_manager.h \
-tnc/imv/imv.h tnc/imv/imv_manager.h \
-tnc/imv/imv_recommendations.h tnc/imv/imv_recommendations.c \
-tnc/tnccs/tnccs.h tnc/tnccs/tnccs.c \
-tnc/tnccs/tnccs_manager.h tnc/tnccs/tnccs_manager.c
-
-LOCAL_SRC_FILES := $(filter %.c,$(libtnccs_la_SOURCES))
-
-# adding the plugin source files
-
-LOCAL_SRC_FILES += $(call add_plugin, tnc-imc)
-ifneq ($(call plugin_enabled, tnc-imc),)
-LOCAL_SHARED_LIBRARIES += libdl
-endif
-
-LOCAL_SRC_FILES += $(call add_plugin, tnc-tnccs)
-
-LOCAL_SRC_FILES += $(call add_plugin, tnccs-20)
-LOCAL_SRC_FILES += $(call add_plugin_subdirs, tnccs-20, batch messages messages/ietf messages/tcg state_machine)
-ifneq ($(call plugin_enabled, tnccs-20),)
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/plugins/tnccs_20/
-endif
-
-ifneq ($(or $(call plugin_enabled, tnc-imc), $(call plugin_enabled, tnc-tnccs), \
-			$(call plugin_enabled, tnccs-20)),)
-LOCAL_SHARED_LIBRARIES += libtncif
-endif
-
-# build libtncif ---------------------------------------------------------------
-
-LOCAL_C_INCLUDES += \
-	$(strongswan_PATH)/src/libtls \
-	$(strongswan_PATH)/src/libtncif \
-	$(strongswan_PATH)/src/libstrongswan
-
-LOCAL_CFLAGS := $(strongswan_CFLAGS)
-
-LOCAL_MODULE := libtnccs
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_ARM_MODE := arm
-
-LOCAL_PRELINK_MODULE := false
-
-LOCAL_SHARED_LIBRARIES += libstrongswan
-
-include $(BUILD_SHARED_LIBRARY)
-
diff --git a/proprietary/external/strongswan/src/libtncif/Android.mk b/proprietary/external/strongswan/src/libtncif/Android.mk
deleted file mode 100755
index 36d3f4c33b7c183fa7eaf3c4694769db699fa1fe..0000000000000000000000000000000000000000
--- a/proprietary/external/strongswan/src/libtncif/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# copy-n-paste from Makefile.am
-libtncif_la_SOURCES := \
-tncif.h tncifimc.h tncifimv.h tncif_names.h tncif_names.c \
-tncif_identity.h tncif_identity.c \
-tncif_pa_subtypes.h tncif_pa_subtypes.c \
-tncif_policy.h tncif_policy.c
-
-LOCAL_SRC_FILES := $(filter %.c,$(libtncif_la_SOURCES))
-
-# build libtncif ---------------------------------------------------------------
-
-LOCAL_C_INCLUDES += \
-	$(strongswan_PATH)/src/libstrongswan
-
-LOCAL_CFLAGS := $(strongswan_CFLAGS)
-
-LOCAL_MODULE := libtncif
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_ARM_MODE := arm
-
-LOCAL_PRELINK_MODULE := false
-
-LOCAL_SHARED_LIBRARIES += libstrongswan
-
-include $(BUILD_SHARED_LIBRARY)
-
diff --git a/proprietary/external/tiny_util/Android.mk b/proprietary/external/tiny_util/Android.mk
deleted file mode 100755
index 5ea74caeead32842589b8626fd1ea3e71527caae..0000000000000000000000000000000000000000
--- a/proprietary/external/tiny_util/Android.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-ifeq ($(MTK_TINY_UTIL), yes)
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := tiny_mkswap.c
-
-LOCAL_MODULE := tiny_mkswap
-
-LOCAL_SHARED_LIBRARIES := libc libcutils
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := tiny_swapon.c
-
-LOCAL_MODULE := tiny_swapon
-
-LOCAL_SHARED_LIBRARIES := libc libcutils
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := tiny_swapoff.c
-
-LOCAL_MODULE := tiny_swapoff
-
-LOCAL_SHARED_LIBRARIES := libc
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := tiny_switch.c
-
-LOCAL_MODULE := tiny_switch
-
-LOCAL_SHARED_LIBRARIES := libc libcutils
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := tiny_fallocate.c
-
-LOCAL_MODULE := tiny_fallocate
-
-LOCAL_SHARED_LIBRARIES := libc libcutils
-
-include $(BUILD_EXECUTABLE)
-endif
diff --git a/proprietary/external/trustzone/mtee/Android.mk b/proprietary/external/trustzone/mtee/Android.mk
deleted file mode 100755
index 0979ae10aa8bf23c73b4f041e353fbef25625984..0000000000000000000000000000000000000000
--- a/proprietary/external/trustzone/mtee/Android.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-ifeq ($(filter $(MTK_IN_HOUSE_TEE_SUPPORT) $(MTK_GOOGLE_TRUSTY_SUPPORT),yes),yes)
-
-LOCAL_PATH := $(call my-dir)
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif   # MTK_IN_HOUSE_TEE_SUPPORT || MTK_GOOGLE_TRUSTY_SUPPORT
diff --git a/proprietary/external/trustzone/mtee/MtkVideoSecureAL/Android.mk b/proprietary/external/trustzone/mtee/MtkVideoSecureAL/Android.mk
deleted file mode 100755
index 50c13457c2d88288d7bce9b7655b5f2b5b14dc76..0000000000000000000000000000000000000000
--- a/proprietary/external/trustzone/mtee/MtkVideoSecureAL/Android.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-ifeq ($(strip $(MTK_SEC_VIDEO_PATH_SUPPORT)),yes)
-
-LOCAL_PATH := $(call my-dir)
-
-$(warning start lib_uree_mtk_video_secure_al)
-include $(CLEAR_VARS)
-LOCAL_MODULE := lib_uree_mtk_video_secure_al
-LOCAL_SRC_FILES := MtkVideoSecureAL.c
-LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES += \
-    $(call include-path-for, trustzone-uree)
-
-LOCAL_SHARED_LIBRARIES :=       \
-	libutils                \
-        libcutils
-
-ifeq ($(strip $(MTK_IN_HOUSE_TEE_SUPPORT)),yes)
-LOCAL_CFLAGS += -DMTK_IN_HOUSE_TEE_SUPPORT
-endif 
-
-ifeq ($(strip $(MTK_SEC_WFD_VIDEO_PATH_SUPPORT)),yes)
-LOCAL_CFLAGS += -DMTK_SEC_WFD_VIDEO_PATH_SUPPORT
-endif
-
-ifeq ($(strip $(MTK_SEC_VIDEO_PATH_SUPPORT)),yes)
-LOCAL_CFLAGS += -DMTK_SEC_VIDEO_PATH_SUPPORT
-endif
-
-#LOCAL_CFLAGS += ${TZ_CFLAG}
-#LOCAL_LDFLAGS += --gc-sections
-#LOCAL_ASFLAGS += -DASSEMBLY
-#LOCAL_STATIC_LIBRARIES += libc_tz libtest
-LOCAL_SHARED_LIBRARIES += libtz_uree
-include $(BUILD_SHARED_LIBRARY)
-
-$(warning finish lib_uree_mtk_video_secure_al)
-endif
diff --git a/proprietary/external/trustzone/mtee/gatekeeper/Android.mk b/proprietary/external/trustzone/mtee/gatekeeper/Android.mk
deleted file mode 100755
index 99e1914be0a4a26c51b121a7521170bad5962aad..0000000000000000000000000000000000000000
--- a/proprietary/external/trustzone/mtee/gatekeeper/Android.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-ifeq ($(MTK_IN_HOUSE_TEE_SUPPORT),yes)
-
-LOCAL_PATH := $(call my-dir)
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
-
diff --git a/proprietary/external/trustzone/mtee/gatekeeper/common/Android.mk b/proprietary/external/trustzone/mtee/gatekeeper/common/Android.mk
deleted file mode 100755
index fb3eaf58ce49525d40775553db4de496a7be3ac9..0000000000000000000000000000000000000000
--- a/proprietary/external/trustzone/mtee/gatekeeper/common/Android.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (C) 2013 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_C_INCLUDES += hardware/libhardware/include \
-                    $(LOCAL_PATH)/include \
-                    $(call include-path-for, trustzone-uree)
-
-LOCAL_SHARED_LIBRARIES := liblog libtz_uree
-LOCAL_SRC_FILES := module.cpp gatekeeper.cpp
-
-LOCAL_MODULE := gatekeeper.$(TARGET_BOARD_PLATFORM)
-
-LOCAL_MULTILIB := both
-include $(BUILD_SHARED_LIBRARY)
-
-
diff --git a/proprietary/external/trustzone/mtee/gcpu_test/Android.mk b/proprietary/external/trustzone/mtee/gcpu_test/Android.mk
deleted file mode 100755
index 6227c700c71325a2141c50af2e7dd49a2929af93..0000000000000000000000000000000000000000
--- a/proprietary/external/trustzone/mtee/gcpu_test/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := mtee_gcpu_test
-LOCAL_SRC_FILES := mtee_gcpu_test.c
-LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES += \
-    $(call include-path-for, trustzone-uree)
-
-LOCAL_CFLAGS += -Wall -Wno-unused-parameter -Werror
-
-#LOCAL_CFLAGS += ${TZ_CFLAG}
-#LOCAL_LDFLAGS += --gc-sections
-#LOCAL_ASFLAGS += -DASSEMBLY
-LOCAL_SHARED_LIBRARIES += libtz_uree
-include $(BUILD_EXECUTABLE)
-
diff --git a/proprietary/external/trustzone/mtee/keymaster1/Android.mk b/proprietary/external/trustzone/mtee/keymaster1/Android.mk
deleted file mode 100755
index a04fbae08f66e8dbf98b4b0f44afb268d5a3b5db..0000000000000000000000000000000000000000
--- a/proprietary/external/trustzone/mtee/keymaster1/Android.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := keystore.$(TARGET_BOARD_PLATFORM)
-LOCAL_CFLAGS += -fvisibility=hidden -DLOG_TAG=\"KM_UREE\"
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_SRC_FILES := \
-       android_keymaster.cpp  \
-       android_keymaster_messages.cpp \
-	   android_keymaster_utils.cpp \
-	   authorization_set.cpp \
-	   keymaster_mtee_api.cpp \
-	   serializable.cpp \
-	   keymaster_hal.cpp
-
-LOCAL_C_INCLUDES += \
-    hardware/libhardware/include \
-	vendor/mediatek/proprietary/external/trustzone/mtee/include \
-	$(LOCAL_PATH)/include \
-	$(LOCAL_PATH)/include/keymaster
-
-LOCAL_SHARED_LIBRARIES += libcrypto liblog libutils libtz_uree
-
-include $(BUILD_SHARED_LIBRARY)
-
-ifeq ($(MTK_KEYMASTER_TEST_SUPPORT),yes)
-# Unit tests for libkeymaster
-include $(CLEAR_VARS)
-LOCAL_MODULE := mtee_keymaster_tests
-LOCAL_CFLAGS += -DLOG_TAG=\"KM_TEST\"
-LOCAL_SRC_FILES := \
-	test/keymaster_test.cpp
-
-LOCAL_C_INCLUDES := \
-	$(LOCAL_PATH)/include \
-	$(LOCAL_PATH)/test \
-	hardware/libhardware/include \
-	system/security/softkeymaster/include
-
-LOCAL_CLANG_CFLAGS += -Wno-error=unused-const-variable -Wno-error=unused-private-field
-LOCAL_MODULE_TAGS := tests
-LOCAL_SHARED_LIBRARIES := \
-	libcrypto \
-	libsoftkeymaster \
-	libhardware \
-	libutils \
-	libcutils \
-	libtz_uree
-
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/include/keymaster/ \
-									  $(LOCAL_PATH)/include/
-
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-include $(BUILD_NATIVE_TEST)
-endif
diff --git a/proprietary/external/trustzone/mtee/mem_app/Android.mk b/proprietary/external/trustzone/mtee/mem_app/Android.mk
deleted file mode 100755
index 92346aa67a954df711da094cc127ad19b3e4d38e..0000000000000000000000000000000000000000
--- a/proprietary/external/trustzone/mtee/mem_app/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := uree_mem
-LOCAL_SRC_FILES := mem_app.c
-LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES += \
-    $(call include-path-for, trustzone-uree)
-
-LOCAL_CFLAGS += -Wall -Wno-unused-parameter -Werror
-
-#LOCAL_CFLAGS += ${TZ_CFLAG}
-#LOCAL_LDFLAGS += --gc-sections
-#LOCAL_ASFLAGS += -DASSEMBLY
-#LOCAL_STATIC_LIBRARIES += libc_tz libtest
-LOCAL_SHARED_LIBRARIES += libtz_uree
-include $(BUILD_EXECUTABLE)
-
diff --git a/proprietary/external/trustzone/mtee/mtee_logctrl/Android.mk b/proprietary/external/trustzone/mtee/mtee_logctrl/Android.mk
deleted file mode 100755
index 17211f6ec09adba2dcebae12fc28cad067155a06..0000000000000000000000000000000000000000
--- a/proprietary/external/trustzone/mtee/mtee_logctrl/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := mtee_logctrl
-LOCAL_SRC_FILES := mtee_logctrl.c
-LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES += \
-    $(call include-path-for, trustzone-uree)
-
-LOCAL_CFLAGS += -Wall -Wno-unused-parameter -Werror
-
-#LOCAL_CFLAGS += ${TZ_CFLAG}
-#LOCAL_LDFLAGS += --gc-sections
-#LOCAL_ASFLAGS += -DASSEMBLY
-LOCAL_SHARED_LIBRARIES += libtz_uree
-include $(BUILD_EXECUTABLE)
-
diff --git a/proprietary/external/trustzone/mtee/rpmb/Android.mk b/proprietary/external/trustzone/mtee/rpmb/Android.mk
deleted file mode 100755
index 8cc8a52a4dddaab5fc70c6b6b1808da3c635f0d8..0000000000000000000000000000000000000000
--- a/proprietary/external/trustzone/mtee/rpmb/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := rpmb_svc
-LOCAL_SRC_FILES := rpmb_svc.c \
-                   rpmb_api.c \
-                   uree_rpmb.c
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES += \
-    $(call include-path-for, trustzone-uree)
-
-LOCAL_CFLAGS += -Wall -Wno-unused-parameter -Werror
-
-LOCAL_SHARED_LIBRARIES += libtz_uree
-LOCAL_SHARED_LIBRARIES += liblog
-LOCAL_SHARED_LIBRARIES += libcutils
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := rpmb_test
-
-LOCAL_SRC_FILES := rpmb_api.c \
-		   rpmb_test.c \
-		   uree_rpmb.c
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES += \
-    $(call include-path-for, trustzone-uree)
-
-LOCAL_SHARED_LIBRARIES += libtz_uree
-LOCAL_SHARED_LIBRARIES += liblog
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := rpmb_key_sts
-
-LOCAL_SRC_FILES := rpmb_api.c \
-                   rpmb_key_sts.c \
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_C_INCLUDES += \
-    $(call include-path-for, trustzone-uree)
-
-LOCAL_SHARED_LIBRARIES += liblog
-include $(BUILD_EXECUTABLE)
diff --git a/proprietary/external/trustzone/mtee/test/Android.mk b/proprietary/external/trustzone/mtee/test/Android.mk
deleted file mode 100755
index 7c877e0684b872920d5b2e0acf81325111103abe..0000000000000000000000000000000000000000
--- a/proprietary/external/trustzone/mtee/test/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
--include $(MTK_PATH_SOURCE)/trustzone/mtk/Setting.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := uree_test
-LOCAL_SRC_FILES := test.c
-LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES += \
-    $(call include-path-for, trustzone-uree) \
-    $(MTK_KERNEL_HEADERS)
-
-LOCAL_CFLAGS += -Wall -Wno-unused-parameter -Werror
-
-LOCAL_MODULE_STEM_32 := uree_test32
-LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)
-LOCAL_MULTILIB := both
-
-ifeq ($(TZ_ENABLE_TOMCRYPT_TEST),true)
-LOCAL_CFLAGS += -DENABLE_TOMCRYPT_TEST
-endif
-LOCAL_SHARED_LIBRARIES += libtz_uree
-LOCAL_SHARED_LIBRARIES += liblog
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := uree_rng_test
-LOCAL_SRC_FILES := uree_rng_test.c
-LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES += \
-    $(call include-path-for, trustzone-uree) \
-    $(MTK_KERNEL_HEADERS)
-LOCAL_CFLAGS += -Wall -Wno-unused-parameter -Werror
-LOCAL_SHARED_LIBRARIES += libtz_uree
-include $(BUILD_EXECUTABLE)
diff --git a/proprietary/external/trustzone/mtee/uree/Android.mk b/proprietary/external/trustzone/mtee/uree/Android.mk
deleted file mode 100755
index 3d1e1eea55a341b339c846c9208cc27af3f3d8a2..0000000000000000000000000000000000000000
--- a/proprietary/external/trustzone/mtee/uree/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libtz_uree
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := uree.c \
-                   uree_mem.c \
-                   dump_sec_mem.c \
-                   uree_dbg.c
-
-LOCAL_C_INCLUDES += \
-    $(call include-path-for, trustzone-uree) \
-    $(word 1,$(TARGET_BOARD_KERNEL_HEADERS))/trustzone \
-    $(TOP)/kernel-3.18/include/trustzone \
-     $(MTK_PATH_SOURCE)/external/trustzone/mtee/include/
-
-LOCAL_CFLAGS += -Wall -Wno-unused-parameter -Werror
-LOCAL_SHARED_LIBRARIES += liblog
-
-
-#LOCAL_CFLAGS += ${TZ_CFLAG}
-#LOCAL_LDFLAGS += --gc-sections
-#LOCAL_ASFLAGS += -DASSEMBLY
-#LOCAL_STATIC_LIBRARIES += libc_tz libtest
-include $(BUILD_SHARED_LIBRARY)
-
diff --git a/proprietary/external/udf/Android.mk b/proprietary/external/udf/Android.mk
deleted file mode 100755
index af1e919648ab7915191185d46bf649fc3dc4cc3e..0000000000000000000000000000000000000000
--- a/proprietary/external/udf/Android.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-# ========================================================
-# for LD_PRELOAD
-# ========================================================
-ifeq ($(MTK_USER_SPACE_DEBUG_FW),yes)
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := init.preload.eng.rc
-LOCAL_MODULE := init.preload.rc
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
-LOCAL_MODULE_TAGS := eng
-include $(BUILD_PREBUILT)
-endif
-
diff --git a/proprietary/external/voiceui/Android.mk b/proprietary/external/voiceui/Android.mk
deleted file mode 100755
index cef2d6d32e4b079b0e212a2264e8bfaf6ac3fd1c..0000000000000000000000000000000000000000
--- a/proprietary/external/voiceui/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH := $(my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libvoiceui
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_SRC_FILES_arm := libvoiceui_32.a
-LOCAL_SRC_FILES_arm64 := libvoiceui_32.a
-#LOCAL_SRC_FILES_arm64 := libvoiceui_64.a
-LOCAL_MULTILIB := 32
-LOCAL_MODULE_SUFFIX := .a
-include $(BUILD_PREBUILT)
-
diff --git a/proprietary/external/voiceunlock/Android.mk b/proprietary/external/voiceunlock/Android.mk
deleted file mode 100755
index 3e83a80a0c10438029cb79f44f93b94445f75a66..0000000000000000000000000000000000000000
--- a/proprietary/external/voiceunlock/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH := $(my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libvoiceunlock
-LOCAL_SRC_FILES_arm := libvoiceunlock_32.a
-LOCAL_SRC_FILES_arm64 := libvoiceunlock_32.a
-#LOCAL_SRC_FILES_arm64 := libvoiceunlock_64.a
-
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MULTILIB := 32
-LOCAL_MODULE_SUFFIX := .a
-include $(BUILD_PREBUILT)
diff --git a/proprietary/external/vorbisenc/Android.mk b/proprietary/external/vorbisenc/Android.mk
deleted file mode 100755
index aadf7aaef69bc24021c4bd11947e9c50d7022e59..0000000000000000000000000000000000000000
--- a/proprietary/external/vorbisenc/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-LOCAL_PATH := $(my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libvorbisenc_mtk
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_SRC_FILES_32 := arm/libvorbisenc_mtk.a
-LOCAL_SRC_FILES_64 := libvorbisenc_mtk.a
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MULTILIB := both
-include $(BUILD_PREBUILT)
diff --git a/proprietary/external/vsimadaptorclient/Android.mk b/proprietary/external/vsimadaptorclient/Android.mk
deleted file mode 100755
index 768696f9d97788b7a87234ef25ebaf668bbf49d3..0000000000000000000000000000000000000000
--- a/proprietary/external/vsimadaptorclient/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2006 The Android Open Source Project
-
-
-# ===========================================
-# = Configuration of libvsim-adaptor-client =
-# ===========================================
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
-	vsim_adaptor_ipc.c
-
-LOCAL_SHARED_LIBRARIES := \
-	libcutils \
-	libc
-	
-LOCAL_LDLIBS:= -llog
-	
-LOCAL_CFLAGS := -DRIL_SHLIB
-
-LOCAL_MODULE := libvsim-adaptor-client
-LOCAL_MODULE_TAGS := eng
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/proprietary/external/xcap/Android.mk b/proprietary/external/xcap/Android.mk
deleted file mode 100755
index 91f314ceee56181fb2e3a8c2559c6e6bd654023a..0000000000000000000000000000000000000000
--- a/proprietary/external/xcap/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_JAVA_LIBRARIES := okhttp
-
-# Include all the java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_MODULE_TAGS := optional
-
-# The name of the jar file to create.
-LOCAL_MODULE := xcap
-
-# Build a static jar file.
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
diff --git a/proprietary/factory/src/miniui/Android.mk b/proprietary/factory/src/miniui/Android.mk
deleted file mode 100755
index 05e95c040580c90eff8471b12b43cac5e251ea28..0000000000000000000000000000000000000000
--- a/proprietary/factory/src/miniui/Android.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := miniui.c graphics.c events.c resources.c
-
-HAVE_CUST_INC_PATH := $(shell test -d $(MTK_PATH_CUSTOM)/factory/inc && echo yes)
-
-ifeq ($(HAVE_CUST_INC_PATH),yes)
-	LOCAL_CUST_INC_PATH := $(MTK_PATH_CUSTOM)/factory/inc
-else
-	LOCAL_CUST_INC_PATH := $(MTK_ROOT)/custom/generic/factory/inc
-endif
-
-LOCAL_C_INCLUDES +=\
-    external/libpng\
-    external/zlib\
-	$(LOCAL_PATH)/../../inc \
-	$(MTK_PATH_COMMON)/factory/inc \
-	$(LOCAL_CUST_INC_PATH) \
-	$(TOPDIR)/system/core/libpixelflinger/include \
-
-LOCAL_SHARED_LIBRARIES += libpixelflinger libpng
-	
-include $(LOCAL_PATH)/font.mk
-
-LOCAL_MODULE := libminiui
-
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/proprietary/factory/src/mmutil/Android.mk b/proprietary/factory/src/mmutil/Android.mk
deleted file mode 100755
index 32e5c7fc4e8391059ed4f78af9ca4f1e7d81d716..0000000000000000000000000000000000000000
--- a/proprietary/factory/src/mmutil/Android.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-	ddp_factory.cpp \
-	multimediaFactoryTest.cpp
-
-LOCAL_C_INCLUDES:= \
-    $(TOP)/system/core/include/cutils \
-    $(MTK_PATH_SOURCE)/factory/inc   \
-    $(MTK_PATH_SOURCE)/hardware/dpframework/inc
-   
-LOCAL_SHARED_LIBRARIES := \
-    libdl \
-    libcutils \
-    libdpframework
-  
-LOCAL_CFLAGS += -Wno-multichar
-
-LOCAL_MODULE := libmmfactoryutil
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/proprietary/factory/src/mmutil/test/Android.mk b/proprietary/factory/src/mmutil/test/Android.mk
deleted file mode 100755
index 671657d7c43fe30c32c84a6058abd7571a08b606..0000000000000000000000000000000000000000
--- a/proprietary/factory/src/mmutil/test/Android.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-#
-# mdpd
-#
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
-    ddpfactory_test.cpp
-
-LOCAL_SHARED_LIBRARIES := \
-    libmmfactoryutil
-
-LOCAL_C_INCLUDES:= \
-    $(MTK_PATH_SOURCE)factory/inc
-
-LOCAL_CFLAGS += -Wno-multichar
-
-LOCAL_MODULE := ddpfactory_test
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PRELINK_MODULE:=false
-
-include $(BUILD_EXECUTABLE)
diff --git a/proprietary/factory/src/mtdutil/Android.mk b/proprietary/factory/src/mtdutil/Android.mk
deleted file mode 100755
index 3da9507af770d35cd215fbe818e8f8d7d8f933d1..0000000000000000000000000000000000000000
--- a/proprietary/factory/src/mtdutil/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := mtdutils.c mounts.c
-
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../inc
-
-LOCAL_MODULE := libmtdutil
-
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/proprietary/frameworks/base/tests/ANR/Android.mk b/proprietary/frameworks/base/tests/ANR/Android.mk
deleted file mode 100755
index 7e960853bca3b6d48743c1fa4bec7f7a417b4649..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)\
-              $(call all-java-files-under, core/runner/src)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-#LOCAL_JNI_SHARED_LIBRARIES := libcts_jni
-
-# Resource unit tests use a private locale and some densities
-LOCAL_AAPT_FLAGS = -c xx_YY -c cs -c 32dpi -c 240dpi -c 160dpi
-
-LOCAL_PACKAGE_NAME := MediatekAnrTestStubs
-
-include $(BUILD_PACKAGE)
-
-# Build the test APK using its own makefile, and any other CTS-related packages
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/frameworks/base/tests/ANR/Android.mk_ b/proprietary/frameworks/base/tests/ANR/Android.mk_
deleted file mode 100755
index 7e960853bca3b6d48743c1fa4bec7f7a417b4649..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/Android.mk_
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)\
-              $(call all-java-files-under, core/runner/src)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-#LOCAL_JNI_SHARED_LIBRARIES := libcts_jni
-
-# Resource unit tests use a private locale and some densities
-LOCAL_AAPT_FLAGS = -c xx_YY -c cs -c 32dpi -c 240dpi -c 160dpi
-
-LOCAL_PACKAGE_NAME := MediatekAnrTestStubs
-
-include $(BUILD_PACKAGE)
-
-# Build the test APK using its own makefile, and any other CTS-related packages
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/frameworks/base/tests/ANR/AndroidManifest.xml b/proprietary/frameworks/base/tests/ANR/AndroidManifest.xml
deleted file mode 100755
index 0634d3cac070ccf279d2f42f70f25fb33018d6a1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/AndroidManifest.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mediatek.cts.anr.stub">
-
-    <permission android:name="android.app.cts.permission.TEST_GRANTED"
-        android:protectionLevel="normal"
-            android:label="@string/permlab_testGranted"
-            android:description="@string/permdesc_testGranted">
-        <meta-data android:name="android.app.cts.string" android:value="foo" />
-        <meta-data android:name="android.app.cts.boolean" android:value="true" />
-        <meta-data android:name="android.app.cts.integer" android:value="100" />
-        <meta-data android:name="android.app.cts.color" android:value="#ff000000" />
-        <meta-data android:name="android.app.cts.float" android:value="100.1" />
-        <meta-data android:name="android.app.cts.reference" android:resource="@xml/metadata" />
-    </permission>
-
-    <uses-permission android:name="android.permission.GET_TASKS" />
-    <uses-permission android:name="android.permission.SET_WALLPAPER" />
-    <uses-permission android:name="android.permission.SET_TIME_ZONE" />
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.DEVICE_POWER" />
-    <uses-permission android:name="android.permission.STATUS_BAR" />
-    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.PERSISTENT_ACTIVITY" />
-    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
-    <uses-permission android:name="android.permission.INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_OWNER_DATA" />
-    <uses-permission android:name="android.permission.READ_OWNER_DATA" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.DELETE_CACHE_FILES" />
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
-    <uses-permission android:name="android.permission.ADD_SYSTEM_SERVICE" />
-    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-    <uses-permission android:name="android.app.cts.permission.TEST_GRANTED" />
-    <uses-permission android:name="android.permission.INJECT_EVENTS" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.CALL_PHONE" />
-    <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.DUMP" />
-    <uses-permission android:name="android.permission.NFC" />
-
-    <!-- Used for PackageManager test, don't delete this INTERNET permission -->
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.SET_PREFERRED_APPLICATIONS" />
-    <uses-permission android:name="android.permission.INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.GET_PACKAGE_SIZE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.SEND_SMS" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS" />
-    <uses-permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS" />
-    <uses-permission android:name="android.permission.WRITE_USER_DICTIONARY" />
-    <uses-permission android:name="android.permission.READ_USER_DICTIONARY" />
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_LOGS" />
-
-    <!-- content sync tests -->
-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.READ_SYNC_STATS" />
-
-    <!-- for ANR Dialog -->
-	<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-
-    <!-- Used for PackageManager test, don't delete this permission-tree -->
-    <permission-tree android:name="com.android.cts.stub.permission.TEST_DYNAMIC"
-                    android:label="Test Tree"/>
-
-    <!-- Used for PackageManager test, don't delete this permission-group -->
-    <permission-group android:name="android.permission-group.COST_MONEY"/>
-    <!-- Used for PackageManager test, don't delete! -->
-    <uses-configuration/>
-
-    <application android:label="Mediatek TestCase"
-                android:icon="@drawable/size_48x48" >
-
-        <receiver android:name="mediatek.app.cts.MockANRReceiver"
-                  android:enabled="true" 
-                  android:exported="true">
-            <intent-filter android:priority="1">
-                <action android:name="android.content.cts.ANR.BROADCAST_MOCKTEST" />
-            </intent-filter>
-        </receiver>
-
-        <activity android:name="mediatek.app.cts.MockANRActivity"
-            android:label="MockANRActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        
-    </application>
-
-</manifest>
-
diff --git a/proprietary/frameworks/base/tests/ANR/NOTICE b/proprietary/frameworks/base/tests/ANR/NOTICE
deleted file mode 100755
index 8de7241cd3394cc99c2a5661349a3ca5268e7575..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/NOTICE
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- Copyright (C) 2007 The Android Open Source Project:
-<!-- Copyright (C) 2009 The Android Open Source Project:
-<!-- Copyright (C) 2008 The Android Open Source Project:
-* Copyright (C) 2008 The Android Open Source Project:
-
-
-
-/*
-* Copyright (C) 2011-2014 MediaTek Inc.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-:
diff --git a/proprietary/frameworks/base/tests/ANR/README b/proprietary/frameworks/base/tests/ANR/README
deleted file mode 100755
index 37166d8c364b56f7f568def3eadb45914f36d956..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/README
+++ /dev/null
@@ -1,18 +0,0 @@
-This is ANR manager proguard test apk.
-
-WHAT IT DOES?
-=============
-The purpose of this apk is to test if ANRManager.java is proguard or not.
-
-HOW IT WAS BUILT?
-==================
-mmm vendor/mediatek/frameworks/base/tests/ANR/
-mmm vendor/mediatek/frameworks/base/tests/ANR/tests/
-
-HOW TO USE IT?
-==============
-adb install -r MediatekAnrTestStubs.apk
-adb install -r MediaTekCtsAnrTestCases.apk
-adb shell am instrument -w -e class mediatek.app.cts.ANRManagerProGuardTest com.mediatek.cts.anr/android.test.InstrumentationCtsTestRunner 
-
-The majority of source code for this library were written by MediaTek.
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/ANR/core/runner/Android.mk b/proprietary/frameworks/base/tests/ANR/core/runner/Android.mk
deleted file mode 100755
index 7658b7acad3b0afaace421e835523c20de8e8698..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/core/runner/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-ifeq ($(BUILD_CTSCORE_PACKAGE),)
-    $(error BUILD_CTSCORE_PACKAGE must be defined)
-endif
-
-include $(CLEAR_VARS)
-
-# include this package in the tests target for continuous testing
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SRC_FILES := $(call all-java-files-under,src)
-
-LOCAL_PACKAGE_NAME := android.core.tests.runner
-
-include $(BUILD_CTSCORE_PACKAGE)
diff --git a/proprietary/frameworks/base/tests/ANR/core/runner/Android.mk_ b/proprietary/frameworks/base/tests/ANR/core/runner/Android.mk_
deleted file mode 100755
index 7658b7acad3b0afaace421e835523c20de8e8698..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/core/runner/Android.mk_
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-ifeq ($(BUILD_CTSCORE_PACKAGE),)
-    $(error BUILD_CTSCORE_PACKAGE must be defined)
-endif
-
-include $(CLEAR_VARS)
-
-# include this package in the tests target for continuous testing
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SRC_FILES := $(call all-java-files-under,src)
-
-LOCAL_PACKAGE_NAME := android.core.tests.runner
-
-include $(BUILD_CTSCORE_PACKAGE)
diff --git a/proprietary/frameworks/base/tests/ANR/core/runner/AndroidManifest.xml b/proprietary/frameworks/base/tests/ANR/core/runner/AndroidManifest.xml
deleted file mode 100755
index e179710a114530c0e0261133df9ab76d81f0d9af..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/core/runner/AndroidManifest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="android.core.tests.runner">
-    <uses-permission android:name="android.permission.INTERNET" />
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation android:name="android.test.InstrumentationCtsTestRunner"
-                     android:targetPackage="android.core.tests.runner"
-                     android:label="cts framework tests"/>
-
-</manifest>
diff --git a/proprietary/frameworks/base/tests/ANR/core/runner/NOTICE b/proprietary/frameworks/base/tests/ANR/core/runner/NOTICE
deleted file mode 100755
index 82b3dd266a00043baed7a48e60fa214cde93bb64..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/core/runner/NOTICE
+++ /dev/null
@@ -1,23 +0,0 @@
-* Copyright (C) 2009 The Android Open Source Project:
-* Copyright (C) 2007 The Android Open Source Project:
-* Copyright (C) 2008 The Android Open Source Project:
-
-
-
-/*
-* Copyright (C) 2011-2014 MediaTek Inc.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-:
diff --git a/proprietary/frameworks/base/tests/ANR/core/runner/README b/proprietary/frameworks/base/tests/ANR/core/runner/README
deleted file mode 100755
index 37166d8c364b56f7f568def3eadb45914f36d956..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/core/runner/README
+++ /dev/null
@@ -1,18 +0,0 @@
-This is ANR manager proguard test apk.
-
-WHAT IT DOES?
-=============
-The purpose of this apk is to test if ANRManager.java is proguard or not.
-
-HOW IT WAS BUILT?
-==================
-mmm vendor/mediatek/frameworks/base/tests/ANR/
-mmm vendor/mediatek/frameworks/base/tests/ANR/tests/
-
-HOW TO USE IT?
-==============
-adb install -r MediatekAnrTestStubs.apk
-adb install -r MediaTekCtsAnrTestCases.apk
-adb shell am instrument -w -e class mediatek.app.cts.ANRManagerProGuardTest com.mediatek.cts.anr/android.test.InstrumentationCtsTestRunner 
-
-The majority of source code for this library were written by MediaTek.
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/ANR/core/runner/src/android/test/InstrumentationCtsTestRunner.java b/proprietary/frameworks/base/tests/ANR/core/runner/src/android/test/InstrumentationCtsTestRunner.java
deleted file mode 100755
index 4f20a7f51c47d99dcd5a514da0442dbbc79793bd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/core/runner/src/android/test/InstrumentationCtsTestRunner.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.test;
-
-import com.android.internal.util.Predicate;
-import com.android.internal.util.Predicates;
-
-import dalvik.annotation.BrokenTest;
-import dalvik.annotation.SideEffect;
-
-import android.app.KeyguardManager;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.test.suitebuilder.TestMethod;
-import android.test.suitebuilder.annotation.HasAnnotation;
-import android.util.Log;
-
-import java.io.File;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.List;
-import java.util.TimeZone;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestListener;
-
-/**
- * This test runner extends the default InstrumentationTestRunner. It overrides
- * the {@code onCreate(Bundle)} method and sets the system properties necessary
- * for many core tests to run. This is needed because there are some core tests
- * that need writing access to the file system. We also need to set the harness
- * Thread's context ClassLoader. Otherwise some classes and resources will not
- * be found. Finally, we add a means to free memory allocated by a TestCase
- * after its execution.
- *
- * @hide
- */
-public class InstrumentationCtsTestRunner extends InstrumentationTestRunner {
-
-    /**
-     * Convenience definition of our log tag.
-     */
-    private static final String TAG = "InstrumentationCtsTestRunner";
-
-    private static final String REPORT_VALUE_ID = "InstrumentationCtsTestRunner";
-
-    /**
-     * True if (and only if) we are running in single-test mode (as opposed to
-     * batch mode).
-     */
-    private boolean mSingleTest = false;
-
-    @Override
-    public void onCreate(Bundle arguments) {
-        // We might want to move this to /sdcard, if is is mounted/writable.
-        File cacheDir = getTargetContext().getCacheDir();
-
-        // Set some properties that the core tests absolutely need.
-        System.setProperty("user.language", "en");
-        System.setProperty("user.region", "US");
-
-        System.setProperty("java.home", cacheDir.getAbsolutePath());
-        System.setProperty("user.home", cacheDir.getAbsolutePath());
-        System.setProperty("java.io.tmpdir", cacheDir.getAbsolutePath());
-        System.setProperty("user.dir", cacheDir.getAbsolutePath());
-        System.setProperty("javax.net.ssl.trustStore",
-                "/etc/security/cacerts.bks");
-
-        TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
-
-        if (arguments != null) {
-            String classArg = arguments.getString(ARGUMENT_TEST_CLASS);
-            mSingleTest = classArg != null && classArg.contains("#");
-        }
-
-        // attempt to disable keyguard,  if current test has permission to do so
-        // TODO: move this to a better place, such as InstrumentationTestRunner ?
-        if (getContext().checkCallingOrSelfPermission(android.Manifest.permission.DISABLE_KEYGUARD)
-                == PackageManager.PERMISSION_GRANTED) {
-            Log.i(TAG, "Disabling keyguard");
-            KeyguardManager keyguardManager =
-                (KeyguardManager) getContext().getSystemService(Context.KEYGUARD_SERVICE);
-            keyguardManager.newKeyguardLock("cts").disableKeyguard();
-        } else {
-            Log.i(TAG, "Test lacks permission to disable keyguard. " +
-                    "UI based tests may fail if keyguard is up");
-        }
-
-        super.onCreate(arguments);
-    }
-
-    @Override
-    protected AndroidTestRunner getAndroidTestRunner() {
-        AndroidTestRunner runner = super.getAndroidTestRunner();
-
-        runner.addTestListener(new TestListener() {
-            /**
-             * The last test class we executed code from.
-             */
-            private Class<?> lastClass;
-
-            /**
-             * The minimum time we expect a test to take.
-             */
-            private static final int MINIMUM_TIME = 100;
-
-            /**
-             * The start time of our current test in System.currentTimeMillis().
-             */
-            private long startTime;
-
-            public void startTest(Test test) {
-                if (test.getClass() != lastClass) {
-                    lastClass = test.getClass();
-                    printMemory(test.getClass());
-                }
-
-                Thread.currentThread().setContextClassLoader(
-                        test.getClass().getClassLoader());
-
-                startTime = System.currentTimeMillis();
-            }
-
-            public void endTest(Test test) {
-                if (test instanceof TestCase) {
-                    cleanup((TestCase) test);
-
-                    /*
-                     * Make sure all tests take at least MINIMUM_TIME to
-                     * complete. If they don't, we wait a bit. The Cupcake
-                     * Binder can't handle too many operations in a very
-                     * short time, which causes headache for the CTS.
-                     */
-                    long timeTaken = System.currentTimeMillis() - startTime;
-
-                    if (timeTaken < MINIMUM_TIME) {
-                        try {
-                            Thread.sleep(MINIMUM_TIME - timeTaken);
-                        } catch (InterruptedException ignored) {
-                            // We don't care.
-                        }
-                    }
-                }
-            }
-
-            public void addError(Test test, Throwable t) {
-                // This space intentionally left blank.
-            }
-
-            public void addFailure(Test test, AssertionFailedError t) {
-                // This space intentionally left blank.
-            }
-
-            /**
-             * Dumps some memory info.
-             */
-            private void printMemory(Class<? extends Test> testClass) {
-                Runtime runtime = Runtime.getRuntime();
-
-                long total = runtime.totalMemory();
-                long free = runtime.freeMemory();
-                long used = total - free;
-
-                Log.d(TAG, "Total memory  : " + total);
-                Log.d(TAG, "Used memory   : " + used);
-                Log.d(TAG, "Free memory   : " + free);
-                Log.d(TAG, "Now executing : " + testClass.getName());
-            }
-
-            /**
-             * Nulls all non-static reference fields in the given test class.
-             * This method helps us with those test classes that don't have an
-             * explicit tearDown() method. Normally the garbage collector should
-             * take care of everything, but since JUnit keeps references to all
-             * test cases, a little help might be a good idea.
-             */
-            private void cleanup(TestCase test) {
-                Class<?> clazz = test.getClass();
-
-                while (clazz != TestCase.class) {
-                    Field[] fields = clazz.getDeclaredFields();
-                    for (int i = 0; i < fields.length; i++) {
-                        Field f = fields[i];
-                        if (!f.getType().isPrimitive() &&
-                                !Modifier.isStatic(f.getModifiers())) {
-                            try {
-                                f.setAccessible(true);
-                                f.set(test, null);
-                            } catch (Exception ignored) {
-                                // Nothing we can do about it.
-                            }
-                        }
-                    }
-
-                    clazz = clazz.getSuperclass();
-                }
-            }
-
-        });
-
-        return runner;
-    }
-
-    @Override
-    List<Predicate<TestMethod>> getBuilderRequirements() {
-        List<Predicate<TestMethod>> builderRequirements =
-                super.getBuilderRequirements();
-
-        Predicate<TestMethod> brokenTestPredicate =
-                Predicates.not(new HasAnnotation(BrokenTest.class));
-        builderRequirements.add(brokenTestPredicate);
-
-        if (!mSingleTest) {
-            Predicate<TestMethod> sideEffectPredicate =
-                    Predicates.not(new HasAnnotation(SideEffect.class));
-            builderRequirements.add(sideEffectPredicate);
-        }
-        return builderRequirements;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/ANR/res/color/color1.xml b/proprietary/frameworks/base/tests/ANR/res/color/color1.xml
deleted file mode 100755
index 87034fa2aeb0574083807f0c668fb7b20aecd698..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/color/color1.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true" android:color="@color/testcolor1"/>
-    <item android:color="@color/testcolor2"/>
-</selector>
diff --git a/proprietary/frameworks/base/tests/ANR/res/drawable/size_48x48.jpg b/proprietary/frameworks/base/tests/ANR/res/drawable/size_48x48.jpg
deleted file mode 100755
index 5c2291e3e580c9b6bfbafccd6f75ea472ecf6141..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/ANR/res/drawable/size_48x48.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-12key-63x57/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-12key-63x57/configVarying.xml
deleted file mode 100755
index 5229f28f2dff385dba3d78e2aaa96d0e18da729c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-12key-63x57/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 12key 63x57</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 12key 63x57</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-12key-dpad/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-12key-dpad/configVarying.xml
deleted file mode 100755
index 4622574ca5fc60929bb1df4241fa883701a35489..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-12key-dpad/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 12key dpad</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 12key dpad</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-12key/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-12key/configVarying.xml
deleted file mode 100755
index 38174d7aa0e83eb1d55b2f0348ed38b2d89217f4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-12key/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 12key</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 12key</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-240dpi/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-240dpi/configVarying.xml
deleted file mode 100755
index 3b437998c3d5e735f16a2e5511bbecb838fc3f1e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-240dpi/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 240dpi</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 240dpi</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-32dpi-keysexposed/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-32dpi-keysexposed/configVarying.xml
deleted file mode 100755
index 67dd4a5b8f124f213fdeb67ad5759eb02379a45e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-32dpi-keysexposed/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 32dpi keysexposed</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 32dpi keysexposed</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-32dpi-stylus/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-32dpi-stylus/configVarying.xml
deleted file mode 100755
index 948784a25945256f0b11842633c89a265425193e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-32dpi-stylus/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 32dpi stylus</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 32dpi stylus</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-32dpi/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-32dpi/configVarying.xml
deleted file mode 100755
index f903f0fdf7a101e1cf7656f53fd59329c24b191e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-32dpi/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 32dpi</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 32dpi</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-480x320/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-480x320/configVarying.xml
deleted file mode 100755
index ade144bbcb53f62ae5c372a0ecafd3f17b125725..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-480x320/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 480x320</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 480x320</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-640x400/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-640x400/configVarying.xml
deleted file mode 100755
index 30332c0967b0ee55144b2a9e0845efaae7155976..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-640x400/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 640x400</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 640x400</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-cs/strings.xml b/proprietary/frameworks/base/tests/ANR/res/values-cs/strings.xml
deleted file mode 100755
index 396bebd4e081b28ce0da7bba2b1b51cf4b1181e5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-cs/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <plurals name="plurals_test">
-        <item quantity="one">A Czech dog</item>
-        <item quantity="few">Few Czech dogs</item>
-        <item quantity="other">Some Czech dogs</item>
-    </plurals>
-</resources>
-
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-dpad-63x57/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-dpad-63x57/configVarying.xml
deleted file mode 100755
index 6b93c7d14f42c878921dab8181131783746ab285..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-dpad-63x57/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple dpad 63x57</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag dpad 63x57</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-dpad/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-dpad/configVarying.xml
deleted file mode 100755
index 0b0760fa133c4dc0eb5263f34346e95aa47e369e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-dpad/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple dpad</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag dpad</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-fr-rFR/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-fr-rFR/configVarying.xml
deleted file mode 100755
index 5ecac7caff8adc75437536118e0e2ede7f2dbd02..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-fr-rFR/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple fr FR</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag fr FR</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-fr/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-fr/configVarying.xml
deleted file mode 100755
index 8413b5a7008693ce6e7a1ec2bf3c3e78ae584fdd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-fr/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple fr</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag fr</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-keysexposed-12key/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-keysexposed-12key/configVarying.xml
deleted file mode 100755
index 311d5db5726801820e4c3b8e367c64e28533dea3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-keysexposed-12key/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple keysexposed 12key</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag keysexposed 12key</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-keysexposed-dpad/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-keysexposed-dpad/configVarying.xml
deleted file mode 100755
index 7c6caeb1dcd7d630ca432d74714355411e9b814e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-keysexposed-dpad/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple keysexposed dpad</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag keysexposed dpad</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-keysexposed/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-keysexposed/configVarying.xml
deleted file mode 100755
index befd5352df0f6fde3ffe5fc4172fcdf79edfdb34..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-keysexposed/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple keysexposed</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag keysexposed</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-land/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-land/configVarying.xml
deleted file mode 100755
index d5ece199bfed254960eada34260819c6a1fbbf07..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-land/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple landscape</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag landscape</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-large/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-large/configVarying.xml
deleted file mode 100755
index 7b2df7c1d11122e84772904817e9d7eef88b7375..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-large/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple large</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag large</item>
-    </bag>
-    <item type="configVarying" name="large">large</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-mcc110-xx/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-mcc110-xx/configVarying.xml
deleted file mode 100755
index 82e24355d035bb424e4f050925913a4adbde2e39..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-mcc110-xx/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mcc110 xx</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mcc110 xx</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-mcc111-mnc222/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-mcc111-mnc222/configVarying.xml
deleted file mode 100755
index 7f85a14f2e9fffecad5480832812edb2d523200b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-mcc111-mnc222/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mcc111 mnc222</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mcc111 mnc222</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-mcc111-xx-rYY/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-mcc111-xx-rYY/configVarying.xml
deleted file mode 100755
index 6b094dc1683246f8b3054e3cd654cff43cf5db50..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-mcc111-xx-rYY/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mcc111 xx-rYY</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mcc111 xx-rYY</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-mcc111-xx/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-mcc111-xx/configVarying.xml
deleted file mode 100755
index 6d01bcee8aed2868ddaefe88c097ce3d1d38d997..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-mcc111-xx/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mcc111 xx</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mcc111 xx</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-mcc111/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-mcc111/configVarying.xml
deleted file mode 100755
index 656c2bdce32b3fe692fbbcdb6ca10512220cb661..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-mcc111/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mcc111</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mcc111</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-mcc112/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-mcc112/configVarying.xml
deleted file mode 100755
index 9c05d77b6d7b7425efc453d623c095c21461fe75..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-mcc112/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mcc112</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mcc112</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-mnc220-xx/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-mnc220-xx/configVarying.xml
deleted file mode 100755
index fbc78882d8aa5d3142238aff54bf3926ada27cdc..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-mnc220-xx/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mnc220 xx</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mnc220 xx</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-mnc222-32dpi/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-mnc222-32dpi/configVarying.xml
deleted file mode 100755
index 03bea33ae2d07af0ca3bfaaf600990748e01935b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-mnc222-32dpi/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mnc222 32dpi</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mnc222 32dpi</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-mnc222-square/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-mnc222-square/configVarying.xml
deleted file mode 100755
index 4a64117de261e12731421ea74680e80b217eb01d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-mnc222-square/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mnc222 square</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mnc222 square</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-mnc222-xx/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-mnc222-xx/configVarying.xml
deleted file mode 100755
index 80570f549e35756f1626494a301e4f54ea99e7a9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-mnc222-xx/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mnc222 xx</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mnc222 xx</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-mnc222/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-mnc222/configVarying.xml
deleted file mode 100755
index 54bb47e6083a5f22e269703ca443c11e3a23be93..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-mnc222/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mnc222</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mnc222</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-mnc223/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-mnc223/configVarying.xml
deleted file mode 100755
index 8936cbcb09bfc54ab5c83bbcc021d799d8178397..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-mnc223/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mnc223</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mnc223</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-nokeys/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-nokeys/configVarying.xml
deleted file mode 100755
index e0b23bcf603a30ae3b4c8b5cf3d871e14703cbb0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-nokeys/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple nokeys</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag nokeys</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-nonav/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-nonav/configVarying.xml
deleted file mode 100755
index 1ec8520729a366a7a4a39ac418d4fb972fc773c2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-nonav/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple nonav</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag nonav</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-normal/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-normal/configVarying.xml
deleted file mode 100755
index b45ee49dddf90b7a510afcfcc7ec04c6328b9d99..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-normal/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple normal</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag normal</item>
-    </bag>
-    <item type="configVarying" name="normal">normal</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-notouch/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-notouch/configVarying.xml
deleted file mode 100755
index ed0833b09310f20f6e1e67dfcbe2323b47682520..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-notouch/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple notouch</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag notouch</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-small/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-small/configVarying.xml
deleted file mode 100755
index 15a9f8f1bb9feac4de815afb333c222762a620ee..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-small/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple small</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag small</item>
-    </bag>
-    <item type="configVarying" name="small">small</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-square-32dpi/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-square-32dpi/configVarying.xml
deleted file mode 100755
index f205f46fccf37d968dcbfc6530f4e9c18422b96f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-square-32dpi/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple square 32dpi</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag square 32dpi</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-square-stylus/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-square-stylus/configVarying.xml
deleted file mode 100755
index 861c21590b4d238b3d885fde1e47327eafab031c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-square-stylus/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple square stylus</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag square stylus</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-square/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-square/configVarying.xml
deleted file mode 100755
index 055fd35153273e00f05f1a8701c318543e2226e9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-square/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple square</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag square</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-stylus-12key/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-stylus-12key/configVarying.xml
deleted file mode 100755
index 47db444dfefad1849499f6aa29fd3411a924c9b8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-stylus-12key/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple stylus 12key</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag stylus 12key</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-stylus-keysexposed/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-stylus-keysexposed/configVarying.xml
deleted file mode 100755
index cf5598f6267856308dd2d50daf6cc3da33a818e8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-stylus-keysexposed/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple stylus keysexposed</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag stylus keysexposed</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-stylus/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-stylus/configVarying.xml
deleted file mode 100755
index 862c2bcd7ef45b9ae1c374f2a8a157720120f2b0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-stylus/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple stylus</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag stylus</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-v10/strings.xml b/proprietary/frameworks/base/tests/ANR/res/values-v10/strings.xml
deleted file mode 100755
index 6cd55fa2a3e95c03e208feca0873747c82252658..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-v10/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v10cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-v11/strings.xml b/proprietary/frameworks/base/tests/ANR/res/values-v11/strings.xml
deleted file mode 100755
index d4d75ff6f69397ce9833f3dcce558e8a50905a4e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-v11/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v11cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-v12/strings.xml b/proprietary/frameworks/base/tests/ANR/res/values-v12/strings.xml
deleted file mode 100755
index ab421fa29b141c7f551615fd3275cbb2007b478a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-v12/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v12cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-v13/strings.xml b/proprietary/frameworks/base/tests/ANR/res/values-v13/strings.xml
deleted file mode 100755
index d71936a3635298a177fe518b6985234b52d785b6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-v13/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v13cur</string>
-   <string name="version_old">v13old</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-v3/strings.xml b/proprietary/frameworks/base/tests/ANR/res/values-v3/strings.xml
deleted file mode 100755
index a4d012abb24de3948118ac9cc0cc7ddeda9e0ddd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-v3/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v3cur</string>
-   <string name="version_v3">v3</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-v4/strings.xml b/proprietary/frameworks/base/tests/ANR/res/values-v4/strings.xml
deleted file mode 100755
index e6d414a5898cdc0e997ac0e2ed8ede5ebfa0817d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-v4/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v4cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-v5/strings.xml b/proprietary/frameworks/base/tests/ANR/res/values-v5/strings.xml
deleted file mode 100755
index ef3a564658b743b1ddfb9c8bb688d964105b75a2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-v5/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v5cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-v6/strings.xml b/proprietary/frameworks/base/tests/ANR/res/values-v6/strings.xml
deleted file mode 100755
index fb1f15dff66a67bd155c6093b31e4549f8819b36..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-v6/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v6cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-v7/strings.xml b/proprietary/frameworks/base/tests/ANR/res/values-v7/strings.xml
deleted file mode 100755
index 4c3df45b5b1010b068f0ea38bf9ee4a5d6dda480..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-v7/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v7cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-v8/strings.xml b/proprietary/frameworks/base/tests/ANR/res/values-v8/strings.xml
deleted file mode 100755
index b4e1d88c15ee1328ca7bd576e5e2cf16161a2821..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-v8/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v8cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-v9/strings.xml b/proprietary/frameworks/base/tests/ANR/res/values-v9/strings.xml
deleted file mode 100755
index a03ea12b24764a4829486ac4dcdfbc431c3f3ade..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-v9/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v9cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-wheel/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-wheel/configVarying.xml
deleted file mode 100755
index 64173a899cfb90440e55d331c08458fed780d352..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-wheel/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple wheel</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag wheel</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-xlarge/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-xlarge/configVarying.xml
deleted file mode 100755
index fb9cad7c78f7da633e9568a7c9fceb110b63888a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-xlarge/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple xlarge</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag xlarge</item>
-    </bag>
-    <item type="configVarying" name="xlarge">xlarge</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-xx-32dpi/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-xx-32dpi/configVarying.xml
deleted file mode 100755
index dc17c6b2dbaa34cb575c997788ee42fec068a33f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-xx-32dpi/configVarying.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <item type="configVarying" name="simple">simple xx 32dpi</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag xx 32dpi</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-xx-rYY/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-xx-rYY/configVarying.xml
deleted file mode 100755
index 903d008aa0214d38f940e91208b266ac37142628..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-xx-rYY/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple xx-rYY</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag xx-rYY</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-xx-square/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-xx-square/configVarying.xml
deleted file mode 100755
index 6ef5d431f299821c2fe56cbad2923e48b44787ac..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-xx-square/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple xx square</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag xx square</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values-xx/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values-xx/configVarying.xml
deleted file mode 100755
index 191e4f763a3cc0fd4eba07717851c2eeb1d5b839..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values-xx/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple xx</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag xx</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values/arrays.xml b/proprietary/frameworks/base/tests/ANR/res/values/arrays.xml
deleted file mode 100755
index 71e013317f3bf9c91f3ad260c014d325a7687b02..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values/arrays.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources>
-    <item type="integer" name="reference" format="integer">101</item>
-
-      <string-array name="strings">
-        <item>zero</item>
-        <item>1</item>
-        <item>@string/reference</item>
-    </string-array>
-
-    <integer-array name="integers">
-        <item>0</item>
-        <item>1</item>
-        <item>@integer/reference</item>
-    </integer-array>
-
-    <array name="difficultyLevel">
-        <item>Easy</item>
-        <item>Medium</item>
-        <item>Hard</item>
-    </array>
-
-    <string-array name="string">
-        <item>Test String 1</item>
-        <item>Test String 2</item>
-        <item>Test String 3</item>
-    </string-array>
-
-    <integer-array name="table_row_layout">
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-        <item>8</item>
-        <item>9</item>
-        <item>10</item>
-    </integer-array>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values/attrs.xml b/proprietary/frameworks/base/tests/ANR/res/values/attrs.xml
deleted file mode 100755
index 97938933925bee9b8f3bfd62e12d84c7320b66f2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values/attrs.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources>
-    <declare-styleable name="Style1">
-        <attr name="Type1" format="integer">
-            <enum name="type" value="28" />
-            <enum name="data" value="0xff00ff00" />
-            <enum name="asset_cookie" value="0" />
-            <enum name="resource_id" value="0" />
-            <enum name="changing_config" value="0" />
-        </attr>
-        <attr name="Type2" format="integer">
-            <enum name="type" value="28" />
-            <enum name="data" value="0xff0000ff" />
-            <enum name="asset_cookie" value="0" />
-            <enum name="resource_id" value="0" />
-            <enum name="changing_config" value="0" />
-        </attr>
-    </declare-styleable>
-    <attr name="type1" format="boolean"/>
-    <attr name="type2" format="boolean"/>
-    <attr name="type3" format="color"/>
-    <attr name="type4" format="reference|color"/>
-    <attr name="type5" format="dimension"/>
-    <attr name="type6" format="dimension"/>
-    <attr name="type7" format="dimension"/>
-    <attr name="type8" format="reference"/>
-    <attr name="type9" format="float"/>
-    <attr name="type10" format="fraction"/>
-    <attr name="type11" format="integer"/>
-    <attr name="type12" format="integer"/>
-    <attr name="type13" format="reference|string"/>
-    <attr name="type14" format="string"/>
-    <attr name="type15" format="reference"/>
-    <attr name="type16" format="string"/>
-    <declare-styleable name="style1">
-        <attr name="type1"/>
-        <attr name="type2"/>
-        <attr name="type3"/>
-        <attr name="type4"/>
-        <attr name="type5"/>
-        <attr name="type6"/>
-        <attr name="type7"/>
-        <attr name="type8"/>
-        <attr name="type9"/>
-        <attr name="type10"/>
-        <attr name="type11"/>
-        <attr name="type12"/>
-        <attr name="type13"/>
-        <attr name="type14"/>
-        <attr name="type15"/>
-        <attr name="type16"/>
-    </declare-styleable>
-    <attr name="testEnum">
-        <enum name="val1" value="1" />
-        <enum name="val2" value="2" />
-        <enum name="val10" value="10" />
-    </attr>
-    <attr name="testFlags">
-        <flag name="bit1" value="0x1" />
-        <flag name="bit2" value="0x2" />
-        <flag name="bit31" value="0x40000000" />
-    </attr>
-    <attr name="testString" format="string" />
-    <declare-styleable name="EnumStyle">
-        <attr name="testEnum" />
-    </declare-styleable>
-    <declare-styleable name="FlagStyle">
-        <attr name="testFlags" />
-    </declare-styleable>
-    <declare-styleable name="TestConfig">
-        <attr name="testString" />
-    </declare-styleable>
-    <!-- Size of text. Recommended dimension type for text is "sp" for scaled-pixels (example: 15sp).
-         Supported values include the following:<p/>
-    <ul>
-        <li><b>px</b> Pixels</li>
-        <li><b>sp</b> Scaled pixels (scaled to relative pixel size on screen). See {@link android.util.DisplayMetrics} for more information.</li>
-        <li><b>pt</b> Points</li>
-        <li><b>dip</b> Device independent pixels. See {@link android.util.DisplayMetrics} for more information.</li>
-    </ul>
-    -->
-    <attr name="textSize" format="dimension" />
-    <attr name="typeface">
-        <enum name="normal" value="0" />
-        <enum name="sans" value="1" />
-        <enum name="serif" value="2" />
-        <enum name="monospace" value="3" />
-    </attr>
-    <!-- Default text typeface style. -->
-    <attr name="textStyle">
-        <flag name="normal" value="0" />
-        <flag name="bold" value="1" />
-        <flag name="italic" value="2" />
-    </attr>
-    <!-- Color of text (usually same as colorForeground). -->
-    <attr name="textColor" format="reference|color" />
-    <!-- Color of highlighted text. -->
-    <attr name="textColorHighlight" format="reference|color" />
-    <!-- Color of hint text (displayed when the field is empty). -->
-    <attr name="textColorHint" format="reference|color" />
-    <!-- Color of link text (URLs). -->
-    <attr name="textColorLink" format="reference|color" />
-    <declare-styleable name="TextAppearance">
-        <attr name="textColor"/>
-        <attr name="textSize"/>
-        <attr name="textStyle"/>
-        <attr name="typeface"/>
-        <attr name="textColorHighlight"/>
-        <attr name="textColorHint"/>
-        <attr name="textColorLink"/>
-    </declare-styleable>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values/bools.xml b/proprietary/frameworks/base/tests/ANR/res/values/bools.xml
deleted file mode 100755
index f119cda25a81f8489c157882d190be576f109495..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values/bools.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources>
-	<bool name="trueRes">true</bool>
-	<bool name="falseRes">false</bool>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values/colors.xml b/proprietary/frameworks/base/tests/ANR/res/values/colors.xml
deleted file mode 100755
index f3cc3255e58e96c02d8288a2c1aab696b2814719..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values/colors.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources>
-    <drawable name="red">#7f00</drawable>
-    <drawable name="blue">#770000ff</drawable>
-    <drawable name="black">#77ffffff</drawable>
-    <drawable name="yellow">#77ffff00</drawable>
-    <color name="testcolor1">#ff00ff00</color>
-    <color name="testcolor2">#ffff0000</color>
-    <color name="failColor">#ff0000ff</color>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values/configVarying.xml b/proprietary/frameworks/base/tests/ANR/res/values/configVarying.xml
deleted file mode 100755
index de1b09eebd84d5ac43c3dfc151c7884b8d283cee..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values/configVarying.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple default</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag default</item>
-    </bag>
-    <item type="configVarying" name="small">default</item>
-    <item type="configVarying" name="normal">default</item>
-    <item type="configVarying" name="large">default</item>
-    <item type="configVarying" name="xlarge">default</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values/dimens.xml b/proprietary/frameworks/base/tests/ANR/res/values/dimens.xml
deleted file mode 100755
index 2a8f76e5a564e7f9615c1446538f13b29282027c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values/dimens.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources>
-    <item name="frac100perc" type="dimen" format="fraction">100%</item>
-    <item name="frac1perc" type="dimen" format="fraction">1%</item>
-    <item name="fracp1perc" type="dimen" format="fraction">.1%</item>
-    <item name="fracp01perc" type="dimen" format="fraction">.01%</item>
-    <item name="frac0perc" type="dimen" format="fraction">0%</item>
-    <item name="frac1p1perc" type="dimen" format="fraction">1.1%</item>
-    <item name="frac100p1perc" type="dimen" format="fraction">100.1%</item>
-    <item name="frac25510perc" type="dimen" format="fraction">25510%</item>
-    <item name="frac25610perc" type="dimen" format="fraction">25610%</item>
-    <item name="frac6553510perc" type="dimen" format="fraction">6553510%</item>
-    <item name="frac6553610perc" type="dimen" format="fraction">6553610%</item>
-
-    <item name="frac100pperc" type="dimen" format="fraction">100%p</item>
-    <item name="frac1pperc" type="dimen" format="fraction">1%p</item>
-    <item name="fracp1pperc" type="dimen" format="fraction">.1%p</item>
-    <item name="fracp01pperc" type="dimen" format="fraction">.01%p</item>
-    <item name="frac0pperc" type="dimen" format="fraction">0%p</item>
-    <item name="frac1p1pperc" type="dimen" format="fraction">1.1%p</item>
-    <item name="frac100p1pperc" type="dimen" format="fraction">100.1%p</item>
-    <item name="frac25510pperc" type="dimen" format="fraction">25510%p</item>
-    <item name="frac25610pperc" type="dimen" format="fraction">25610%p</item>
-    <item name="frac6553510pperc" type="dimen" format="fraction">6553510%p</item>
-    <item name="frac6553610pperc" type="dimen" format="fraction">6553610%p</item> 
-</resources>
-
diff --git a/proprietary/frameworks/base/tests/ANR/res/values/ids.xml b/proprietary/frameworks/base/tests/ANR/res/values/ids.xml
deleted file mode 100755
index 30e081bba1abd91047309468967566e4bea86046..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values/ids.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-  <item type="id" name="background" />
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values/resources_test.xml b/proprietary/frameworks/base/tests/ANR/res/values/resources_test.xml
deleted file mode 100755
index 91c2c4aa92dd75ce738e5b954bdb84d25de83d45..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values/resources_test.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-     <!-- The width that is used when creating thumbnails of applications. -->
-     <dimen name="thumbnail_width">84dp</dimen>
-     <!-- The height that is used when creating thumbnails of applications. -->
-     <dimen name="thumbnail_height">63dp</dimen>
-     <!-- The standard size (both width and height) of an application icon that
-          will be displayed in the app launcher and elsewhere. -->
-     <dimen name="app_icon_size">48px</dimen>
-     <dimen name="toast_y_offset">64dip</dimen>
-     <plurals name="plurals_test">
-        <item quantity="one">A dog</item>
-        <item quantity="other">Some dogs</item>
-      </plurals>
-     <color name="resource_test_color">#003B3B3B</color>
-     <integer name="resource_test_int">10</integer>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values/strings.xml b/proprietary/frameworks/base/tests/ANR/res/values/strings.xml
deleted file mode 100755
index a779b47adec563bd7938a72a65d040577a5528dd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values/strings.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permlab_testGranted">Test Granted</string>
-    <string name="permdesc_testGranted">Used for running CTS tests, for testing operations
-        where we have the permission.</string>
-    <string name="permlab_testDynamic">Test Dynamic</string>
-    <string name="permdesc_testDynamic">Used for running CTS tests, for testing adding
-        dynamic permissions.</string>
-    <string name="permlab_testDenied">Test Denied</string>
-    <string name="permdesc_testDenied">Used for running CTS tests, for testing operations
-        where we do not have the permission.</string>
-    <string name="explain">1. click start. \n2. if above image shaked, then press pass button,
-         else press failed button.</string>
-    <string name="text_view_hello">Hello! Text view!</string>
-    <string name="text_view_simple_hint">This is a hint.</string>
-    <string name="text_view_hint">This is a string for testing hint of textview.</string>
-    <string name="activity_forwarding">App/Forwarding</string>
-    <string name="forwarding">$$$</string>
-    <string name="go">Go</string>
-    <string name="back">Back</string>
-    <string name="forward_target">
-        Press back button and notice we don\'t see the previous activity.
-    </string>
-    <string name="edit_text">testing</string>
-    <string name="text">DialogTest</string>
-    <string name="text_country">Country</string>
-    <string name="text_name">Name</string>
-    <string name="dialog_stub_dialog_test_button1">Test Dialog without theme</string>
-    <string name="dialog_stub_dialog_test_button2">Test Dialog with theme</string>
-    <string name="dialog_stub_dialog_test_button3">Test AlertDialog</string>
-    <string name="dialog_stub_dialog_test_button4">Test AlertDialog with theme</string>
-    <string name="dialog_stub_dialog_test_button5">Test DatePickerDialog</string>
-    <string name="dialog_stub_dialog_test_button6">Test DatePickerDialog with theme</string>
-    <string name="dialog_stub_dialog_test_button7">Test TimePickerDialog</string>
-    <string name="dialog_stub_dialog_test_button8">Test TimePickerDialog with theme</string>
-    <string name="dialog_stub_dialog_test_button9">Test onStart() and onStop()</string>
-    <string name="dialog_stub_dialog_test_button10">Test AlertDialog deprecated</string>
-    <string name="dialog_stub_dialog_test_button11">Test AlertDialog callback</string>
-    <string name="dialog_stub_dialog_test_button12">Test AlertDialog setview </string>
-    <string name="dialog_stub_dialog_test_button13">Test AlertDialog deprecated with Message</string>
-    <string name="dialog_stub_dialog_test_button14">Test AlertDialog with theme</string>
-    <string name="dialog_stub_dialog_test_button15">Test AlertDialog cancelable</string>
-    <string name="dialog_stub_dialog_test_button16">Test AlertDialog can\'n cancelable</string>
-    <string name="dialog_stub_dialog_test_button17">Test Dialog cancelable</string>
-    <string name="dialog_stub_dialog_test_button18">Test Dialog not cancelable</string>
-    <string name="hello_world">Hello, World!</string>
-    <string name="hello_android">Hello, Android!</string>
-    <string name="alert_dialog_username">Name:</string>
-    <string name="alert_dialog_password">Password:</string>
-    <string name="alert_dialog_positive">Positive</string>
-    <string name="alert_dialog_negative">Negative</string>
-    <string name="alert_dialog_neutral">Neutral</string>
-    <string name="notify">Notify </string>
-    <string name="tabs_1">testing</string>
-    <string name="table_layout_first">first</string>
-    <string name="table_layout_second">second</string>
-    <string name="table_layout_third">third</string>
-    <string name="table_layout_long">Very long to make the string out of the screen</string>
-    <string name="chronometer_text">Test Chronometer</string>
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
-    <string name="viewgroup_test">ViewGroup test</string>
-    <string name="viewanimator_test">ViewAnimator test</string>
-    <string name="id_ok">OK</string>
-    <string name="id_cancel">Cancel</string>
-    <string name="context_test_string1">This is %s string.</string>
-    <string name="context_test_string2">This is test string.</string>
-    <string name="animationutils_test_instructions">Choose different animations</string>
-    <string name="animationutils_test_alpha">Alpha animation</string>
-    <string name="animationutils_test_scale">Scale animation</string>
-    <string name="animationutils_test_rotate">Rotate animation</string>
-    <string name="animationutils_test_translate">Translate animation</string>
-    <string name="animationutils_test_set">Animation set</string>
-    <string name="animationutils_test_layout">Layout animation</string>
-    <string name="animationutils_test_gridlayout">Grid layout animation</string>
-    <string name="twolinelistitem_test_text1">text1</string>
-    <string name="twolinelistitem_test_text2">text2</string>
-    <string name="metadata_text">metadata text</string>
-    <string name="horizontal_text_1">horizontal 1</string>
-    <string name="horizontal_text_2">horizontal 2</string>
-    <string name="horizontal_text_3">horizontal 3</string>
-    <string name="vertical_text_1">vertical 1</string>
-    <string name="vertical_text_2">vertical 2</string>
-    <string name="vertical_text_3">vertical 3</string>
-    <string name="reference">here</string>
-    <string name="coerceIntegerToString">100</string>
-    <string name="coerceBooleanToString">true</string>
-    <string name="coerceColorToString">#fff</string>
-    <string name="coerceFloatToString">100.0</string>
-    <string name="coerceDimensionToString">100px</string>
-    <string name="coerceFractionToString">100<xliff:g id="percent">%</xliff:g></string>
-    <string name="formattedStringNone">Format[]</string>
-    <string name="formattedStringOne">Format[<xliff:g id="format">%d</xliff:g>]</string>
-    <string name="formattedStringTwo">Format[<xliff:g id="format">%3$d,%2$s</xliff:g>]</string>
-    <string name="checkboxpref_key">checkboxpref_key</string>
-   <string name="checkboxpref_title">title of preference</string>
-   <string name="checkboxpref_summary">summary of preference</string>
-   <string name="checkboxpref_summary_on">summary on of preference</string>
-   <string name="checkboxpref_summary_off">summary off of preference</string>
-   <string name="checkboxpref_depend">checkboxpref_depend</string>
-   <string name="checkboxpref_depend_title"> depend title of preference</string>
-   <string name="checkboxpref_depend_summary"> depend summary of preference</string>
-   <string name="edittextpref_key">edittextpref_key</string>
-   <string name="edittextpref_default_value">default value of preference</string>
-   <string name="edittextpref_title">title of edit text preference</string>
-   <string name="edittextpref_summary">summary of edit text preference</string>
-   <string name="edittextpref_dialog_title">dialog title of edit text preference</string>
-   <string name="edittextpref_text">text of  edit text preference</string>
-   <string name="listpref_key">listpref_key</string>
-   <string name="listpref_title">title of list preference</string>
-   <string name="listpref_summary">summary of list preference</string>
-   <string name="listpref_dialogtitle">dialog title of list preference</string>
-   <string name="easy">Easy</string>
-   <string name="medium">Medium</string>
-   <string name="hard">Hard</string>
-   <string name="footer_view">Footer view</string>
-   <string name="header_view">Header view</string>
-   <string name="dialogpref_title">title of dialog preference </string>
-   <string name="dialogpref_dialog_title">dialog title of dialog preference </string>
-   <string name="dialogpref_key">dialogpref_key</string>
-   <string name="dialogpref_default_value">default value of dialog preference</string>
-   <string name="dialogpref_summary">summary of dialog preference</string>
-   <string name="dialogpref_message">message of dialog preference</string>
-   <string name="dialogpref_sure">Sure</string>
-   <string name="dialogpref_cancel">Cancel</string>
-   <string name="pref_key">pref_key</string>
-   <string name="pref_title">title of preference</string>
-   <string name="pref_summary">summary of preference</string>
-   <string name="pref_depend_key">pref_depend_key</string>
-   <string name="pref_depend_title"> depend title of preference</string>
-   <string name="pref_depend_summary"> depend summary of preference</string>
-   <string name="android_intent_action_preference">android.intent.action.PREFERENCE</string>
-   <string name="def_pref_key">def_pref_key</string>
-   <string name="def_pref_title">default preference</string>
-   <string name="def_pref_summary">This is default preference of cts</string>
-   <string name="relative_view1">view 1</string>
-   <string name="relative_view2">view 2</string>
-   <string name="relative_view3">view 3</string>
-   <string name="relative_view4">view 4</string>
-   <string name="relative_view5">view 5</string>
-   <string name="relative_view6">view 6</string>
-   <string name="relative_view7">view 7</string>
-   <string name="relative_view8">view 8</string>
-   <string name="relative_view9">view 9</string>
-   <string name="relative_view10">view 10</string>
-   <string name="relative_view11">view 11</string>
-   <string name="relative_view12">view 12</string>
-   <string name="relative_view13">view 13</string>
-   <string name="country">Country:</string>
-   <string name="symbol">Symbol:</string>
-   <string name="country_warning">No such country registered</string>
-   <string name="version_cur">base</string>
-   <string name="version_old">base</string>
-   <string name="version_v3">base</string>
-   <string name="authenticator_label">Android CTS</string>
-   <string name="search_label">Android CTS</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/ANR/res/values/styles.xml b/proprietary/frameworks/base/tests/ANR/res/values/styles.xml
deleted file mode 100755
index 8e9c8306e63faac137017d781802e80b66b2218c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/values/styles.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources>
-
-    <style name="AppTheme" parent="android:Theme.Light" />
-
-</resources>
-
diff --git a/proprietary/frameworks/base/tests/ANR/res/xml/metadata.xml b/proprietary/frameworks/base/tests/ANR/res/xml/metadata.xml
deleted file mode 100755
index 336b931db7c918b373355f4e0e40005388885b27..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/res/xml/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<thedata xmlns:android="http://schemas.android.com/apk/res/android"
-    rawText="some raw text"
-    rawColor="#ffffff00"
-    android:color="#f00"
-    android:text="@string/metadata_text"/>
diff --git a/proprietary/frameworks/base/tests/ANR/src/mediatek/app/cts/MockANRActivity.java b/proprietary/frameworks/base/tests/ANR/src/mediatek/app/cts/MockANRActivity.java
deleted file mode 100755
index 6286150b2118a882f6d2d01be25cb7349b1bd855..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/src/mediatek/app/cts/MockANRActivity.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.app.cts;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.TextView;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.view.WindowManager;
-
-public class MockANRActivity extends Activity {
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        TextView textView = new TextView(this);
-        textView.setText("ANR Test");
-        setContentView(textView);
-
-        showBadDialog();
-    }
-
-    public void showBadDialog()
-    {
-        AlertDialog dialog = new AlertDialog.Builder(getApplicationContext())
-        .setIconAttribute(android.R.attr.alertDialogIcon)
-        .setTitle("TestANR")
-        .setMessage("TestANR")
-        .setPositiveButton("OK", new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int whichButton) {
-                try {
-                    Thread.sleep(20 * 1000);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        })
-        .create();
-        // permission settings required in AndroidManefest.xml
-        dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
-        dialog.show();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/ANR/src/mediatek/app/cts/MockANRReceiver.java b/proprietary/frameworks/base/tests/ANR/src/mediatek/app/cts/MockANRReceiver.java
deleted file mode 100755
index 61c148f78a5b7edc766115f4103de2adc91b2d5e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/src/mediatek/app/cts/MockANRReceiver.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.app.cts;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.util.Log;
-
-public class MockANRReceiver extends BroadcastReceiver {
-
-    // PendingIntent may return same instance or new instance, so static variable is needed.
-    public static final String MOCKACTION = "android.content.cts.ANR.BROADCAST_MOCKTEST";
-
-    /**
-     * set the result as true when received alarm
-     */
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        Log.d("MockANRReceiver", "onReceive");
-
-        try {
-            Thread.sleep(90 * 1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/ANR/tests/Android.mk_ b/proprietary/frameworks/base/tests/ANR/tests/Android.mk_
deleted file mode 100755
index dea2987c59923ab65a829b2c15be709785dc998a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/tests/Android.mk_
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := tests
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-LOCAL_STATIC_JAVA_LIBRARIES := robotium-solo-for-ANR-tests
-# Link to ANRManager directly without proguard on test case
-LOCAL_STATIC_JAVA_LIBRARIES += anrmanager
-LOCAL_PROGUARD_ENABLED := disabled
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MediaTekCtsAnrTestCases
-
-LOCAL_INSTRUMENTATION_FOR := MediatekAnrTestStubs
-
-include $(BUILD_PACKAGE)
-
-##################################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := eng
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
-					robotium-solo-for-ANR-tests:libs/robotium-solo-3.6.jar
-include $(BUILD_MULTI_PREBUILT)
diff --git a/proprietary/frameworks/base/tests/ANR/tests/AndroidManifest.xml b/proprietary/frameworks/base/tests/ANR/tests/AndroidManifest.xml
deleted file mode 100755
index 640c22778fe9e44dc1c782bd74f9d9ec87411bd1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/tests/AndroidManifest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mediatek.cts.anr">
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation android:name="android.test.InstrumentationCtsTestRunner"
-                     android:targetPackage="com.mediatek.cts.anr.stub"
-                     android:label="Test for Mediatek ANR tools"/>
-
-</manifest>
-
diff --git a/proprietary/frameworks/base/tests/ANR/tests/NOTICE b/proprietary/frameworks/base/tests/ANR/tests/NOTICE
deleted file mode 100755
index 2056235fb9e40327f09830d67110d494d4b64665..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/tests/NOTICE
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-* Copyright (C) 2011-2014 MediaTek Inc.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-:
- 
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/ANR/tests/README b/proprietary/frameworks/base/tests/ANR/tests/README
deleted file mode 100755
index 37166d8c364b56f7f568def3eadb45914f36d956..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/tests/README
+++ /dev/null
@@ -1,18 +0,0 @@
-This is ANR manager proguard test apk.
-
-WHAT IT DOES?
-=============
-The purpose of this apk is to test if ANRManager.java is proguard or not.
-
-HOW IT WAS BUILT?
-==================
-mmm vendor/mediatek/frameworks/base/tests/ANR/
-mmm vendor/mediatek/frameworks/base/tests/ANR/tests/
-
-HOW TO USE IT?
-==============
-adb install -r MediatekAnrTestStubs.apk
-adb install -r MediaTekCtsAnrTestCases.apk
-adb shell am instrument -w -e class mediatek.app.cts.ANRManagerProGuardTest com.mediatek.cts.anr/android.test.InstrumentationCtsTestRunner 
-
-The majority of source code for this library were written by MediaTek.
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/ANR/tests/libs/robotium-solo-3.3.jar b/proprietary/frameworks/base/tests/ANR/tests/libs/robotium-solo-3.3.jar
deleted file mode 100755
index 0fd9421101ed0dc10a00a2b85c4b0811abd2bd2a..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/ANR/tests/libs/robotium-solo-3.3.jar and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/ANR/tests/libs/robotium-solo-3.6.jar b/proprietary/frameworks/base/tests/ANR/tests/libs/robotium-solo-3.6.jar
deleted file mode 100755
index 4280906d17cb2e2980074f3456de1098771370dc..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/ANR/tests/libs/robotium-solo-3.6.jar and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/ANR/tests/src/mediatek/app/cts/ANRManagerProGuardTest.java b/proprietary/frameworks/base/tests/ANR/tests/src/mediatek/app/cts/ANRManagerProGuardTest.java
deleted file mode 100755
index 66129eba3a90e66def3c3d3510697ae0367a758b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/tests/src/mediatek/app/cts/ANRManagerProGuardTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Build MediaTekCtsAnrTestCases.apk & MediatekAnrTestStubs.apk
- * ./mk mt6582_phone_qhd mm mediatek/frameworks/base/tests/ANR/tests/
- * ./mk mt6582_phone_qhd mm mediatek/frameworks/base/tests/ANR/
- * Execute
- * adb shell am instrument -w -e class mediatek.app.cts.ANRManagerProGuardTest com.mediatek.cts.anr/android.test.InstrumentationCtsTestRunner
- */
-
-package mediatek.app.cts;
-
-import android.test.AndroidTestCase;
-import android.util.Log;
-import java.lang.reflect.Method;
-
-//Target Package ANRManager
-import com.mediatek.anrmanager.ANRManager;
-
-public class ANRManagerProGuardTest extends AndroidTestCase {
-    private static final String TAG = "ANRManagerProGuardTest";
-    private boolean ANRManagerObjNameObfuscated = true;
-    private boolean ANRManagerAMethodName = false;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        Log.i(TAG, " Setup ProGuard Test Case ");
-
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        Log.i(TAG, " TearDown ProGuard Test Case ");
-    }
-
-  public void testANRManagerProGuard() throws Throwable {
-
-      Log.i(TAG, " testANRManagerProGuard ");
-
-      ANRManager checkClass = new ANRManager(null, 0, null);
-      Method[] methods = checkClass.getClass().getDeclaredMethods();
-
-      for (Method checkMethodName : methods) {
-          Log.i(TAG, "ANRManager checkMethodName = " + checkMethodName.getName());
-          if (ANRManagerObjNameObfuscated && checkMethodName.getName().equals("preDumpStackTraces")
-            && (checkMethodName.getParameterTypes().length == 2)) {
-            ANRManagerObjNameObfuscated = false;
-          }
-          if (!ANRManagerAMethodName && checkMethodName.getName().equals("a")) {
-            ANRManagerAMethodName = true;
-          }
-      }
-
-      Log.i(TAG, "ANRManager checkMethodName = preDumpStackTraces is obfusted : " + ANRManagerObjNameObfuscated);
-      Log.i(TAG, "ANRManager checkMethodName = a is                           : " + ANRManagerAMethodName);
-      assertTrue("ANRManager object name is not obfuscated", (ANRManagerObjNameObfuscated & ANRManagerAMethodName));
-
-  }
-
-}
-
diff --git a/proprietary/frameworks/base/tests/ANR/tests/src/mediatek/app/cts/ANRTest.java b/proprietary/frameworks/base/tests/ANR/tests/src/mediatek/app/cts/ANRTest.java
deleted file mode 100755
index f6c4fb9da25b83e580cd140340f917c79e2f91c6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/ANR/tests/src/mediatek/app/cts/ANRTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package mediatek.app.cts;
-
-import android.os.SystemClock;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.InputDevice;
-import android.view.KeyEvent;
-import android.hardware.input.InputManager;
-import android.content.Intent;
-import android.view.MotionEvent;
-
-import com.jayway.android.robotium.solo.Solo;
-
-public class ANRTest extends ActivityInstrumentationTestCase2<MockANRActivity> {
-    private Solo solo;
-
-    public ANRTest() {
-        super(MockANRActivity.class);
-    }
-
-    private void sendKey(KeyEvent event)
-    {
-        long downTime = event.getDownTime();
-        long eventTime = event.getEventTime();
-        int action = event.getAction();
-        int code = event.getKeyCode();
-        int repeatCount = event.getRepeatCount();
-        int metaState = event.getMetaState();
-        int deviceId = event.getDeviceId();
-        int scancode = event.getScanCode();
-        int source = event.getSource();
-        int flags = event.getFlags();
-        if (source == InputDevice.SOURCE_UNKNOWN) {
-            source = InputDevice.SOURCE_KEYBOARD;
-        }
-        if (eventTime == 0) {
-            eventTime = SystemClock.uptimeMillis();
-        }
-        if (downTime == 0) {
-            downTime = eventTime;
-        }
-        KeyEvent newEvent = new KeyEvent(downTime, eventTime, action, code, repeatCount, metaState,
-                deviceId, scancode, flags | KeyEvent.FLAG_FROM_SYSTEM, source);
-        InputManager.getInstance().injectInputEvent(newEvent,
-                InputManager.INJECT_INPUT_EVENT_MODE_ASYNC);
-
-    }
-
-    MockANRActivity mActivity;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        solo = new Solo(getInstrumentation(), getActivity());
-        mActivity = getActivity();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        //Robotium will finish all the activities that have been opened
-        solo.finishOpenedActivities();
-        super.tearDown();
-    }
-
-    public void testWNR() throws Exception {
-        getInstrumentation().waitForIdleSync();
-
-        solo.clickOnText("OK");
-
-        // first key event, but not wait for finish
-        sendKey(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK));
-        // second key event to trigger ANR
-        sendKey(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK));
-    }
-
-    private void sendMotionEvent(int x, int y, int action)
-    {
-        long downTime = SystemClock.uptimeMillis();
-        long eventTime = SystemClock.uptimeMillis();
-
-        MotionEvent event = MotionEvent.obtain(downTime, eventTime, action, x, y, 0);
-        getInstrumentation().sendPointerSync(event);
-    }
-
-    public void testBroadcastANR() throws Exception {
-        getInstrumentation().waitForIdleSync();
-
-        Intent intent = new Intent();
-
-        intent.setAction("android.content.cts.ANR.BROADCAST_MOCKTEST");
-        getInstrumentation().getContext().sendBroadcast(intent);
-
-        solo.sleep(80 * 1000);
-
-        // send event to another process will cause exception
-
-        // Display display = mActivity.getWindowManager().getDefaultDisplay();
-        // Point size = new Point();
-        // display.getSize(size);
-
-        // for 480 x 800 screen
-        // int y = 540;
-        // int x = 150;
-
-        // sendMotionEvent(x, y, MotionEvent.ACTION_DOWN);
-        // sendMotionEvent(x, y, MotionEvent.ACTION_UP);
-
-        // solo.sleep(1000);
-
-        // sendMotionEvent(x, y, MotionEvent.ACTION_DOWN);
-        // sendMotionEvent(x, y, MotionEvent.ACTION_UP);
-
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/AlarmManager/tests/Android.mk b/proprietary/frameworks/base/tests/AlarmManager/tests/Android.mk
deleted file mode 100755
index 5c320262b37635f90a08395af6edeaa563413430..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/AlarmManager/tests/Android.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := optional
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MediaTekAlarmManagerTestCases
-
-#LOCAL_INSTRUMENTATION_FOR := framework
-
-include $(BUILD_CTS_PACKAGE)
diff --git a/proprietary/frameworks/base/tests/AlarmManager/tests/Android.mk_ b/proprietary/frameworks/base/tests/AlarmManager/tests/Android.mk_
deleted file mode 100755
index 5c320262b37635f90a08395af6edeaa563413430..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/AlarmManager/tests/Android.mk_
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := optional
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MediaTekAlarmManagerTestCases
-
-#LOCAL_INSTRUMENTATION_FOR := framework
-
-include $(BUILD_CTS_PACKAGE)
diff --git a/proprietary/frameworks/base/tests/AlarmManager/tests/AndroidManifest.xml b/proprietary/frameworks/base/tests/AlarmManager/tests/AndroidManifest.xml
deleted file mode 100755
index da4b3aa6c9403e0ffd2740c7ee1c468e656687f9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/AlarmManager/tests/AndroidManifest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mediatek.alarmManager.test">
-    
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.mediatek.alarmManager.test"
-                     android:label="testcase  for  alarmManager"/>
-
-</manifest>
-
diff --git a/proprietary/frameworks/base/tests/AlarmManager/tests/README b/proprietary/frameworks/base/tests/AlarmManager/tests/README
deleted file mode 100755
index 189779defbf6d07112e64622a4c5457093164379..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/AlarmManager/tests/README
+++ /dev/null
@@ -1 +0,0 @@
-this is a test apk for AlarmManager setAlarm , cancelAlarm, setRepeating
diff --git a/proprietary/frameworks/base/tests/AlarmManager/tests/src/mediatek/alarmManager/test/AlarmManagerTest.java b/proprietary/frameworks/base/tests/AlarmManager/tests/src/mediatek/alarmManager/test/AlarmManagerTest.java
deleted file mode 100755
index b256fd4bd9f8ec34bdbd0862e4b7eabbd873fa05..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/AlarmManager/tests/src/mediatek/alarmManager/test/AlarmManagerTest.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.alarmManager.test;
-
-
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.SystemClock;
-import android.test.AndroidTestCase;
-import java.io.IOException;
-import android.util.Slog;
-
-public class AlarmManagerTest extends AndroidTestCase {
-    private AlarmManager mAlarmManager;
-    private Intent mIntent;
-    private PendingIntent mSender;
-    private Intent mServiceIntent;
-    private static final String TAG = "AlarmManagerServiceTest";
-    /*
-     *  The default snooze delay: 5 seconds
-     */
-    private final long SNOOZE_DELAY = 5 * 1000L;
-    private long mWakeupTime;
-    private MockAlarmReceiver mMockAlarmReceiver;
-
-    private final int TIME_DELTA = 200;
-    private final int TIME_DELAY = 2000;
-
-    class Sync {
-        public boolean mIsConnected;
-        public boolean mIsDisConnected;
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mAlarmManager = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE);
-        mIntent = new Intent(MockAlarmReceiver.MOCKACTION);
-        mSender = PendingIntent.getBroadcast(mContext, 0, mIntent, 0);
-        mMockAlarmReceiver = new MockAlarmReceiver();
-        IntentFilter filter = new IntentFilter(MockAlarmReceiver.MOCKACTION);
-        mContext.registerReceiver(mMockAlarmReceiver, filter);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        if (mServiceIntent != null) {
-            mContext.stopService(mServiceIntent);
-        }
-    }
-
-    public void testSetTypes() throws Exception {
-        // TODO: try to find a way to make device sleep then test whether
-        // AlarmManager perform the expected way
-
-        // test parameter type is RTC_WAKEUP
-        mMockAlarmReceiver.setAlarmedFalse();
-        mWakeupTime = System.currentTimeMillis() + SNOOZE_DELAY;
-        mAlarmManager.set(AlarmManager.RTC_WAKEUP, mWakeupTime, mSender);
-        // test parameter type is PowerOffAlarm
-        mAlarmManager.set(7, mWakeupTime, mSender);
-        mAlarmManager.cancelPoweroffAlarm("com.android.deskclock");
-        // test parameter type is RTC
-        Thread.sleep(SNOOZE_DELAY + TIME_DELAY);
-        assertTrue(mMockAlarmReceiver.alarmed);
-        assertEquals(mMockAlarmReceiver.rtcTime, mWakeupTime, TIME_DELTA);
-
-        mMockAlarmReceiver.setAlarmedFalse();
-        mWakeupTime = System.currentTimeMillis() + SNOOZE_DELAY;
-        mAlarmManager.set(AlarmManager.RTC, mWakeupTime, mSender);
-        Thread.sleep(SNOOZE_DELAY + TIME_DELAY);
-        assertTrue(mMockAlarmReceiver.alarmed);
-        assertEquals(mMockAlarmReceiver.rtcTime, mWakeupTime, TIME_DELTA);
-
-        // test parameter type is ELAPSED_REALTIME
-        mMockAlarmReceiver.setAlarmedFalse();
-        mWakeupTime = SystemClock.elapsedRealtime() + SNOOZE_DELAY;
-        mAlarmManager.set(AlarmManager.ELAPSED_REALTIME, mWakeupTime, mSender);
-        Thread.sleep(SNOOZE_DELAY + TIME_DELAY);
-        assertTrue(mMockAlarmReceiver.alarmed);
-        assertEquals(mMockAlarmReceiver.elapsedTime, mWakeupTime, TIME_DELTA);
-
-        // test parameter type is ELAPSED_REALTIME_WAKEUP
-        mMockAlarmReceiver.setAlarmedFalse();
-        mWakeupTime = SystemClock.elapsedRealtime() + SNOOZE_DELAY;
-        mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, mWakeupTime, mSender);
-        Thread.sleep(SNOOZE_DELAY + TIME_DELAY);
-        assertTrue(mMockAlarmReceiver.alarmed);
-        assertEquals(mMockAlarmReceiver.elapsedTime, mWakeupTime, TIME_DELTA);
-    }
-
-    public void testAlarmTriggersImmediatelyIfSetTimeIsNegative() throws Exception {
-        // An alarm with a negative wakeup time should be triggered immediately.
-        // This exercises a workaround for a limitation of the /dev/alarm driver
-        // that would instead cause such alarms to never be triggered.
-        mMockAlarmReceiver.setAlarmedFalse();
-        mWakeupTime = -1000;
-        mAlarmManager.set(AlarmManager.RTC, mWakeupTime, mSender);
-        Thread.sleep(TIME_DELAY);
-        assertTrue(mMockAlarmReceiver.alarmed);
-    }
-
-    public void testSetRepeating() throws Exception {
-        mMockAlarmReceiver.setAlarmedFalse();
-        mWakeupTime = System.currentTimeMillis() + SNOOZE_DELAY;
-        mAlarmManager.setRepeating(AlarmManager.RTC_WAKEUP, mWakeupTime, TIME_DELAY / 2, mSender);
-        Thread.sleep(SNOOZE_DELAY + TIME_DELAY);
-        assertTrue(mMockAlarmReceiver.alarmed);
-        mMockAlarmReceiver.setAlarmedFalse();
-        Thread.sleep(TIME_DELAY);
-        assertTrue(mMockAlarmReceiver.alarmed);
-        mAlarmManager.cancel(mSender);
-    }
-
-    public void testCancel() throws Exception {
-        mMockAlarmReceiver.setAlarmedFalse();
-        mWakeupTime = System.currentTimeMillis() + SNOOZE_DELAY;
-        mAlarmManager.setRepeating(AlarmManager.RTC_WAKEUP, mWakeupTime, 1000, mSender);
-        Thread.sleep(SNOOZE_DELAY + TIME_DELAY);
-        assertTrue(mMockAlarmReceiver.alarmed);
-        mMockAlarmReceiver.setAlarmedFalse();
-        Thread.sleep(TIME_DELAY);
-        assertTrue(mMockAlarmReceiver.alarmed);
-        mAlarmManager.cancel(mSender);
-        Thread.sleep(TIME_DELAY);
-        mMockAlarmReceiver.setAlarmedFalse();
-        Thread.sleep(TIME_DELAY * 5);
-        assertFalse(mMockAlarmReceiver.alarmed);
-    }
-
-    public void testSetInexactRepeating() throws Exception {
-
-        mAlarmManager.setInexactRepeating(AlarmManager.RTC_WAKEUP, System.currentTimeMillis(),
-                AlarmManager.INTERVAL_FIFTEEN_MINUTES, mSender);
-        SystemClock.setCurrentTimeMillis(System.currentTimeMillis()
-                + AlarmManager.INTERVAL_FIFTEEN_MINUTES);
-        // currently there is no way to write Android system clock. When try to
-        // write the system time, there will be log as
-        // " Unable to open alarm driver: Permission denied". But still fail
-        // after tried many permission.
-    }
-
-    public void testErrorHandleAndDM() throws Exception {
-
-       mAlarmManager.set(7, 0, mSender);
-       try {
-            Runtime.getRuntime().exec("dumpsys alarm");
-        } catch (IOException e) {
-            Slog.e(TAG, "dumpsys " + e);
-        }
-       try {
-            Runtime.getRuntime().exec("am broadcast -a com.mediatek.dm.LAWMO_UNLOCK");
-       } catch (IOException e) {
-            Slog.e(TAG, "am broadcast " + e);
-       }
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/AlarmManager/tests/src/mediatek/alarmManager/test/MockAlarmReceiver.java b/proprietary/frameworks/base/tests/AlarmManager/tests/src/mediatek/alarmManager/test/MockAlarmReceiver.java
deleted file mode 100755
index b0c39a4535fffa1da798c2cdfef63ba44df44f91..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/AlarmManager/tests/src/mediatek/alarmManager/test/MockAlarmReceiver.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.alarmManager.test;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.SystemClock;
-
-/**
- * this class  receive alarm from AlarmManagerTest
- */
-public class MockAlarmReceiver extends BroadcastReceiver {
-    public boolean alarmed = false;
-    private Object mSync = new Object();
-    public static final String MOCKACTION = "android.app.AlarmManagerTest.TEST_ALARMRECEIVER";
-
-    public long elapsedTime;
-    public long rtcTime;
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        final String action = intent.getAction();
-        if (action.equals(MOCKACTION)) {
-            synchronized (mSync) {
-                alarmed = true;
-                elapsedTime = SystemClock.elapsedRealtime();
-                rtcTime = System.currentTimeMillis();
-            }
-        }
-    }
-
-    public void setAlarmedFalse() {
-        synchronized (mSync) {
-            alarmed = false;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/MountService/Android.mk b/proprietary/frameworks/base/tests/MountService/Android.mk
deleted file mode 100755
index a15bbc70046d0f3d3d12a4bbb660ad85cb500193..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/MountService/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := tests
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner \
-                        mediatek-framework
-LOCAL_STATIC_JAVA_LIBRARIES := junit-report
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MediaTekMountServiceTestCase
-LOCAL_CERTIFICATE := platform
-
-# uncomment when dalvik.annotation.Test* are removed or part of SDK
-#LOCAL_SDK_VERSION := current
-
-include $(BUILD_PACKAGE)
-
-# Build the test APK using its own makefile, and any other CTS-related packages
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
diff --git a/proprietary/frameworks/base/tests/MountService/Android.mk_ b/proprietary/frameworks/base/tests/MountService/Android.mk_
deleted file mode 100755
index a15bbc70046d0f3d3d12a4bbb660ad85cb500193..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/MountService/Android.mk_
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := tests
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner \
-                        mediatek-framework
-LOCAL_STATIC_JAVA_LIBRARIES := junit-report
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MediaTekMountServiceTestCase
-LOCAL_CERTIFICATE := platform
-
-# uncomment when dalvik.annotation.Test* are removed or part of SDK
-#LOCAL_SDK_VERSION := current
-
-include $(BUILD_PACKAGE)
-
-# Build the test APK using its own makefile, and any other CTS-related packages
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
diff --git a/proprietary/frameworks/base/tests/MountService/AndroidManifest.xml b/proprietary/frameworks/base/tests/MountService/AndroidManifest.xml
deleted file mode 100755
index 947e869e0d036e598ded148dc9906b9c29d3db18..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/MountService/AndroidManifest.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mediatek.cts.mountservice"
-    coreApp="true"
-    android:sharedUserId="android.uid.system">
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.mediatek.cts.mountservice"
-                     android:label="CTS tests of MountService"/>
-</manifest>
-
diff --git a/proprietary/frameworks/base/tests/MountService/README b/proprietary/frameworks/base/tests/MountService/README
deleted file mode 100755
index 482848fb107fedfb77f5465fbaeb8c57983a8558..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/MountService/README
+++ /dev/null
@@ -1,15 +0,0 @@
-WHAT IT DOES?
-=============
-This is a CTS test APK for MountService related testing.
-The moudle tag is tests.
-
-HOW IT WAS BUILT?
-==================
-[Build Method]
-make MediaTekMountServiceTestCase
-or
-mmm vendor/mediatek/proprietary/frameworks/base/tests/MountService
-
-HOW TO USE IT?
-==============
-adb shell am instrument -w com.mediatek.cts.MountService/android.test.InstrumentationTestRunner
diff --git a/proprietary/frameworks/base/tests/MountService/src/android/mount/cts/MountServiceTest.java b/proprietary/frameworks/base/tests/MountService/src/android/mount/cts/MountServiceTest.java
deleted file mode 100755
index bf9de9e2c71accbb1659a0c401b5d715e394609d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/MountService/src/android/mount/cts/MountServiceTest.java
+++ /dev/null
@@ -1,1316 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- * 
- * MediaTek Inc. (C) 2010. All rights reserved.
- * 
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.mount.cts;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.BroadcastReceiver;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.os.Environment;
-import android.os.IBinder;
-import android.os.Process;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.storage.IMountService;
-import android.os.storage.StorageManager;
-import android.os.storage.StorageVolume;
-import android.os.SystemProperties;
-import android.os.SystemClock;
-import android.test.InstrumentationTestCase;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.widget.Button;
-import android.net.Uri;
-
-
-import com.android.internal.R;
-
-import com.mediatek.storage.StorageManagerEx;
-
-import java.io.File;
-
-public class MountServiceTest extends InstrumentationTestCase {
-
-/*
-    /// M: javaopt_removal @{
-    private static final String PROP_SHARED_SDCARD = "ro.mtk_shared_sdcard";
-    private static final String PROP_2SDCARD_SWAP = "ro.mtk_2sdcard_swap";
-    /// @}
-
-    private static final String TAG = "MountServiceTest";
-    private static final String PATH_SD1 = (SystemProperties.get(PROP_SHARED_SDCARD).equals("1") && !SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")) ? "/storage/emulated/0" : "/storage/sdcard0";
-    private static final String PATH_SD2 = "/storage/sdcard1";
-    private static final String INTENT_SD_SWAP = "com.mediatek.SD_SWAP";
-    private IMountService mMountService = null;
-    private Context mContext = null;
-    private StorageManager mStorageManager = null;
-
-    private boolean mSD1Mounted = false;
-    private boolean mSD2Mounted = false;
-    private boolean mSD1Checking = false;
-    private boolean mSD2Checking = false;
-    private boolean mSD1Unmounted = false;
-    private boolean mSD2Unmounted = false;
-    private boolean mSD1Eject = false;
-    private boolean mSD2Eject = false;
-    private boolean mSD1Shared = false;
-    private boolean mSD2Shared = false;
-    private boolean mSD1Unshared = false;
-    private boolean mSD2Unshared = false;
-    private boolean mSDSwap = false;
-
-    private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            if (action == null) {
-                return;
-            }
-            if (action.equals(Intent.ACTION_MEDIA_MOUNTED)) {
-                Log.d(TAG, "mBroadcastReceiver ACTION_MEDIA_MOUNTED");
-            } else if (action.equals(Intent.ACTION_MEDIA_UNMOUNTED)) {
-                Log.d(TAG, "mBroadcastReceiver ACTION_MEDIA_UNMOUNTED");
-            } else if (action.equals(Intent.ACTION_MEDIA_SHARED)) {
-                Log.d(TAG, "mBroadcastReceiver ACTION_MEDIA_SHARED");
-            } else if (action.equals(Intent.ACTION_MEDIA_UNSHARED)) {
-                Log.d(TAG, "mBroadcastReceiver ACTION_MEDIA_UNSHARED");
-            } else if (action.equals(Intent.ACTION_MEDIA_EJECT)) {
-                Log.d(TAG, "mBroadcastReceiver ACTION_MEDIA_EJECT");
-            }
-        }
-    };
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        if (mContext == null) {
-            mContext = getInstrumentation().getTargetContext();
-        }
-
-        if (mStorageManager == null) {
-            mStorageManager = (StorageManager) mContext.getSystemService(Context.STORAGE_SERVICE);
-        }
-
-        IBinder service = ServiceManager.getService("mount");
-        if (service != null && mMountService == null) {
-            mMountService = IMountService.Stub.asInterface(service);
-            Log.d(TAG, "mountService is " + mMountService);
-            if (mMountService == null) {
-                Log.e(TAG, "mountService is null!");
-                fail("mountService is null!");
-            }
-        } else {
-            Log.e(TAG, "service is null!");
-            fail("service is null!");
-        }
-
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(Intent.ACTION_MEDIA_MOUNTED);
-        filter.addAction(Intent.ACTION_MEDIA_UNMOUNTED);
-        filter.addAction(Intent.ACTION_MEDIA_SHARED);
-        filter.addAction(Intent.ACTION_MEDIA_UNSHARED);
-        filter.addAction(Intent.ACTION_MEDIA_EJECT);
-        mContext.registerReceiver(mBroadcastReceiver, filter, null, null);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mContext.unregisterReceiver(mBroadcastReceiver);
-        super.tearDown();
-    }
-
-    public void testInitialState() {
-        StorageVolume[] volumes = mStorageManager.getVolumeList();
-        if (volumes == null) {
-            assertTrue(false);
-            return;
-        }
-        int len = volumes.length;
-        for (int i = 0; i < len; i++) {
-            StorageVolume volume = volumes[i];
-            if (i == 0) {
-                assertTrue(volume.getPath().equals(PATH_SD1));
-                if (!SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && !SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-                    assertTrue(volume.getDescriptionId() == R.string.storage_phone);
-                    assertTrue(!volume.isRemovable());
-                    assertTrue(!volume.isEmulated());
-                } else if (!SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-                    Log.d(TAG, "volume.getDescriptionId()=" + volume.getDescriptionId()
-                            + ", R.string.storage_internal=" + R.string.storage_internal);
-                    assertTrue(volume.getDescriptionId() == R.string.storage_phone);
-                    assertTrue(!volume.isRemovable());
-                    assertTrue(volume.isEmulated());
-                } else if (SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && !SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-                    assertTrue(volume.getDescriptionId() == R.string.storage_sd_card);
-                    assertTrue(volume.isRemovable());
-                    assertTrue(!volume.isEmulated());
-                } else if (SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-                    assertTrue(volume.getDescriptionId() == R.string.storage_sd_card);
-                    assertTrue(volume.isRemovable());
-                    assertTrue(!volume.isEmulated());
-                }
-            } else if (i == 1) {
-                assertTrue(volume.getPath().equals(PATH_SD2));
-                if (!SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && !SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-                    assertTrue(volume.getDescriptionId() == R.string.storage_sd_card);
-                    assertTrue(volume.isRemovable());
-                    assertTrue(!volume.isEmulated());
-                } else if (!SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-                    assertTrue(volume.getDescriptionId() == R.string.storage_sd_card);
-                    assertTrue(volume.isRemovable());
-                    assertTrue(!volume.isEmulated());
-                } else if (SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && !SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-                    assertTrue(volume.getDescriptionId() == R.string.storage_phone);
-                    assertTrue(!volume.isRemovable());
-                    assertTrue(!volume.isEmulated());
-                } else if (SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-                    assertTrue(volume.getDescriptionId() == R.string.storage_internal);
-                    assertTrue(!volume.isRemovable());
-                    assertTrue(volume.isEmulated());
-                }
-            } else {
-                break;
-            }
-        }
-    }
-
-    public void testDefaultPath() {
-        waitForAllStorageMounted();
-        StorageManagerEx.setDefaultPath(PATH_SD1);
-        SystemClock.sleep(1000);
-        String defaultPath = StorageManagerEx.getDefaultPath();
-        assertTrue(PATH_SD1.equals(defaultPath));
-
-        if (!SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && !SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            //unmount SD1
-            try {
-                mMountService.unmountVolume(PATH_SD1, true, false);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD1, Environment.MEDIA_UNMOUNTED);
-            defaultPath = StorageManagerEx.getDefaultPath();
-            assertTrue(PATH_SD2.equals(defaultPath));
-
-            //mount SD1
-            try {
-                mMountService.mountVolume(PATH_SD1);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED);
-            defaultPath = StorageManagerEx.getDefaultPath();
-            assertTrue(PATH_SD2.equals(defaultPath));
-
-            //turn on/off UMS
-            try {
-                mMountService.setUsbMassStorageEnabled(true);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD1, Environment.MEDIA_SHARED);
-            waitForStorageState(PATH_SD2, Environment.MEDIA_SHARED);
-            defaultPath = StorageManagerEx.getDefaultPath();
-            assertTrue(PATH_SD2.equals(defaultPath));
-
-            try {
-                mMountService.setUsbMassStorageEnabled(false);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED);
-            waitForStorageState(PATH_SD2, Environment.MEDIA_MOUNTED);
-            defaultPath = StorageManagerEx.getDefaultPath();
-            assertTrue(PATH_SD2.equals(defaultPath));
-        } else if (!SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            StorageManagerEx.setDefaultPath(PATH_SD2);
-            //unmount SD2
-            try {
-                mMountService.unmountVolume(PATH_SD2, true, false);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD2, Environment.MEDIA_UNMOUNTED);
-            defaultPath = StorageManagerEx.getDefaultPath();
-            assertTrue(PATH_SD1.equals(defaultPath));
-
-            //mount SD2
-            try {
-                mMountService.mountVolume(PATH_SD2);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD2, Environment.MEDIA_MOUNTED);
-            defaultPath = StorageManagerEx.getDefaultPath();
-            assertTrue(PATH_SD1.equals(defaultPath));
-
-            StorageManagerEx.setDefaultPath(PATH_SD2);
-            //turn on/off UMS
-            try {
-                mMountService.setUsbMassStorageEnabled(true);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD1, Environment.MEDIA_SHARED);
-            waitForStorageState(PATH_SD2, Environment.MEDIA_SHARED);
-            defaultPath = StorageManagerEx.getDefaultPath();
-            assertTrue(PATH_SD2.equals(defaultPath));
-            try {
-                mMountService.setUsbMassStorageEnabled(false);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED);
-            waitForStorageState(PATH_SD2, Environment.MEDIA_MOUNTED);
-            defaultPath = StorageManagerEx.getDefaultPath();
-            assertTrue(PATH_SD2.equals(defaultPath));
-        } else if (SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && !SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            StorageManagerEx.setDefaultPath(PATH_SD2);
-            //unmount SD1
-            try {
-                mMountService.unmountVolume(PATH_SD1, true, false);
-            } catch (RemoteException e) {
-            }
-            SystemClock.sleep(5000);
-            waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED);
-            waitForStorageState(PATH_SD2, Environment.MEDIA_UNMOUNTED);
-            defaultPath = StorageManagerEx.getDefaultPath();
-            assertTrue(PATH_SD1.equals(defaultPath));
-
-            //mount SD2
-            try {
-                mMountService.mountVolume(PATH_SD2);
-            } catch (RemoteException e) {
-            }
-            SystemClock.sleep(5000);
-            waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED);
-            waitForStorageState(PATH_SD2, Environment.MEDIA_MOUNTED);
-            defaultPath = StorageManagerEx.getDefaultPath();
-            assertTrue(PATH_SD2.equals(defaultPath));
-
-            //turn on/off UMS
-            try {
-                mMountService.setUsbMassStorageEnabled(true);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD1, Environment.MEDIA_SHARED);
-            waitForStorageState(PATH_SD2, Environment.MEDIA_SHARED);
-            defaultPath = StorageManagerEx.getDefaultPath();
-            assertTrue(PATH_SD2.equals(defaultPath));
-
-            try {
-                mMountService.setUsbMassStorageEnabled(false);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED);
-            waitForStorageState(PATH_SD2, Environment.MEDIA_MOUNTED);
-            defaultPath = StorageManagerEx.getDefaultPath();
-            assertTrue(PATH_SD2.equals(defaultPath));
-        } else if (SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            StorageManagerEx.setDefaultPath(PATH_SD2);
-            //unmount SD1
-            try {
-                mMountService.unmountVolume(PATH_SD1, true, false);
-            } catch (RemoteException e) {
-            }
-            SystemClock.sleep(5000);
-            waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED);
-            waitForStorageState(PATH_SD2, Environment.MEDIA_UNMOUNTED);
-            defaultPath = StorageManagerEx.getDefaultPath();
-            assertTrue(PATH_SD1.equals(defaultPath));
-
-            //mount SD2
-            try {
-                mMountService.mountVolume(PATH_SD2);
-            } catch (RemoteException e) {
-            }
-            SystemClock.sleep(5000);
-            waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED);
-            waitForStorageState(PATH_SD2, Environment.MEDIA_MOUNTED);
-            defaultPath = StorageManagerEx.getDefaultPath();
-            assertTrue(PATH_SD2.equals(defaultPath));
-
-            //turn on/off UMS
-            try {
-                mMountService.setUsbMassStorageEnabled(true);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD2, Environment.MEDIA_SHARED);
-            defaultPath = StorageManagerEx.getDefaultPath();
-            assertTrue(PATH_SD1.equals(defaultPath));
-
-            try {
-                mMountService.setUsbMassStorageEnabled(false);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED);
-            waitForStorageState(PATH_SD2, Environment.MEDIA_MOUNTED);
-            defaultPath = StorageManagerEx.getDefaultPath();
-            assertTrue(PATH_SD2.equals(defaultPath));
-        }
-
-
-    }
-
-    public void testGetPrimaryVolume() {
-        waitForAllStorageMounted();
-        // because Environment.getPrimaryVolume() is private API
-        // so we test it indirectly
-        if (!SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && !SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            assertTrue(!Environment.isExternalStorageRemovable());
-            assertTrue(!Environment.isExternalStorageEmulated());
-        } else if (!SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            assertTrue(!Environment.isExternalStorageRemovable());
-            assertTrue(Environment.isExternalStorageEmulated());
-        } else if (SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && !SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            assertTrue(Environment.isExternalStorageRemovable());
-            assertTrue(!Environment.isExternalStorageEmulated());
-        } else if (SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            assertTrue(Environment.isExternalStorageRemovable());
-            assertTrue(!Environment.isExternalStorageEmulated());
-        }
-
-        if (!SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && !SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            //unmount SD2
-            try {
-                mMountService.unmountVolume(PATH_SD2, true, false);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD2, Environment.MEDIA_UNMOUNTED);
-            assertTrue(!Environment.isExternalStorageRemovable());
-            assertTrue(!Environment.isExternalStorageEmulated());
-        } else if (!SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            //unmount SD2
-            try {
-                mMountService.unmountVolume(PATH_SD2, true, false);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD2, Environment.MEDIA_UNMOUNTED);
-            assertTrue(!Environment.isExternalStorageRemovable());
-            assertTrue(Environment.isExternalStorageEmulated());
-        } else if (SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && !SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            //unmount SD1
-            try {
-                mMountService.unmountVolume(PATH_SD1, true, false);
-            } catch (RemoteException e) {
-            }
-            SystemClock.sleep(5000);
-            waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED);
-            waitForStorageState(PATH_SD2, Environment.MEDIA_UNMOUNTED);
-            assertTrue(Environment.isExternalStorageRemovable());
-            assertTrue(!Environment.isExternalStorageEmulated());
-        } else if (SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            //unmount SD1
-            try {
-                mMountService.unmountVolume(PATH_SD1, true, false);
-            } catch (RemoteException e) {
-            }
-            SystemClock.sleep(5000);
-            waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED);
-            waitForStorageState(PATH_SD2, Environment.MEDIA_UNMOUNTED);
-            assertTrue(!Environment.isExternalStorageRemovable());
-            assertTrue(Environment.isExternalStorageEmulated());
-        }
-    }
-
-    public void testExternalCacheDir() {
-        assertTrue(null == StorageManagerEx.getExternalCacheDir(null));
-
-        StorageManagerEx.setDefaultPath(PATH_SD1);
-        String path;
-        File file = StorageManagerEx.getExternalCacheDir("com.mediatek.cts.mountservice");
-        if(null != file) {
-            path = file.getPath();
-            assertTrue(path.contains(PATH_SD1));
-        }
-
-        StorageManagerEx.setDefaultPath(PATH_SD2);
-        file = StorageManagerEx.getExternalCacheDir("com.mediatek.cts.mountservice");
-        if(null != file) {
-            path = file.getPath();
-            assertTrue(path.contains(PATH_SD2));
-        }
-    }
-
-    public void testInternalExternalPath() {
-        waitForAllStorageMounted();
-        // we will check different flow in four cases
-        if (!SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && !SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            assertTrue(PATH_SD1.equals(StorageManagerEx.getInternalStoragePath()));
-            assertTrue(PATH_SD2.equals(StorageManagerEx.getExternalStoragePath()));
-
-            //unmount SD1
-            try {
-                mMountService.unmountVolume(PATH_SD1, true, false);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD1, Environment.MEDIA_UNMOUNTED);
-            //unmount SD2
-            try {
-                mMountService.unmountVolume(PATH_SD2, true, false);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD2, Environment.MEDIA_UNMOUNTED);
-            assertTrue(PATH_SD1.equals(StorageManagerEx.getInternalStoragePath()));
-            assertTrue(PATH_SD2.equals(StorageManagerEx.getExternalStoragePath()));
-
-            //mount SD1
-            try {
-                mMountService.mountVolume(PATH_SD1);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED);
-            //mount SD2
-            try {
-                mMountService.mountVolume(PATH_SD2);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD2, Environment.MEDIA_MOUNTED);
-            assertTrue(PATH_SD1.equals(StorageManagerEx.getInternalStoragePath()));
-            assertTrue(PATH_SD2.equals(StorageManagerEx.getExternalStoragePath()));
-
-            //turn on/off UMS
-            try {
-                mMountService.setUsbMassStorageEnabled(true);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD1, Environment.MEDIA_SHARED);
-            waitForStorageState(PATH_SD2, Environment.MEDIA_SHARED);
-            assertTrue(PATH_SD1.equals(StorageManagerEx.getInternalStoragePath()));
-            assertTrue(PATH_SD2.equals(StorageManagerEx.getExternalStoragePath()));
-            try {
-                mMountService.setUsbMassStorageEnabled(false);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED);
-            waitForStorageState(PATH_SD2, Environment.MEDIA_MOUNTED);
-            assertTrue(PATH_SD1.equals(StorageManagerEx.getInternalStoragePath()));
-            assertTrue(PATH_SD2.equals(StorageManagerEx.getExternalStoragePath()));
-        } else if (!SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            Log.d(TAG, "PATH_SD1=" + PATH_SD1
-                    + ", StorageManagerEx.getInternalStoragePath()=" + StorageManagerEx.getInternalStoragePath());
-
-            String PROP_SD_INTERNAL_PATH = "vold.path.internal_sd";
-            String STORAGE_PATH_SD1 = "/storage/sdcard0";
-            String path_sd1_changed_name="";
-            try {
-                path_sd1_changed_name = SystemProperties.get(PROP_SD_INTERNAL_PATH);
-                Log.i(TAG, "getInternalStoragePath from Property path=" + path_sd1_changed_name);
-            } catch (IllegalArgumentException e) {
-                Log.e(TAG, "IllegalArgumentException when getInternalStoragePath:" + e);
-            }
-            // only share sd and no swap, internal path is "/storage/emulated/0", need change
-            if (STORAGE_PATH_SD1.equals(path_sd1_changed_name)) {
-                if (Process.myUid() == Process.SYSTEM_UID) {
-                    path_sd1_changed_name = "/storage/emulated/"+Integer.toString(Process.SYSTEM_UID);
-                } else {
-                    path_sd1_changed_name = Environment.getExternalStorageDirectory().toString();
-                }
-            }
-
-            assertTrue(path_sd1_changed_name.equals(StorageManagerEx.getInternalStoragePath()));
-            assertTrue(PATH_SD2.equals(StorageManagerEx.getExternalStoragePath()));
-
-            //unmount SD2
-            try {
-                mMountService.unmountVolume(PATH_SD2, true, false);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD2, Environment.MEDIA_UNMOUNTED);
-            assertTrue(path_sd1_changed_name.equals(StorageManagerEx.getInternalStoragePath()));
-            assertTrue(PATH_SD2.equals(StorageManagerEx.getExternalStoragePath()));
-
-            //mount SD2
-            try {
-                mMountService.mountVolume(PATH_SD2);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD2, Environment.MEDIA_MOUNTED);
-            assertTrue(path_sd1_changed_name.equals(StorageManagerEx.getInternalStoragePath()));
-            assertTrue(PATH_SD2.equals(StorageManagerEx.getExternalStoragePath()));
-
-            //turn on/off UMS
-            try {
-                mMountService.setUsbMassStorageEnabled(true);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD2, Environment.MEDIA_SHARED);
-            assertTrue(path_sd1_changed_name.equals(StorageManagerEx.getInternalStoragePath()));
-            assertTrue(PATH_SD2.equals(StorageManagerEx.getExternalStoragePath()));
-            try {
-                mMountService.setUsbMassStorageEnabled(false);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD2, Environment.MEDIA_MOUNTED);
-            assertTrue(path_sd1_changed_name.equals(StorageManagerEx.getInternalStoragePath()));
-            assertTrue(PATH_SD2.equals(StorageManagerEx.getExternalStoragePath()));
-        } else if (SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && !SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            assertTrue(PATH_SD2.equals(StorageManagerEx.getInternalStoragePath()));
-            assertTrue(PATH_SD1.equals(StorageManagerEx.getExternalStoragePath()));
-
-            //unmount SD1
-            try {
-                mMountService.unmountVolume(PATH_SD1, true, false);
-            } catch (RemoteException e) {
-            }
-            SystemClock.sleep(5000);
-            waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED);
-            waitForStorageState(PATH_SD2, Environment.MEDIA_UNMOUNTED);
-            assertTrue(PATH_SD1.equals(StorageManagerEx.getInternalStoragePath()));
-            assertTrue(PATH_SD2.equals(StorageManagerEx.getExternalStoragePath()));
-
-            //mount SD2
-            try {
-                mMountService.mountVolume(PATH_SD2);
-            } catch (RemoteException e) {
-            }
-            SystemClock.sleep(5000);
-            waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED);
-            waitForStorageState(PATH_SD2, Environment.MEDIA_MOUNTED);
-            assertTrue(PATH_SD2.equals(StorageManagerEx.getInternalStoragePath()));
-            assertTrue(PATH_SD1.equals(StorageManagerEx.getExternalStoragePath()));
-
-            //turn on/off UMS
-            try {
-                mMountService.setUsbMassStorageEnabled(true);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD1, Environment.MEDIA_SHARED);
-            waitForStorageState(PATH_SD2, Environment.MEDIA_SHARED);
-            assertTrue(PATH_SD2.equals(StorageManagerEx.getInternalStoragePath()));
-            assertTrue(PATH_SD1.equals(StorageManagerEx.getExternalStoragePath()));
-            try {
-                mMountService.setUsbMassStorageEnabled(false);
-            } catch (RemoteException e) {
-            }
-            waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED);
-            waitForStorageState(PATH_SD2, Environment.MEDIA_MOUNTED);
-            assertTrue(PATH_SD2.equals(StorageManagerEx.getInternalStoragePath()));
-            assertTrue(PATH_SD1.equals(StorageManagerEx.getExternalStoragePath()));
-        } else if (SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            assertTrue(PATH_SD2.equals(StorageManagerEx.getInternalStoragePath()));
-            assertTrue(PATH_SD1.equals(StorageManagerEx.getExternalStoragePath()));
-
-            //unmount SD1
-            try {
-                mMountService.unmountVolume(PATH_SD1, true, false);
-            } catch (RemoteException e) {
-            }
-            SystemClock.sleep(5000);
-            waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED);
-            waitForStorageState(PATH_SD2, Environment.MEDIA_UNMOUNTED);
-            assertTrue(PATH_SD1.equals(StorageManagerEx.getInternalStoragePath()));
-            assertTrue(PATH_SD2.equals(StorageManagerEx.getExternalStoragePath()));
-
-            //mount SD2
-            try {
-                mMountService.mountVolume(PATH_SD2);
-            } catch (RemoteException e) {
-            }
-            SystemClock.sleep(5000);
-            waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED);
-            waitForStorageState(PATH_SD2, Environment.MEDIA_MOUNTED);
-            assertTrue(PATH_SD2.equals(StorageManagerEx.getInternalStoragePath()));
-            assertTrue(PATH_SD1.equals(StorageManagerEx.getExternalStoragePath()));
-
-            //turn on/off UMS
-            try {
-                mMountService.setUsbMassStorageEnabled(true);
-            } catch (RemoteException e) {
-            }
-            SystemClock.sleep(5000);
-            waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED);
-            waitForStorageState(PATH_SD2, Environment.MEDIA_SHARED);
-            assertTrue(PATH_SD1.equals(StorageManagerEx.getInternalStoragePath()));
-            assertTrue(PATH_SD2.equals(StorageManagerEx.getExternalStoragePath()));
-            try {
-                mMountService.setUsbMassStorageEnabled(false);
-            } catch (RemoteException e) {
-            }
-            SystemClock.sleep(5000);
-            waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED);
-            waitForStorageState(PATH_SD2, Environment.MEDIA_MOUNTED);
-            assertTrue(PATH_SD2.equals(StorageManagerEx.getInternalStoragePath()));
-            assertTrue(PATH_SD1.equals(StorageManagerEx.getExternalStoragePath()));
-        }
-    }
-
-    public void testMountUnmount() {
-        BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                String action = intent.getAction();
-                Uri uri = intent.getData();
-                String path = null;
-
-                boolean validIntent = false;
-                if (action != null && uri != null) {
-                    path = uri.getPath();
-                    if (path != null) {
-                        validIntent = true;
-                    }
-                }
-                assertTrue(validIntent);
-                if (!validIntent) {
-                    return;
-                }
-                Log.d(TAG, "testMountUnmount, receive path=" + path);
-                if (action.equals(Intent.ACTION_MEDIA_MOUNTED)) {
-                    Log.d(TAG, "testMountUnmount receive ACTION_MEDIA_MOUNTED");
-                    if (path.equals(PATH_SD1)) {
-                        mSD1Mounted = true;
-                    } else if (path.equals(PATH_SD2)) {
-                        mSD2Mounted = true;
-                    }
-                } else if (action.equals(Intent.ACTION_MEDIA_UNMOUNTED)) {
-                    Log.d(TAG, "testMountUnmount receive ACTION_MEDIA_UNMOUNTED");
-                    if (path.equals(PATH_SD1)) {
-                        mSD1Unmounted = true;
-                    } else if (path.equals(PATH_SD2)) {
-                        mSD2Unmounted = true;
-                    }
-                } else if (action.equals(Intent.ACTION_MEDIA_CHECKING)) {
-                    Log.d(TAG, "testMountUnmount receive ACTION_MEDIA_CHECKING");
-                    if (path.equals(PATH_SD1)) {
-                        mSD1Checking = true;
-                    } else if (path.equals(PATH_SD2)) {
-                        mSD2Checking = true;
-                    }
-                } else if (action.equals(Intent.ACTION_MEDIA_EJECT)) {
-                    Log.d(TAG, "testMountUnmount receive ACTION_MEDIA_EJECT");
-                    if (path.equals(PATH_SD1)) {
-                        mSD1Eject = true;
-                    } else if (path.equals(PATH_SD2)) {
-                        mSD2Eject = true;
-                    }
-                } else if (action.equals(INTENT_SD_SWAP)) {
-                    Log.d(TAG, "testMountUnmount receive INTENT_SD_SWAP");
-                    mSDSwap = true;
-                }
-            }
-        };
-
-        IntentFilter filter = new IntentFilter();
-        filter.addDataScheme("file");
-        filter.addAction(Intent.ACTION_MEDIA_MOUNTED);
-        filter.addAction(Intent.ACTION_MEDIA_UNMOUNTED);
-        filter.addAction(Intent.ACTION_MEDIA_CHECKING);
-        filter.addAction(Intent.ACTION_MEDIA_EJECT);
-        filter.addAction(INTENT_SD_SWAP);
-        mContext.registerReceiver(broadcastReceiver, filter, null, null);
-
-        waitForAllStorageMounted();
-        if (!SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && !SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            resetIntentFlag();
-            //unmount SD1
-            try {
-                mMountService.unmountVolume(PATH_SD1, true, false);
-            } catch (RemoteException e) {
-            }
-            assertTrue(waitForStorageState(PATH_SD1, Environment.MEDIA_UNMOUNTED));
-            SystemClock.sleep(2000);
-            assertTrue(!mSD1Mounted);
-            assertTrue(!mSD2Mounted);
-            assertTrue(!mSD1Checking);
-            assertTrue(!mSD2Checking);
-            assertTrue(mSD1Unmounted);
-            assertTrue(!mSD2Unmounted);
-            assertTrue(mSD1Eject);
-            assertTrue(!mSD2Eject);
-            assertTrue(!mSDSwap);
-
-            resetIntentFlag();
-            //unmount SD2
-            try {
-                mMountService.unmountVolume(PATH_SD2, true, false);
-            } catch (RemoteException e) {
-            }
-            assertTrue(waitForStorageState(PATH_SD2, Environment.MEDIA_UNMOUNTED));
-            SystemClock.sleep(2000);
-            assertTrue(!mSD1Mounted);
-            assertTrue(!mSD2Mounted);
-            assertTrue(!mSD1Checking);
-            assertTrue(!mSD2Checking);
-            assertTrue(!mSD1Unmounted);
-            assertTrue(mSD2Unmounted);
-            assertTrue(!mSD1Eject);
-            assertTrue(mSD2Eject);
-            assertTrue(!mSDSwap);
-
-            resetIntentFlag();
-            //mount SD1
-            try {
-                mMountService.mountVolume(PATH_SD1);
-            } catch (RemoteException e) {
-            }
-            assertTrue(waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED));
-            SystemClock.sleep(2000);
-            assertTrue(mSD1Mounted);
-            assertTrue(!mSD2Mounted);
-            assertTrue(mSD1Checking);
-            assertTrue(!mSD2Checking);
-            assertTrue(!mSD1Unmounted);
-            assertTrue(!mSD2Unmounted);
-            assertTrue(!mSD1Eject);
-            assertTrue(!mSD2Eject);
-            assertTrue(!mSDSwap);
-
-            resetIntentFlag();
-            //mount SD2
-            try {
-                mMountService.mountVolume(PATH_SD2);
-            } catch (RemoteException e) {
-            }
-            assertTrue(waitForStorageState(PATH_SD2, Environment.MEDIA_MOUNTED));
-            SystemClock.sleep(2000);
-            assertTrue(!mSD1Mounted);
-            assertTrue(mSD2Mounted);
-            assertTrue(!mSD1Checking);
-            assertTrue(mSD2Checking);
-            assertTrue(!mSD1Unmounted);
-            assertTrue(!mSD2Unmounted);
-            assertTrue(!mSD1Eject);
-            assertTrue(!mSD2Eject);
-            assertTrue(!mSDSwap);
-        } else if (!SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            resetIntentFlag();
-            //unmount SD2
-            try {
-                mMountService.unmountVolume(PATH_SD2, true, false);
-            } catch (RemoteException e) {
-            }
-            assertTrue(waitForStorageState(PATH_SD2, Environment.MEDIA_UNMOUNTED));
-            SystemClock.sleep(2000);
-            assertTrue(!mSD1Mounted);
-            assertTrue(!mSD2Mounted);
-            assertTrue(!mSD1Checking);
-            assertTrue(!mSD2Checking);
-            assertTrue(!mSD1Unmounted);
-            assertTrue(mSD2Unmounted);
-            assertTrue(!mSD1Eject);
-            assertTrue(mSD2Eject);
-            assertTrue(!mSDSwap);
-
-            resetIntentFlag();
-            //mount SD2
-            try {
-                mMountService.mountVolume(PATH_SD2);
-            } catch (RemoteException e) {
-            }
-            assertTrue(waitForStorageState(PATH_SD2, Environment.MEDIA_MOUNTED));
-            SystemClock.sleep(2000);
-            assertTrue(!mSD1Mounted);
-            assertTrue(mSD2Mounted);
-            assertTrue(!mSD1Checking);
-            assertTrue(mSD2Checking);
-            assertTrue(!mSD1Unmounted);
-            assertTrue(!mSD2Unmounted);
-            assertTrue(!mSD1Eject);
-            assertTrue(!mSD2Eject);
-            assertTrue(!mSDSwap);
-        } else if (SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && !SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            resetIntentFlag();
-            //unmount SD1
-            try {
-                mMountService.unmountVolume(PATH_SD1, true, false);
-            } catch (RemoteException e) {
-            }
-            SystemClock.sleep(5000);
-            assertTrue(waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED));
-            assertTrue(waitForStorageState(PATH_SD2, Environment.MEDIA_UNMOUNTED));
-            assertTrue(mSD1Mounted);
-            assertTrue(!mSD2Mounted);
-            assertTrue(mSD1Checking);
-            assertTrue(!mSD2Checking);
-            assertTrue(mSD1Unmounted);
-            assertTrue(mSD2Unmounted);
-            assertTrue(mSD1Eject);
-            assertTrue(mSD2Eject);
-            assertTrue(mSDSwap);
-
-            resetIntentFlag();
-            //unmount SD1
-            try {
-                mMountService.unmountVolume(PATH_SD1, true, false);
-            } catch (RemoteException e) {
-            }
-            assertTrue(waitForStorageState(PATH_SD1, Environment.MEDIA_UNMOUNTED));
-            SystemClock.sleep(2000);
-            assertTrue(!mSD1Mounted);
-            assertTrue(!mSD2Mounted);
-            assertTrue(!mSD1Checking);
-            assertTrue(!mSD2Checking);
-            assertTrue(mSD1Unmounted);
-            assertTrue(!mSD2Unmounted);
-            assertTrue(mSD1Eject);
-            assertTrue(!mSD2Eject);
-            assertTrue(!mSDSwap);
-
-            resetIntentFlag();
-            //mount SD1
-            try {
-                mMountService.mountVolume(PATH_SD1);
-            } catch (RemoteException e) {
-            }
-            assertTrue(waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED));
-            SystemClock.sleep(2000);
-            assertTrue(mSD1Mounted);
-            assertTrue(!mSD2Mounted);
-            assertTrue(mSD1Checking);
-            assertTrue(!mSD2Checking);
-            assertTrue(!mSD1Unmounted);
-            assertTrue(!mSD2Unmounted);
-            assertTrue(!mSD1Eject);
-            assertTrue(!mSD2Eject);
-            assertTrue(!mSDSwap);
-
-            resetIntentFlag();
-            //mount SD2
-            try {
-                mMountService.mountVolume(PATH_SD2);
-            } catch (RemoteException e) {
-            }
-            SystemClock.sleep(5000);
-            assertTrue(waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED));
-            assertTrue(waitForStorageState(PATH_SD2, Environment.MEDIA_MOUNTED));
-            assertTrue(mSD1Mounted);
-            assertTrue(mSD2Mounted);
-            assertTrue(mSD1Checking);
-            assertTrue(mSD2Checking);
-            assertTrue(mSD1Unmounted);
-            assertTrue(!mSD2Unmounted);
-            assertTrue(mSD1Eject);
-            assertTrue(!mSD2Eject);
-            assertTrue(mSDSwap);
-        } else if (SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            resetIntentFlag();
-            //unmount SD1
-            try {
-                mMountService.unmountVolume(PATH_SD1, true, false);
-            } catch (RemoteException e) {
-            }
-            SystemClock.sleep(5000);
-            assertTrue(waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED));
-            assertTrue(waitForStorageState(PATH_SD2, Environment.MEDIA_UNMOUNTED));
-            assertTrue(mSD1Mounted);
-            assertTrue(!mSD2Mounted);
-            assertTrue(mSD1Checking);
-            assertTrue(!mSD2Checking);
-            assertTrue(mSD1Unmounted);
-            assertTrue(mSD2Unmounted);
-            assertTrue(mSD1Eject);
-            assertTrue(mSD2Eject);
-            assertTrue(mSDSwap);
-
-            resetIntentFlag();
-            //mount SD2
-            try {
-                mMountService.mountVolume(PATH_SD2);
-            } catch (RemoteException e) {
-            }
-            SystemClock.sleep(5000);
-            assertTrue(waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED));
-            assertTrue(waitForStorageState(PATH_SD2, Environment.MEDIA_MOUNTED));
-            assertTrue(mSD1Mounted);
-            assertTrue(mSD2Mounted);
-            assertTrue(mSD1Checking);
-            assertTrue(mSD2Checking);
-            assertTrue(mSD1Unmounted);
-            assertTrue(!mSD2Unmounted);
-            assertTrue(mSD1Eject);
-            assertTrue(!mSD2Eject);
-            assertTrue(mSDSwap);
-        }
-
-        mContext.unregisterReceiver(broadcastReceiver);
-    }
-
-    public void testUMS() {
-        BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                String action = intent.getAction();
-                Uri uri = intent.getData();
-                String path = null;
-
-                boolean validIntent = false;
-                if (action != null && uri != null) {
-                    path = uri.getPath();
-                    if (path != null) {
-                        validIntent = true;
-                    }
-                }
-                assertTrue(validIntent);
-                if (!validIntent) {
-                    return;
-                }
-
-                if (action.equals(Intent.ACTION_MEDIA_MOUNTED)) {
-                    Log.d(TAG, "testMountUnmount receive ACTION_MEDIA_MOUNTED");
-                    if (path.equals(PATH_SD1)) {
-                        mSD1Mounted = true;
-                    } else if (path.equals(PATH_SD2)) {
-                        mSD2Mounted = true;
-                    }
-                } else if (action.equals(Intent.ACTION_MEDIA_UNMOUNTED)) {
-                    Log.d(TAG, "testMountUnmount receive ACTION_MEDIA_UNMOUNTED");
-                    if (path.equals(PATH_SD1)) {
-                        mSD1Unmounted = true;
-                    } else if (path.equals(PATH_SD2)) {
-                        mSD2Unmounted = true;
-                    }
-                } else if (action.equals(Intent.ACTION_MEDIA_CHECKING)) {
-                    Log.d(TAG, "testMountUnmount receive ACTION_MEDIA_CHECKING");
-                    if (path.equals(PATH_SD1)) {
-                        mSD1Checking = true;
-                    } else if (path.equals(PATH_SD2)) {
-                        mSD2Checking = true;
-                    }
-                } else if (action.equals(Intent.ACTION_MEDIA_EJECT)) {
-                    Log.d(TAG, "testMountUnmount receive ACTION_MEDIA_EJECT");
-                    if (path.equals(PATH_SD1)) {
-                        mSD1Eject = true;
-                    } else if (path.equals(PATH_SD2)) {
-                        mSD2Eject = true;
-                    }
-                } else if (action.equals(INTENT_SD_SWAP)) {
-                    Log.d(TAG, "testMountUnmount receive INTENT_SD_SWAP");
-                    mSDSwap = true;
-                } else if (action.equals(Intent.ACTION_MEDIA_SHARED)) {
-                    Log.d(TAG, "testMountUnmount receive ACTION_MEDIA_SHARED");
-                    if (path.equals(PATH_SD1)) {
-                        mSD1Shared = true;
-                    } else if (path.equals(PATH_SD2)) {
-                        mSD2Shared = true;
-                    }
-                } else if (action.equals(Intent.ACTION_MEDIA_UNSHARED)) {
-                    Log.d(TAG, "testMountUnmount receive ACTION_MEDIA_UNSHARED");
-                    if (path.equals(PATH_SD1)) {
-                        mSD1Unshared = true;
-                    } else if (path.equals(PATH_SD2)) {
-                        mSD2Unshared = true;
-                    }
-                }
-            }
-        };
-
-        IntentFilter filter = new IntentFilter();
-        filter.addDataScheme("file");
-        filter.addAction(Intent.ACTION_MEDIA_MOUNTED);
-        filter.addAction(Intent.ACTION_MEDIA_UNMOUNTED);
-        filter.addAction(Intent.ACTION_MEDIA_CHECKING);
-        filter.addAction(Intent.ACTION_MEDIA_EJECT);
-        filter.addAction(INTENT_SD_SWAP);
-        filter.addAction(Intent.ACTION_MEDIA_SHARED);
-        filter.addAction(Intent.ACTION_MEDIA_UNSHARED);
-        mContext.registerReceiver(broadcastReceiver, filter, null, null);
-
-        waitForAllStorageMounted();
-        if (!SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && !SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            resetIntentFlag();
-            //turn on UMS
-            try {
-                mMountService.setUsbMassStorageEnabled(true);
-            } catch (RemoteException e) {
-            }
-            assertTrue(waitForStorageState(PATH_SD1, Environment.MEDIA_SHARED));
-            assertTrue(waitForStorageState(PATH_SD2, Environment.MEDIA_SHARED));
-            SystemClock.sleep(2000);
-            assertTrue(!mSD1Mounted);
-            assertTrue(!mSD2Mounted);
-            assertTrue(!mSD1Checking);
-            assertTrue(!mSD2Checking);
-            assertTrue(mSD1Unmounted);
-            assertTrue(mSD2Unmounted);
-            assertTrue(mSD1Eject);
-            assertTrue(mSD2Eject);
-            assertTrue(!mSDSwap);
-            assertTrue(mSD1Shared);
-            assertTrue(mSD2Shared);
-            assertTrue(!mSD1Unshared);
-            assertTrue(!mSD2Unshared);
-
-            resetIntentFlag();
-            //turn off UMS
-            try {
-                mMountService.setUsbMassStorageEnabled(false);
-            } catch (RemoteException e) {
-            }
-            assertTrue(waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED));
-            assertTrue(waitForStorageState(PATH_SD2, Environment.MEDIA_MOUNTED));
-            SystemClock.sleep(2000);
-            assertTrue(mSD1Mounted);
-            assertTrue(mSD2Mounted);
-            assertTrue(mSD1Checking);
-            assertTrue(mSD2Checking);
-            assertTrue(mSD1Unmounted);
-            assertTrue(mSD2Unmounted);
-            assertTrue(!mSD1Eject);
-            assertTrue(!mSD2Eject);
-            assertTrue(!mSDSwap);
-            assertTrue(!mSD1Shared);
-            assertTrue(!mSD2Shared);
-            assertTrue(mSD1Unshared);
-            assertTrue(mSD2Unshared);
-        } else if (!SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            resetIntentFlag();
-            //turn on UMS
-            try {
-                mMountService.setUsbMassStorageEnabled(true);
-            } catch (RemoteException e) {
-            }
-            assertTrue(waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED));
-            assertTrue(waitForStorageState(PATH_SD2, Environment.MEDIA_SHARED));
-            SystemClock.sleep(2000);
-            assertTrue(!mSD1Mounted);
-            assertTrue(!mSD2Mounted);
-            assertTrue(!mSD1Checking);
-            assertTrue(!mSD2Checking);
-            assertTrue(!mSD1Unmounted);
-            assertTrue(mSD2Unmounted);
-            assertTrue(!mSD1Eject);
-            assertTrue(mSD2Eject);
-            assertTrue(!mSDSwap);
-            assertTrue(!mSD1Shared);
-            assertTrue(mSD2Shared);
-            assertTrue(!mSD1Unshared);
-            assertTrue(!mSD2Unshared);
-
-            resetIntentFlag();
-            //turn off UMS
-            try {
-                mMountService.setUsbMassStorageEnabled(false);
-            } catch (RemoteException e) {
-            }
-            assertTrue(waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED));
-            assertTrue(waitForStorageState(PATH_SD2, Environment.MEDIA_MOUNTED));
-            SystemClock.sleep(2000);
-            assertTrue(!mSD1Mounted);
-            assertTrue(mSD2Mounted);
-            assertTrue(!mSD1Checking);
-            assertTrue(mSD2Checking);
-            assertTrue(!mSD1Unmounted);
-            assertTrue(mSD2Unmounted);
-            assertTrue(!mSD1Eject);
-            assertTrue(!mSD2Eject);
-            assertTrue(!mSDSwap);
-            assertTrue(!mSD1Shared);
-            assertTrue(!mSD2Shared);
-            assertTrue(!mSD1Unshared);
-            assertTrue(mSD2Unshared);
-        } else if (SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && !SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            resetIntentFlag();
-            //turn on UMS
-            try {
-                mMountService.setUsbMassStorageEnabled(true);
-            } catch (RemoteException e) {
-            }
-            assertTrue(waitForStorageState(PATH_SD1, Environment.MEDIA_SHARED));
-            assertTrue(waitForStorageState(PATH_SD2, Environment.MEDIA_SHARED));
-            SystemClock.sleep(2000);
-            assertTrue(!mSD1Mounted);
-            assertTrue(!mSD2Mounted);
-            assertTrue(!mSD1Checking);
-            assertTrue(!mSD2Checking);
-            assertTrue(mSD1Unmounted);
-            assertTrue(mSD2Unmounted);
-            assertTrue(mSD1Eject);
-            assertTrue(mSD2Eject);
-            assertTrue(!mSDSwap);
-            assertTrue(mSD1Shared);
-            assertTrue(mSD2Shared);
-            assertTrue(!mSD1Unshared);
-            assertTrue(!mSD2Unshared);
-
-            resetIntentFlag();
-            //turn off UMS
-            try {
-                mMountService.setUsbMassStorageEnabled(false);
-            } catch (RemoteException e) {
-            }
-            assertTrue(waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED));
-            assertTrue(waitForStorageState(PATH_SD2, Environment.MEDIA_MOUNTED));
-            SystemClock.sleep(2000);
-            assertTrue(mSD1Mounted);
-            assertTrue(mSD2Mounted);
-            assertTrue(mSD1Checking);
-            assertTrue(mSD2Checking);
-            assertTrue(mSD1Unmounted);
-            assertTrue(mSD2Unmounted);
-            assertTrue(!mSD1Eject);
-            assertTrue(!mSD2Eject);
-            assertTrue(!mSDSwap);
-            assertTrue(!mSD1Shared);
-            assertTrue(!mSD2Shared);
-            assertTrue(mSD1Unshared);
-            assertTrue(mSD2Unshared);
-        } else if (SystemProperties.get(PROP_2SDCARD_SWAP).equals("1")  && SystemProperties.get(PROP_SHARED_SDCARD).equals("1")) {
-            resetIntentFlag();
-            //turn on UMS
-            try {
-                mMountService.setUsbMassStorageEnabled(true);
-            } catch (RemoteException e) {
-            }
-            SystemClock.sleep(5000);
-            assertTrue(waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED));
-            assertTrue(waitForStorageState(PATH_SD2, Environment.MEDIA_SHARED));
-            assertTrue(mSD1Mounted);
-            assertTrue(!mSD2Mounted);
-            assertTrue(mSD1Checking);
-            assertTrue(!mSD2Checking);
-            assertTrue(mSD1Unmounted);
-            assertTrue(mSD2Unmounted);
-            assertTrue(mSD1Eject);
-            assertTrue(mSD2Eject);
-            assertTrue(mSDSwap);
-            assertTrue(!mSD1Shared);
-            assertTrue(mSD2Shared);
-            assertTrue(!mSD1Unshared);
-            assertTrue(!mSD2Unshared);
-
-            resetIntentFlag();
-            //turn off UMS
-            try {
-                mMountService.setUsbMassStorageEnabled(false);
-            } catch (RemoteException e) {
-            }
-            SystemClock.sleep(5000);
-            assertTrue(waitForStorageState(PATH_SD1, Environment.MEDIA_MOUNTED));
-            assertTrue(waitForStorageState(PATH_SD2, Environment.MEDIA_MOUNTED));
-            assertTrue(mSD1Mounted);
-            assertTrue(mSD2Mounted);
-            assertTrue(mSD1Checking);
-            assertTrue(mSD2Checking);
-            assertTrue(mSD1Unmounted);
-            assertTrue(mSD2Unmounted);
-            assertTrue(mSD1Eject);
-            assertTrue(!mSD2Eject);
-            assertTrue(mSDSwap);
-            assertTrue(!mSD1Shared);
-            assertTrue(!mSD2Shared);
-            assertTrue(!mSD1Unshared);
-            assertTrue(mSD2Unshared);
-        }
-
-        mContext.unregisterReceiver(broadcastReceiver);
-    }
-
-    private void waitForAllStorageMounted() {
-        String[] paths = mStorageManager.getVolumePaths();
-        if (paths == null) {
-            return;
-        }
-        int len = paths.length;
-        String state;
-        for (int i = 0; i < len; i++) {
-            state = mStorageManager.getVolumeState(paths[i]);
-            if (state == null) {
-                continue;
-            }
-            if (state.equals(Environment.MEDIA_UNMOUNTED)) {
-                try {
-                    mMountService.mountVolume(paths[i]);
-                } catch (RemoteException e) {
-                    Log.e(TAG, "RemoteException when mount " + paths[i]);
-                }
-            } else if (state.equals(Environment.MEDIA_SHARED)) {
-                try {
-                    mMountService.setUsbMassStorageEnabled(false);
-                } catch (RemoteException e) {
-                    Log.e(TAG, "RemoteException when unshare " + paths[i]);
-                }
-            }
-            // wait for sd mount
-            state = mStorageManager.getVolumeState(paths[i]);
-            int retries = 30;
-            while (state != null && !state.equals(Environment.MEDIA_MOUNTED) && (retries-- >= 0)) {
-                try {
-                    Thread.sleep(2000);
-                } catch (InterruptedException iex) {
-                    Log.e(TAG, "Interrupted while waiting for media", iex);
-                    break;
-                }
-                state = mStorageManager.getVolumeState(paths[i]);
-            }
-        }
-    }
-
-    private boolean waitForStorageState(String path, String targetState) {
-        int retries = 30;
-        String state = mStorageManager.getVolumeState(path);
-        while (state != null && !state.equals(targetState) && (retries-- >= 0)) {
-            try {
-                Thread.sleep(2000);
-            } catch (InterruptedException iex) {
-                Log.e(TAG, "Interrupted while waiting for media", iex);
-                break;
-            }
-            state = mStorageManager.getVolumeState(path);
-        }
-
-        return targetState.equals(state);
-    }
-
-    private void resetIntentFlag() {
-        mSD1Mounted = false;
-        mSD2Mounted = false;
-        mSD1Checking = false;
-        mSD2Checking = false;
-        mSD1Unmounted = false;
-        mSD2Unmounted = false;
-        mSD1Eject = false;
-        mSD2Eject = false;
-        mSD1Shared = false;
-        mSD2Shared = false;
-        mSD1Unshared = false;
-        mSD2Unshared = false;
-        mSDSwap = false;
-    }
-*/
-}
diff --git a/proprietary/frameworks/base/tests/StorageService/tests/Android.mk b/proprietary/frameworks/base/tests/StorageService/tests/Android.mk
deleted file mode 100755
index d6c0f5673870cee60d722bef474864ae83a20cf1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/StorageService/tests/Android.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := optional
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-LOCAL_CERTIFICATE := platform
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MediaTekStorageServiceTestCases
-
-#LOCAL_INSTRUMENTATION_FOR := framework
-
-include $(BUILD_CTS_PACKAGE)
diff --git a/proprietary/frameworks/base/tests/StorageService/tests/Android.mk_ b/proprietary/frameworks/base/tests/StorageService/tests/Android.mk_
deleted file mode 100755
index d6c0f5673870cee60d722bef474864ae83a20cf1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/StorageService/tests/Android.mk_
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := optional
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-LOCAL_CERTIFICATE := platform
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MediaTekStorageServiceTestCases
-
-#LOCAL_INSTRUMENTATION_FOR := framework
-
-include $(BUILD_CTS_PACKAGE)
diff --git a/proprietary/frameworks/base/tests/StorageService/tests/AndroidManifest.xml b/proprietary/frameworks/base/tests/StorageService/tests/AndroidManifest.xml
deleted file mode 100755
index a5cac17d97b014038f3fefa442be344140e4dddf..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/StorageService/tests/AndroidManifest.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mediatek.storageService.test"
-    android:sharedUserId="android.uid.system">
-
-    <uses-permission android:name="android.permission.ACCESS_CHECKIN_PROPERTIES" />
-    <uses-permission android:name="android.permission.SET_DEBUG_APP" />    
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-    
-    <application>   
-        <uses-library android:name="android.test.runner" /> 
-    </application>
-
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.mediatek.storageService.test"
-                     android:label="testcase  for  storageService"/> 
-
-</manifest>
-
diff --git a/proprietary/frameworks/base/tests/StorageService/tests/NOTICE b/proprietary/frameworks/base/tests/StorageService/tests/NOTICE
deleted file mode 100755
index a103177d895aac618f85e03316c1b53254f72acf..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/StorageService/tests/NOTICE
+++ /dev/null
@@ -1,16 +0,0 @@
-Copyright (C) 2008 The Android Open Source Project:
-/*
-* Copyright (C) 2011-2014 MediaTek Inc.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/StorageService/tests/README b/proprietary/frameworks/base/tests/StorageService/tests/README
deleted file mode 100755
index 208399b10547ba36cf1c505c6bc247372cee260a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/StorageService/tests/README
+++ /dev/null
@@ -1,16 +0,0 @@
-Test APK for Low Storage module auto test. 
-
-WHAT IT DOES?
-=============
-Codes to test functionality of Low Storage module.
-
-HOW IT WAS BUILT?
-==================
-It is built by default commands.
-
-HOW TO USE IT?
-==============
-
-adb shell am instrument -w com.mediatek.storageService.test/android.test.InstrumentationTestRunner
-
-All the source code of this APK were written by MediaTek co..
diff --git a/proprietary/frameworks/base/tests/StorageService/tests/src/mediatek/storageService/test/MockStorageReceiver.java b/proprietary/frameworks/base/tests/StorageService/tests/src/mediatek/storageService/test/MockStorageReceiver.java
deleted file mode 100755
index 1fa848d8ef8fcd746cf7de14ed4476601079674b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/StorageService/tests/src/mediatek/storageService/test/MockStorageReceiver.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.StorageService.test;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-/**
- * this class  receive alarm from AlarmManagerTest
- */
-public class MockStorageReceiver extends BroadcastReceiver {
-    public boolean mStorageLow = false;
-    public boolean mStorageFull = false;
-    public boolean mStorageNotFull = false;
-    public boolean mStorageOk = false;
-    private Object mSync = new Object();
-    public static final String LOW = Intent.ACTION_DEVICE_STORAGE_LOW;
-    public static final String FULL = Intent.ACTION_DEVICE_STORAGE_FULL;
-    public static final String NOTFULL = Intent.ACTION_DEVICE_STORAGE_NOT_FULL;
-    public static final String OK = Intent.ACTION_DEVICE_STORAGE_OK;
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        final String action = intent.getAction();
-        if (action.equals(LOW)) {
-            synchronized (mSync) {
-                mStorageLow = true;
-            }
-        } else if (action.equals(FULL)) {
-            synchronized (mSync) {
-                mStorageFull = true;
-            }
-        } else if (action.equals(NOTFULL)) {
-            synchronized (mSync) {
-                mStorageNotFull = true;
-            }
-        } else if (action.equals(OK)) {
-            synchronized (mSync) {
-                mStorageOk = true;
-            }
-        }
-    }
-
-    public void setStorageFlagFalse() {
-        synchronized (mSync) {
-            mStorageLow = false;
-            mStorageFull = false;
-            mStorageNotFull = false;
-            mStorageOk = false;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/StorageService/tests/src/mediatek/storageService/test/StorageServiceTest.java b/proprietary/frameworks/base/tests/StorageService/tests/src/mediatek/storageService/test/StorageServiceTest.java
deleted file mode 100755
index b6606daa6d3303a90194cb90b1e1b0f8a9a4deb8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/StorageService/tests/src/mediatek/storageService/test/StorageServiceTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.StorageService.test;
-
-
-import android.content.IntentFilter;
-import android.util.Slog;
-import java.io.IOException;
-import android.test.AndroidTestCase;
-
-public class StorageServiceTest extends AndroidTestCase {
-    private static final String TAG = "DeviceStorageMonitorServiceTest";
-    private MockStorageReceiver mMockStorageReceiver;
-
-    private final int TIME_DELAY = 31000;
-
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mMockStorageReceiver = new MockStorageReceiver();
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(MockStorageReceiver.LOW);
-        filter.addAction(MockStorageReceiver.FULL);
-        filter.addAction(MockStorageReceiver.NOTFULL);
-        filter.addAction(MockStorageReceiver.OK);
-        mContext.registerReceiver(mMockStorageReceiver, filter);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        //System.exit(0);
-
-        /*try {
-            Runtime.getRuntime().exit(0);
-        } catch (Exception e) {
-            Slog.e(TAG, "exit error"+ e);
-        } */
-    }
-
-    public void testStorageLow() throws Exception {
-
-        try {
-            Runtime.getRuntime().exec("setprop ctsrunning 2");
-            Slog.e(TAG, "set ctsrunning !");
-        } catch (IOException e) {
-            Slog.e(TAG, "set ctsrunning error" + e);
-        }
-        // test storage low case
-        mMockStorageReceiver.setStorageFlagFalse();
-        try {
-            Runtime.getRuntime().exec("setprop debug.freemem 9437184");
-            Slog.e(TAG, "set debug.freemem !");
-        } catch (IOException e) {
-            Slog.e(TAG, "set debug.freemem error" + e);
-        }
-        Thread.sleep(TIME_DELAY);
-        assertTrue(mMockStorageReceiver.mStorageLow);
-
-        mMockStorageReceiver.setStorageFlagFalse();
-        try {
-            Runtime.getRuntime().exec("setprop debug.freemem 3145728");
-        } catch (IOException e) {
-            Slog.e(TAG, "set debug.freemem error" + e);
-        }
-        Thread.sleep(TIME_DELAY);
-        assertTrue(mMockStorageReceiver.mStorageFull);
-
-        try {
-            Runtime.getRuntime().exec("input keyevent 4");
-        } catch (IOException e) {
-            Slog.e(TAG, "input keyevent error" + e);
-        }
-
-        mMockStorageReceiver.setStorageFlagFalse();
-        try {
-            Runtime.getRuntime().exec("setprop debug.freemem 9437184");
-        } catch (IOException e) {
-            Slog.e(TAG, "set debug.freemem error" + e);
-        }
-        Thread.sleep(TIME_DELAY);
-        assertTrue(mMockStorageReceiver.mStorageNotFull);
-        mMockStorageReceiver.setStorageFlagFalse();
-        try {
-            Runtime.getRuntime().exec("setprop debug.freemem 94371840");
-        } catch (IOException e) {
-            Slog.e(TAG, "set debug.freemem error" + e);
-        }
-
-        Thread.sleep(TIME_DELAY);
-        assertTrue(mMockStorageReceiver.mStorageOk);
-        try {
-            Runtime.getRuntime().exec("am force-stop com.mediatek.storageService.test");
-        } catch (IOException e) {
-            Slog.e(TAG, "am force-stop " + e);
-        }
-      //  android.os.Process.killProcess(android.os.Process.myPid());
-    }
-/*
-    public void testStorageFull() throws Exception {
-        // test storage low case
-        mMockStorageReceiver.setStorageFlagFalse();
-        try {
-            Runtime.getRuntime().exec("setprop debug.freemem 3145728");
-        } catch (IOException e) {
-            Slog.e(TAG, "set debug.freemem error"+ e);
-        }
-        Thread.sleep(TIME_DELAY);
-        assertTrue(mMockStorageReceiver.mStorageFull);
-    }
-
-    public void testStorageNotFull() throws Exception {
-        // test storage low case
-        mMockStorageReceiver.setStorageFlagFalse();
-        try {
-            Runtime.getRuntime().exec("setprop debug.freemem 9437184");
-        } catch (IOException e) {
-            Slog.e(TAG, "set debug.freemem error"+ e);
-        }
-        Thread.sleep(TIME_DELAY);
-        assertTrue(mMockStorageReceiver.mStorageNotFull);
-    }
-
-
-    public void testStorageOk() throws Exception {
-        // test storage low case
-        mMockStorageReceiver.setStorageFlagFalse();
-        try {
-            Runtime.getRuntime().exec("setprop debug.freemem 94371840");
-        } catch (IOException e) {
-            Slog.e(TAG, "set debug.freemem error"+ e);
-        }
-        Thread.sleep(TIME_DELAY);
-        assertTrue(mMockStorageReceiver.mStorageOk);
-    }
-    */
-}
diff --git a/proprietary/frameworks/base/tests/SystemServer/tests/Android.mk b/proprietary/frameworks/base/tests/SystemServer/tests/Android.mk
deleted file mode 100755
index bac4bcc9fe0e92146f7ab15935d86ab3dea6c4d3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/SystemServer/tests/Android.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := tests
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MediaTekSystemServerTestCases
-
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_CTS_PACKAGE)
diff --git a/proprietary/frameworks/base/tests/SystemServer/tests/Android.mk_ b/proprietary/frameworks/base/tests/SystemServer/tests/Android.mk_
deleted file mode 100755
index bac4bcc9fe0e92146f7ab15935d86ab3dea6c4d3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/SystemServer/tests/Android.mk_
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := tests
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MediaTekSystemServerTestCases
-
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_CTS_PACKAGE)
diff --git a/proprietary/frameworks/base/tests/SystemServer/tests/AndroidManifest.xml b/proprietary/frameworks/base/tests/SystemServer/tests/AndroidManifest.xml
deleted file mode 100755
index e8ccf1d426dddd0dbca68bbf54ad3d21ed841bf3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/SystemServer/tests/AndroidManifest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mediatek.SystemServer.test"
-    android:sharedUserId="android.uid.system">
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.mediatek.SystemServer.test"
-                     android:label="Testcase for system server"/>
-</manifest>
-
diff --git a/proprietary/frameworks/base/tests/SystemServer/tests/README b/proprietary/frameworks/base/tests/SystemServer/tests/README
deleted file mode 100755
index c1e005966175b96d01ac639a3bc2a7bbf84a798a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/SystemServer/tests/README
+++ /dev/null
@@ -1,26 +0,0 @@
-SystemServer auto test to ensure the performance and stability of SystemServer process.
-
-This should be built separately for test purpose.
-
-
-WHAT IT DOES?
-=============
-MediaTekSystemServerTestCases contains test cases for bootup time and the availability
-of critical system services.
-
-
-HOW IT WAS BUILT?
-==================
-Use AOPS mmm command with this folder path to build the apk file.
-
-
-HOW TO USE IT?
-==============
-
-Dev Tools -> Instrument -> System Server Test Case
-
-or
-
-adb shell am instrument -w com.mediatek.SystemServer.test/android.test.InstrumentationTestRunner
-
-
diff --git a/proprietary/frameworks/base/tests/SystemServer/tests/src/mediatek/SystemServer/test/SystemServerTest.java b/proprietary/frameworks/base/tests/SystemServer/tests/src/mediatek/SystemServer/test/SystemServerTest.java
deleted file mode 100755
index fca1ca2a2f68cd5faf595c0cb1bf10bc16774288..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/SystemServer/tests/src/mediatek/SystemServer/test/SystemServerTest.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.SystemServer.test;
-import android.bluetooth.BluetoothAdapter;
-import android.test.AndroidTestCase;
-import android.os.SystemProperties;
-import android.os.ServiceManager;
-import android.content.pm.PackageManager;
-import android.content.Context;
-import android.util.Slog;
-import java.util.ArrayList;
-import java.io.FileReader;
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-
-// For the tag of services
-import android.service.dreams.DreamService;
-
-public class SystemServerTest extends AndroidTestCase {
-    private static final String TAG = "SystemServerTest";
-    /*
-     *  The default snooze delay: 1 seconds
-     */
-    private final long SNOOZE_DELAY = 1 * 1000L;
-    private boolean mBootCompleted = false;
-    private ArrayList<String> mSrvInitList = new ArrayList<String>();
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mBootCompleted = "1".equals(SystemProperties.get("dev.bootcomplete", "0"));
-    }
-
-    /**
-    /* Test Case 1:
-    /* Purpose: Check all services in the ServiceManager are active
-    **/
-    public void testServiceManager() throws Exception {
-        Slog.v(TAG, "testServiceManager()");
-        boolean bResult = false;
-
-        do {
-            if (false == mBootCompleted) {
-                Slog.e(TAG, "Must test this test case after boot completed!");
-                break;
-            }
-            // Query services from ServiceManager
-            String[] srvList = ServiceManager.listServices();
-            if (null == srvList) {
-                Slog.e(TAG, "Service list is empty!");
-                break;
-            }
-            Slog.v(TAG, "Total number of services in ServiceManager: " + srvList.length);
-
-            // Check each services
-            for (String srvTag : srvList) {
-                Slog.v(TAG, "check service: " + srvTag);
-                if (null == ServiceManager.checkService(srvTag)) {
-                    break;
-                }
-            }
-            bResult = true;
-        } while(false);
-
-        assertTrue(bResult);
-    }
-
-    /**
-    /* Test Case 2:
-    /* Purpose: Check all services are initialized in system server (Only in SystemServer.java) successfully.
-    **/
-    public void testServiceInitStatus() throws Exception {
-        Slog.v(TAG, "testServiceInitStatus()");
-        boolean bResult = true;
-
-        do {
-            if (false == mBootCompleted) {
-                Slog.e(TAG, "Must test this test case after boot completed!");
-                bResult = false;
-                break;
-            }
-            // Prepare the service list to check
-            prepareSystemServerSrvInitList(); // in SystemServer.java
-            prepareOtherSrvInitList(); // Other important service
-
-            Slog.v(TAG, "Total number of test services: " + mSrvInitList.size());
-            // Check each services
-            for (String srvTag : mSrvInitList) {
-                Slog.v(TAG, "Check service: " + srvTag);
-                if (null == ServiceManager.checkService(srvTag)) {
-                    Slog.w(TAG, srvTag + " didn't register in ServiceManager successfully!");
-                    bResult = false;
-                }
-            }
-        } while(false);
-        assertTrue(bResult);
-    }
-
-    private void prepareOtherSrvInitList() {
-        // Other Important service
-        mSrvInitList.add("package");
-        mSrvInitList.add("activity");
-        mSrvInitList.add("phone");
-        //mSrvInitList.add("isms");
-    }
-
-    private void prepareSystemServerSrvInitList() {
-        Slog.v(TAG, "prepareSrvInitList() Serivce in SystemServer");
-        // Entropy Mixer no longer added to ServiceManager since M
-        // mSrvInitList.add("entropy");
-        mSrvInitList.add(Context.POWER_SERVICE);
-        mSrvInitList.add(Context.DISPLAY_SERVICE);
-        mSrvInitList.add("telephony.registry");
-
-        mSrvInitList.add(Context.USER_SERVICE);
-        mSrvInitList.add(Context.ACCOUNT_SERVICE);
-        mSrvInitList.add("battery");
-        mSrvInitList.add("vibrator");
-        mSrvInitList.add(Context.ALARM_SERVICE);
-        mSrvInitList.add(Context.WINDOW_SERVICE);
-        mSrvInitList.add(Context.INPUT_SERVICE);
-        if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH) &&
-            SystemProperties.getBoolean("config.disable_bluetooth", false) == false)
-        {
-            mSrvInitList.add(BluetoothAdapter.BLUETOOTH_MANAGER_SERVICE);
-        }
-        mSrvInitList.add(Context.INPUT_METHOD_SERVICE);
-        mSrvInitList.add(Context.ACCESSIBILITY_SERVICE);
-        if (!SystemProperties.get("system_init.startmountservice").equals("0")) {
-            mSrvInitList.add("mount");
-        }
-        mSrvInitList.add("lock_settings");
-        mSrvInitList.add(Context.DEVICE_POLICY_SERVICE);
-        mSrvInitList.add(Context.STATUS_BAR_SERVICE);
-        mSrvInitList.add(Context.CLIPBOARD_SERVICE);
-        mSrvInitList.add(Context.NETWORKMANAGEMENT_SERVICE);
-        mSrvInitList.add(Context.TEXT_SERVICES_MANAGER_SERVICE);
-        mSrvInitList.add(Context.NETWORK_STATS_SERVICE);
-        mSrvInitList.add(Context.NETWORK_POLICY_SERVICE);
-        mSrvInitList.add(Context.WIFI_P2P_SERVICE);
-        mSrvInitList.add(Context.WIFI_SERVICE);
-        mSrvInitList.add(Context.CONNECTIVITY_SERVICE);
-        mSrvInitList.add(Context.NSD_SERVICE);
-        //mSrvInitList.add(Context.THROTTLE_SERVICE);
-        mSrvInitList.add(Context.UPDATE_LOCK_SERVICE);
-        mSrvInitList.add(Context.NOTIFICATION_SERVICE);
-        mSrvInitList.add("devicestoragemonitor");
-        mSrvInitList.add(Context.LOCATION_SERVICE);
-        mSrvInitList.add(Context.COUNTRY_DETECTOR);
-        mSrvInitList.add(Context.SEARCH_SERVICE);
-
-        Slog.v(TAG, "ro.mtk_bsp_package:" + SystemProperties.get("ro.mtk_bsp_package").equals("1"));
-
-        mSrvInitList.add(Context.SEARCH_ENGINE_SERVICE);
-        mSrvInitList.add(Context.DROPBOX_SERVICE);
-        mSrvInitList.add(Context.WALLPAPER_SERVICE);
-        mSrvInitList.add(Context.AUDIO_SERVICE);
-        if (false == SystemProperties.get("ro.mtk_bsp_package").equals("1")
-            && true == SystemProperties.get("ro.mtk_audio_profiles").equals("1")) {
-            mSrvInitList.add(Context.AUDIO_PROFILE_SERVICE);
-        }
-        if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_USB_HOST) ||
-            mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_USB_ACCESSORY))
-        {
-            mSrvInitList.add(Context.USB_SERVICE);
-        }
-        mSrvInitList.add(Context.SERIAL_SERVICE);
-        if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BACKUP)) {
-            mSrvInitList.add(Context.BACKUP_SERVICE);
-        }
-        if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_APP_WIDGETS)) {
-            mSrvInitList.add(Context.APPWIDGET_SERVICE);
-        }
-        /*if(SystemProperties.get("ro.mtk_agps_app").equals("1") && SystemProperties.get("ro.mtk_gps_support").equals("1")) {
-            mSrvInitList.add(Context.MTK_AGPS_SERVICE);
-        }*/
-        mSrvInitList.add("diskstats");
-        mSrvInitList.add("samplingprofiler");
-        mSrvInitList.add("commontime_management");
-        mSrvInitList.add(DreamService.DREAM_SERVICE);
-    }
-
-    /**
-    /* Test Case 3:
-    /* Purpose: Check the total time to boot system server
-    **/
-    public void testBootupTime() {
-        final float BOOT_TIME_THRESHOLD = 50000.0f; // The worstest case(until JB2) takes 41 seconds.
-        final String SPLIT_TOKEN = " : ";
-        Slog.v(TAG, "testSystemServerBootupTime()");
-        boolean bResult = false;
-        boolean bMTPROF_disable = "1".equals(SystemProperties.get("ro.mtprof.disable"));
-        String recordString = null;
-        Float startTime = 0.0f;
-        Float endTime = 0.0f;
-
-        try {
-            if (!bMTPROF_disable) {
-                String lineStr = null;
-                FileReader fr = new FileReader("/proc/bootprof");
-                BufferedReader br = new BufferedReader(fr);
-                lineStr = br.readLine();
-                while (null != lineStr) {
-                    // Ignore head and tail lines
-                    if (false == lineStr.contains(" : ")) {
-                        lineStr = br.readLine();
-                        continue;
-                    }
-                    lineStr = lineStr.trim();
-                    String[] data = lineStr.split(SPLIT_TOKEN);
-                    Float theTime = Float.valueOf(data[0]);
-                    // Get start time
-                    if (true == lineStr.contains("Android:SysServerInit_START")) {
-                        startTime = theTime;
-                    }
-                    // Get end time
-                    if (true == lineStr.contains("Android:SysServerInit_END")) {
-                        endTime = theTime;
-                    }
-                    Slog.v(TAG, lineStr);
-                    lineStr = br.readLine();
-                }
-                br.close();
-                fr.close();
-            } else {
-                Slog.e(TAG, "Bootprof is disabled!");
-            }
-
-            // Start check boot time
-            do {
-                if (startTime == 0.0f || endTime == 0.0f) {
-                    Slog.e(TAG, "Bootprof file is not complete!");
-                    break;
-                }
-                if (startTime >= endTime) {
-                    Slog.e(TAG, "Bootprof file has problem! startTime: " + startTime + " endTime: " + endTime);
-                    break;
-                }
-                float diff = endTime - startTime;
-
-                Slog.v(TAG, "Threadhold: " + BOOT_TIME_THRESHOLD);
-                if (diff <= BOOT_TIME_THRESHOLD) {
-                    Slog.v(TAG, "Take " + diff + " (ms) booting up");
-                    bResult = true;
-                } else {
-                    Slog.e(TAG, "Take too much time (ms): " + diff);
-                }
-            }
-            while(false);
-        } catch (FileNotFoundException e) {
-            Slog.e(TAG, "Failure open /proc/bootprof, not found!", e);
-        } catch (java.io.IOException e) {
-            Slog.e(TAG, "Failure open /proc/bootprof entry", e);
-        } catch (Exception e) {
-            Slog.e(TAG, "Test exception!", e);
-        }
-        assertTrue(bResult);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/content/Android.mk b/proprietary/frameworks/base/tests/content/Android.mk
deleted file mode 100755
index 41622e0d043807b6a024bb11a8e8144c52e562e8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/Android.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)\
-              $(call all-java-files-under, core/runner/src)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-#LOCAL_JNI_SHARED_LIBRARIES := mtklibcts_jni
-
-# Resource unit tests use a private locale and some densities
-LOCAL_AAPT_FLAGS = -c xx_YY -c cs -c 32dpi -c 240dpi -c 160dpi
-
-LOCAL_PACKAGE_NAME := MediaTekContentTestStubs
-
-
-include $(BUILD_PACKAGE)
-
-# Build the test APK using its own makefile, and any other CTS-related packages
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/frameworks/base/tests/content/Android.mk_ b/proprietary/frameworks/base/tests/content/Android.mk_
deleted file mode 100755
index 41622e0d043807b6a024bb11a8e8144c52e562e8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/Android.mk_
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)\
-              $(call all-java-files-under, core/runner/src)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-#LOCAL_JNI_SHARED_LIBRARIES := mtklibcts_jni
-
-# Resource unit tests use a private locale and some densities
-LOCAL_AAPT_FLAGS = -c xx_YY -c cs -c 32dpi -c 240dpi -c 160dpi
-
-LOCAL_PACKAGE_NAME := MediaTekContentTestStubs
-
-
-include $(BUILD_PACKAGE)
-
-# Build the test APK using its own makefile, and any other CTS-related packages
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/frameworks/base/tests/content/AndroidManifest.xml b/proprietary/frameworks/base/tests/content/AndroidManifest.xml
deleted file mode 100755
index ff48da2d27e78587ddde2af9c277912756b8f1c2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/AndroidManifest.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.cts.stub">
-
-	<uses-permission android:name="android.permission.WRITE_SETTINGS" />
-	<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
-	<!-- content sync tests -->
-	<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-	<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-	<uses-permission android:name="android.permission.GET_ACCOUNTS" />
-	<uses-permission android:name="android.permission.USE_CREDENTIALS" />
-	<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
-	<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
-	<uses-permission android:name="android.permission.READ_SYNC_STATS" />
-
-	<application>
-		<uses-library android:name="android.test.runner" />
-
-		<provider android:name="android.content.cts.MockContentProvider" android:authorities="ctstest"
-			android:multiprocess="false" />
-		<provider android:name="android.content.cts.DummyProvider"
-			android:authorities="android.content.cts.dummyprovider"
-			android:multiprocess="true" />
-		<provider android:name="android.content.cts.MockRemoteContentProvider"
-			android:authorities="remotectstest"
-			android:process=":remoteprovider" android:multiprocess="false" />
-
-		<service android:name="android.content.cts.MockSyncAdapterService" android:exported="true">
-		  <intent-filter>
-		      <action android:name="android.content.SyncAdapter" />
-		  </intent-filter>
-
-		  <meta-data android:name="android.content.SyncAdapter"
-		             android:resource="@xml/syncadapter" />
-		</service>
-
-		<service android:name="android.content.cts.MockAccountService" android:exported="true"
-		       >
-		  <intent-filter>
-		      <action android:name="android.accounts.AccountAuthenticator" />
-		  </intent-filter>
-
-		  <meta-data android:name="android.accounts.AccountAuthenticator"
-		             android:resource="@xml/authenticator" />
-		</service>
-	</application>
-
-</manifest>
-
diff --git a/proprietary/frameworks/base/tests/content/NOTICE b/proprietary/frameworks/base/tests/content/NOTICE
deleted file mode 100755
index 95d7825cfa1e47bfb52bcb4a48a6bba7e7441787..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/NOTICE
+++ /dev/null
@@ -1,90 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project:
-
-
-
-<!-- Copyright (C) 2013 The Android Open Source Project:
-
-
-
-<!-- Copyright (C) 2008 The Android Open Source Project:
-
-
-
-* Copyright (C) 2008 The Android Open Source Project:
-
-
-
-* Copyright (C) 2009 The Android Open Source Project:
-
-
-
-<!-- Copyright (C) 2007 The Android Open Source Project:
-
-
-
-* Copyright (C) 2008 The Android Open Source Project.:
-
-
-
-<!-- Copyright (C) 2011 The Android Open Source Project:
-
-
-
-<!-- Copyright (C) 2010 The Android Open Source Project:
-
-
-
-* Copyright (C) 2012 The Android Open Source Project.:
-
-
-
-** Copyright 2008, The Android Open Source Project:
-
-
-
-* Copyright (C) 2008 Esmertec AG.:
-
-
-
-* Copyright (C) 2013 The Android Open Source Project:
-
-
-
-* Copyright (C) 2011 The Android Open Source Project:
-
-
-
-* Copyright (c) 2009, The Android Open Source Project:
-
-
-
-* Copyright (C) 2009 The Android Open Source Project.:
-
-
-
-* Copyright (C) 2010 The Android Open Source Project:
-
-
-
-* Copyright (C) 2012 The Android Open Source Project:
-
-
-
-/*
-* Copyright (C) 2011-2014 MediaTek Inc.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-:
- 
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/content/README b/proprietary/frameworks/base/tests/content/README
deleted file mode 100755
index ce8c9f42891943bac793e52bcd504f909f929e4b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/README
+++ /dev/null
@@ -1,22 +0,0 @@
-Test cases stubs for android frameworks content provider module
-
-WHAT IT DOES?
-=============
-MediaTekContentTestStubs.apk is a test case stubs for content provider
-test cases.
-
-It provide test stubs for MediaTekCtsContentTestCases.apk
-
-The test cases are most come from Android CTS test cases
-
-HOW IT WAS BUILT?
-==================
-make 'vendor/mediatek/proprietary/frameworks/base/tests/content/' folder to get
-test apk
-
-HOW TO USE IT?
-==============
-After build MediaTekContentTestStubs.apk, install to phone with
-MediaTekCtsContentTestCases.apk, and run command:
-'adb shell am instrument -w com.mediatek.content/android.test.InstrumentationTestRunner'
-to get result
diff --git a/proprietary/frameworks/base/tests/content/assets/alter-footer.zip b/proprietary/frameworks/base/tests/content/assets/alter-footer.zip
deleted file mode 100755
index f497ec000519e4b81802430b5098a9caa4cf2be3..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/assets/alter-footer.zip and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/assets/alter-metadata.zip b/proprietary/frameworks/base/tests/content/assets/alter-metadata.zip
deleted file mode 100755
index 1c71fbc49e2e50444ea0d1136ad0ad878d6124b0..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/assets/alter-metadata.zip and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/assets/fake-eocd.zip b/proprietary/frameworks/base/tests/content/assets/fake-eocd.zip
deleted file mode 100755
index 15dc0a9465f501add1f51ffa465a5efbdb1f4b7d..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/assets/fake-eocd.zip and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/assets/images/robot.png b/proprietary/frameworks/base/tests/content/assets/images/robot.png
deleted file mode 100755
index 8a9e6984be96ea93dcb63ae1973e530bdfb1eda0..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/assets/images/robot.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/assets/images/tomato.png b/proprietary/frameworks/base/tests/content/assets/images/tomato.png
deleted file mode 100755
index 44c590de018705fec49f9fe1d034681097b90e7f..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/assets/images/tomato.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/assets/jarsigned.zip b/proprietary/frameworks/base/tests/content/assets/jarsigned.zip
deleted file mode 100755
index 8b1ef8bddb23751822eb3e6a2ddd5309310500d3..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/assets/jarsigned.zip and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/assets/noiseandchirps b/proprietary/frameworks/base/tests/content/assets/noiseandchirps
deleted file mode 100755
index a819efcd86e325674711ad691b8c61ec5da697f4..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/assets/noiseandchirps and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/assets/noiseandchirps.mp3 b/proprietary/frameworks/base/tests/content/assets/noiseandchirps.mp3
deleted file mode 100755
index a819efcd86e325674711ad691b8c61ec5da697f4..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/assets/noiseandchirps.mp3 and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/assets/noiseandchirps.ogg b/proprietary/frameworks/base/tests/content/assets/noiseandchirps.ogg
deleted file mode 100755
index 1acb643decf10d3d96547f4f2dcaf547c114aa10..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/assets/noiseandchirps.ogg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/assets/noiseandchirps.wrong b/proprietary/frameworks/base/tests/content/assets/noiseandchirps.wrong
deleted file mode 100755
index a819efcd86e325674711ad691b8c61ec5da697f4..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/assets/noiseandchirps.wrong and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/assets/otacerts.zip b/proprietary/frameworks/base/tests/content/assets/otacerts.zip
deleted file mode 100755
index 937a128baf61ee1a6ae353e5e2cbc598c4a70cb1..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/assets/otacerts.zip and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/assets/otasigned.zip b/proprietary/frameworks/base/tests/content/assets/otasigned.zip
deleted file mode 100755
index a6bc53e4127e5d23532c9614546f99c0b927d834..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/assets/otasigned.zip and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/assets/random.zip b/proprietary/frameworks/base/tests/content/assets/random.zip
deleted file mode 100755
index 18c0b3b9f777fd9cb2505d93345c27bbddf7b038..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/assets/random.zip and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/assets/ringer.mp3 b/proprietary/frameworks/base/tests/content/assets/ringer.mp3
deleted file mode 100755
index aa052e719712e56eae8e87f4b4a329f2090a0d9b..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/assets/ringer.mp3 and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/assets/samplefont.ttf b/proprietary/frameworks/base/tests/content/assets/samplefont.ttf
deleted file mode 100755
index 49f1c620b548e3abd34cf3bd8f0fd73b86b0199e..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/assets/samplefont.ttf and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/assets/sphere.a3d b/proprietary/frameworks/base/tests/content/assets/sphere.a3d
deleted file mode 100755
index 3d78b0195f27068151ad225451af57ffb8c8c464..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/assets/sphere.a3d and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/assets/text.txt b/proprietary/frameworks/base/tests/content/assets/text.txt
deleted file mode 100755
index 3d8c5195bffcf0a36aec4727d59d344b722fa2e9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/text.txt
+++ /dev/null
@@ -1 +0,0 @@
-OneTwoThreeFourFiveSixSevenEightNineTen
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/content/assets/unsigned.zip b/proprietary/frameworks/base/tests/content/assets/unsigned.zip
deleted file mode 100755
index 24e3eadacdf88d2d0f77d39463b9479514ea64f3..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/assets/unsigned.zip and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/embedded_image.html b/proprietary/frameworks/base/tests/content/assets/webkit/embedded_image.html
deleted file mode 100755
index e41fa700bdaf26444214cfc1363c86f1c12f4f31..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/embedded_image.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>test image</title>
-    </head>
-    <body>
-        <img src="../images/robot.png" alt="robot" />
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/favicon.png b/proprietary/frameworks/base/tests/content/assets/webkit/favicon.png
deleted file mode 100755
index fb795a0e7cf9779961419c5736644d3d02f9ff78..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/assets/webkit/favicon.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/fonts.html b/proprietary/frameworks/base/tests/content/assets/webkit/fonts.html
deleted file mode 100755
index aefd0770876e64e6c466e259fb43a61b879a5e92..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/fonts.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-        <title>Font test page</title>
-    </head>
-    <body>
-        <font face="Standard">Standard ABCdef123</font><br/>
-        <font face="Fixed">Fixed ABCdef123</font><br/>
-        <font face="Sans-Serif">Sans Serif ABCdef123</font><br/>
-        <font face="Serif">Serif ABCdef123</font><br/>
-        <font face="Cursive">Cursive ABCdef123</font><br/>
-        <font face="Fantasy">Fantasy ABCdef123</font><br/>
-    </body>
-</html>
-
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/javascript.html b/proprietary/frameworks/base/tests/content/assets/webkit/javascript.html
deleted file mode 100755
index 551931a619cd84b7c71568b30fac5bb112cc9fd5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/javascript.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>javascript off</title>
-    </head>
-    <script type="text/javascript">
-        function changeTitle() {
-            document.title = "javascript on";
-         }
-    </script>
-    <body onload="changeTitle()">
-        Javascript test
-    </body>
-</html>
-
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/jsalert.html b/proprietary/frameworks/base/tests/content/assets/webkit/jsalert.html
deleted file mode 100755
index c4b35fafbae73391e83a3059d3b27f8c137db283..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/jsalert.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>javascript alert</title>
-    </head>
-    <script type="text/javascript">
-        function fireAlert() {
-            alert("testOnJsAlert");
-        }
-    </script>
-    <body onload="fireAlert()">
-        javascript alert test
-    </body>
-</html>
-
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/jsconfirm.html b/proprietary/frameworks/base/tests/content/assets/webkit/jsconfirm.html
deleted file mode 100755
index 720c5de1e13d3be5c759af42c4d1ff72d24967d6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/jsconfirm.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>javascript confirm</title>
-    </head>
-    <script type="text/javascript">
-        function fireConfirm() {
-            var res = confirm("testOnJsConfirm");
-            if (res == true) {
-                document.title = "OK";
-            } else {
-                document.title = "Cancel";
-            }
-        }
-    </script>
-    <body onload="fireConfirm()">
-        javascript confirm test
-    </body>
-</html>
-
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/jsform.html b/proprietary/frameworks/base/tests/content/assets/webkit/jsform.html
deleted file mode 100755
index 4f04b29caaa923b4c267ec3953809dd8718e7dce..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/jsform.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>javascript form</title>
-    </head>
-    <script type="text/javascript">
-        function fireSubmit() {
-            if (location.hash == "") {
-                document.getElementById("formId").submit();
-            }
-        }
-    </script>
-    <body onload="window.setTimeout(function() { fireSubmit(); }, 1000);">
-        javascript form test
-        <form id="formId" action="test.html#result" method="post">
-            <input type="hidden" name="foo" value="bar" />
-        </form>
-    </body>
-</html>
-
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/jsprompt.html b/proprietary/frameworks/base/tests/content/assets/webkit/jsprompt.html
deleted file mode 100755
index a6b7d57e97d8bdeb0d97cb4769c4d942d5a5692f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/jsprompt.html
+++ /dev/null
@@ -1,31 +0,0 @@
-
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>javascript prompt</title>
-    </head>
-    <script type="text/javascript">
-        function firePrompt() {
-            var res = prompt("testOnJsPrompt");
-            document.title = res;
-        }
-    </script>
-    <body onload="firePrompt()">
-        javascript prompt test
-    </body>
-</html>
-
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/jsunload.html b/proprietary/frameworks/base/tests/content/assets/webkit/jsunload.html
deleted file mode 100755
index fb0673e0acbc8c5dea47baf12019419d39b90c12..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/jsunload.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>javascript unload</title>
-    </head>
-    <script type="text/javascript">
-        function fireUnload() {
-            return "testOnJsBeforeUnload";
-        }
-        window.onbeforeunload = fireUnload;
-    </script>
-    <body>
-        javascript unload test
-    </body>
-</html>
-
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/jswindow.html b/proprietary/frameworks/base/tests/content/assets/webkit/jswindow.html
deleted file mode 100755
index 7075d6ee0c38d1bc92ce25d2c52cf797ca252fd2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/jswindow.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>javascript window</title>
-    </head>
-    <script type="text/javascript">
-        var childWindow;
-        function fireOpen() {
-            childWindow = window.open();
-            childWindow.document.title = "javascript child window";
-            childWindow.document.write("javascript child window");
-            setTimeout(function(){childWindow.close();}, 2000);
-        }
-    </script>
-    <body onload="fireOpen()">
-        javascript window test
-    </body>
-</html>
-
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/network_state.html b/proprietary/frameworks/base/tests/content/assets/webkit/network_state.html
deleted file mode 100755
index 4712b83b85d15da4ea223db00a5a54deea722162..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/network_state.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>uninitialized</title>
-        <script type="text/javascript">
-            function getNetworkState() {
-                if (navigator.onLine) {
-                    document.title = "ONLINE";
-                } else {
-                    document.title = "OFFLINE";
-                }
-            }
-        </script>
-    </head>
-    <body onload="getNetworkState()" ononline="getNetworkState()" onoffline="getNetworkState()">
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/popup.html b/proprietary/frameworks/base/tests/content/assets/webkit/popup.html
deleted file mode 100755
index b5ed6715fc6a40d87cad4f8ef9b34a3a43bf927b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/popup.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>Popup allowed</title>
-    </head>
-    <body>
-        Popup allowed
-    </body>
-</html>
-
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/popup_base.html b/proprietary/frameworks/base/tests/content/assets/webkit/popup_base.html
deleted file mode 100755
index 6c6e7eb07f76590839dbf20120f3242a192f6660..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/popup_base.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title></title>
-    </head>
-    <script type="text/javascript">
-        function openWindow() {
-            newWindow = window.open("popup.html");
-            if (!newWindow) {
-                document.title = "Popup blocked";
-            }
-         }
-    </script>
-    <body onload="openWindow()">
-        Popup blocked
-    </body>
-</html>
-
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/test_anchor.html b/proprietary/frameworks/base/tests/content/assets/webkit/test_anchor.html
deleted file mode 100755
index fc5047d602dc830b5f103c95320702902ac43ace..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/test_anchor.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-  <head>
-    <title>PASSING QUERY PARAM FAILED</title>
-  </head>
-  <body>
-    <script>
-      document.title = self.document.location.hash.substring(1);
-    </script>
-  </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/test_blankPage.html b/proprietary/frameworks/base/tests/content/assets/webkit/test_blankPage.html
deleted file mode 100755
index fbe282d225990126a5acc213b9b9a9885846cc33..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/test_blankPage.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>Blank page</title>
-    </head>
-    <body>
-    <div style="height:100px;width:100px">&nbsp;</div>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/test_br_tag.html b/proprietary/frameworks/base/tests/content/assets/webkit/test_br_tag.html
deleted file mode 100755
index 39eb2fa2530b1b223c2df905ee86e4c26760af0b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/test_br_tag.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>test br tag</title>
-    </head>
-    <body>
-        <h3>testing br tag</h3>
-        <p>
-            there is a br after line1<br>line2
-        </p>
-        <p>
-            there are two brs after line3<br><br>line 4
-        </p>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/test_databaseaccess.html b/proprietary/frameworks/base/tests/content/assets/webkit/test_databaseaccess.html
deleted file mode 100755
index dcf7b098f91db3c77fde4b59f1c52b4176f78436..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/test_databaseaccess.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head><title>None</title><script>
-        function checkDatabase() {
-            if ('openDatabase' in window) {
-                var db = window.openDatabase('test', '1.0', 'results', 1*1024*1024);
-            }
-            document.title = db ? "Has database" : "No database";
-        }
-    </script></head>
-    <body onload='checkDatabase()'>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/test_favicon.html b/proprietary/frameworks/base/tests/content/assets/webkit/test_favicon.html
deleted file mode 100755
index 902a2771433bb12ac0aa574fb31316a07aac52a6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/test_favicon.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>test favicon</title>
-        <link rel="icon" type="image/png" href="favicon.png">
-    </head>
-    <body>
-        <h3>hello favicon!</h3><br>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/test_firstPage.html b/proprietary/frameworks/base/tests/content/assets/webkit/test_firstPage.html
deleted file mode 100755
index 18a55488b7e94477d0e9eb426dc20702511dca5b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/test_firstPage.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <title>First page</title>
-    <body>
-        <h1>First page</h1>
-        <a href="webView_goBackAndForward_test_secondPage.html">Go to second page</a>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/test_hello_world.html b/proprietary/frameworks/base/tests/content/assets/webkit/test_hello_world.html
deleted file mode 100755
index 7750a0f28fe8c0c200a199dd8416971058e37cd1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/test_hello_world.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>test hello world</title>
-    </head>
-    <body>
-        <h3>hello world!</h3><br>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/test_iframeaccess.html b/proprietary/frameworks/base/tests/content/assets/webkit/test_iframeaccess.html
deleted file mode 100755
index 1b5fc5abd6ead43411ca26b9c00e4b40090e06e2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/test_iframeaccess.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>DEFAULT TITLE</title>
-        <script type="text/javascript">
-          function load() {
-            document.title = document.getElementById('frame').contentWindow.location.href;
-          }
-         </script>
-    </head>
-    <body onload="load()">
-      <iframe id="frame" src="./test_hello_world.html"></iframe>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/test_imageaccess.html b/proprietary/frameworks/base/tests/content/assets/webkit/test_imageaccess.html
deleted file mode 100755
index ce76c830eb55fbde08dd353a0c54f19ce1084109..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/test_imageaccess.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>TEST FAILED</title>
-    </head>
-    <body>
-        <img id='img' src="../images/tomato.png" onload="success()" />
-        <script>
-            function success() {
-              document.title=document.getElementById('img').naturalHeight;
-            }
-        </script>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/test_jsInterface.html b/proprietary/frameworks/base/tests/content/assets/webkit/test_jsInterface.html
deleted file mode 100755
index 662dfe03590f5e5def6992f13fdb0abe8f54d6ea..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/test_jsInterface.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <title>Original title</title>
-    <!-- Calls into the javascript interface for the activity -->
-    <body onload='window.dummy.provideResult(document.title)'>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/test_queryparam.html b/proprietary/frameworks/base/tests/content/assets/webkit/test_queryparam.html
deleted file mode 100755
index 68b54e44e0ba8fd731cb7b4fd1588ca9a9221834..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/test_queryparam.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-  <head>
-    <title>PASSING QUERY PARAM FAILED</title>
-  </head>
-  <body>
-    <script>
-      query = window.location.search.substring(1);
-      args = query.split('&');
-      param = new Array();
-      for (var i = 0; i < args.length; i++) {
-        tokens = args[i].split('=');
-        param[tokens[0]]=tokens[1];
-      }
-      if (param['val']) document.title = param['val'];
-    </script>
-  </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/test_secondPage.html b/proprietary/frameworks/base/tests/content/assets/webkit/test_secondPage.html
deleted file mode 100755
index ea8e2a18111c4478af08682d316d413c3a6d9e2c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/test_secondPage.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <title>Second page</title>
-    <body>
-        <h1>Second page</h1>
-        <a href="webView_goBackAndForward_test_thirdPage.html">Go to third page</a>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/test_stop_loading.html b/proprietary/frameworks/base/tests/content/assets/webkit/test_stop_loading.html
deleted file mode 100755
index 1f0fc726661c23f6616eaa3295d1dcbbd7500af8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/test_stop_loading.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>Stop Loading test</title>
-    </head>
-    <body onload="window.javabridge.pageLoaded()">
-        <h3>hello world!</h3><br>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/test_thirdPage.html b/proprietary/frameworks/base/tests/content/assets/webkit/test_thirdPage.html
deleted file mode 100755
index 1784c3203b824333f91a1e754fd1dc0a17d10de0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/test_thirdPage.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <title>Third page</title>
-    <body>
-        <h1>Third page</h1>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/content/assets/webkit/test_timer.html b/proprietary/frameworks/base/tests/content/assets/webkit/test_timer.html
deleted file mode 100755
index 5e8496fd39b72f4a5435112d8fdebf1ccef66f41..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/assets/webkit/test_timer.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>0</title>
-        <script type="text/javascript">
-            var counter = 0;
-
-            function updateTitle() {
-                counter += 1;
-                document.title = counter;
-                document.getElementById("COUNTER").innerHTML = counter;
-            }
-
-            function startTimer() {
-                setInterval('updateTitle()', 1000);
-            }
-        </script>
-    </head>
-    <body onload="startTimer()">
-    Timer test <span id="COUNTER">0</span>.
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/content/res/anim/accelerate_alpha.xml b/proprietary/frameworks/base/tests/content/res/anim/accelerate_alpha.xml
deleted file mode 100755
index 594652b4bbf4f303885f11c4e122439b0dee0c27..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/anim/accelerate_alpha.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/accelerate_interpolator"
-    android:fromAlpha="0.1"
-    android:toAlpha="0.9"
-    android:duration="1000" />
diff --git a/proprietary/frameworks/base/tests/content/res/anim/accelerate_decelerate_alpha.xml b/proprietary/frameworks/base/tests/content/res/anim/accelerate_decelerate_alpha.xml
deleted file mode 100755
index 7c892b2190eb48f36e5f413cfd4faf7331361603..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/anim/accelerate_decelerate_alpha.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
-    android:fromAlpha="0.0"
-    android:toAlpha="1.0"
-    android:duration="2000" />
diff --git a/proprietary/frameworks/base/tests/content/res/anim/alpha.xml b/proprietary/frameworks/base/tests/content/res/anim/alpha.xml
deleted file mode 100755
index 8893d6606829ed2fa737e86e23d8da45ce2f4b61..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/anim/alpha.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-       android:fromAlpha="0.0"
-       android:toAlpha="1.0"
-       android:duration="500" />
diff --git a/proprietary/frameworks/base/tests/content/res/anim/anim_alpha.xml b/proprietary/frameworks/base/tests/content/res/anim/anim_alpha.xml
deleted file mode 100755
index b5794c31c926511b935d2504975b5b09b83cc530..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/anim/anim_alpha.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-       android:interpolator="@android:anim/accelerate_interpolator"
-       android:fromAlpha="0.0"
-       android:toAlpha="1.0"
-       android:duration="500" />
-
diff --git a/proprietary/frameworks/base/tests/content/res/anim/anim_gridlayout.xml b/proprietary/frameworks/base/tests/content/res/anim/anim_gridlayout.xml
deleted file mode 100755
index be42d76e474331c70a489e8541a43bf209647cdd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/anim/anim_gridlayout.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<gridLayoutAnimation xmlns:android="http://schemas.android.com/apk/res/android"
-        android:delay="10%"
-        android:rowDelay="50%"
-        android:directionPriority="column"
-        android:animation="@anim/anim_alpha" />
diff --git a/proprietary/frameworks/base/tests/content/res/anim/anim_rotate.xml b/proprietary/frameworks/base/tests/content/res/anim/anim_rotate.xml
deleted file mode 100755
index 4fbadcff6130d3254556b91f13ec5ecf15d0d4be..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/anim/anim_rotate.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/decelerate_interpolator"
-    android:fromDegrees="0"
-    android:toDegrees="-45"
-    android:toYScale="0.0"
-    android:pivotX="50%"
-    android:pivotY="50%"
-    android:duration="700" />
diff --git a/proprietary/frameworks/base/tests/content/res/anim/anim_scale.xml b/proprietary/frameworks/base/tests/content/res/anim/anim_scale.xml
deleted file mode 100755
index 96a3e28e13317d980e7bac1769b858c259135ef8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/anim/anim_scale.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<scale xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
-    android:fromXScale="1.0"
-    android:toXScale="1.4"
-    android:fromYScale="1.0"
-    android:toYScale="0.6"
-    android:pivotX="50%"
-    android:pivotY="50%"
-    android:fillAfter="false"
-    android:duration="600" />
diff --git a/proprietary/frameworks/base/tests/content/res/anim/anim_set.xml b/proprietary/frameworks/base/tests/content/res/anim/anim_set.xml
deleted file mode 100755
index 7d139a8947b0a5988732b8edb057326ce0799abe..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/anim/anim_set.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false">
-
-    <scale
-        android:interpolator="@android:anim/accelerate_decelerate_interpolator"
-        android:fromXScale="1.0"
-        android:toXScale="1.4"
-        android:fromYScale="1.0"
-        android:toYScale="0.6"
-        android:pivotX="50%"
-        android:pivotY="50%"
-        android:fillAfter="false"
-        android:duration="900" />
-
-    <set
-        android:interpolator="@android:anim/accelerate_interpolator"
-                android:startOffset="700">
-
-        <scale
-            android:fromXScale="1.4"
-            android:toXScale="0.0"
-            android:fromYScale="0.6"
-            android:toYScale="0.0"
-            android:pivotX="50%"
-            android:pivotY="50%"
-            android:duration="400" />
-
-        <rotate
-            android:fromDegrees="0"
-            android:toDegrees="-45"
-            android:toYScale="0.0"
-            android:pivotX="50%"
-            android:pivotY="50%"
-            android:duration="400" />
-    </set>
-
-</set>
diff --git a/proprietary/frameworks/base/tests/content/res/anim/anim_translate.xml b/proprietary/frameworks/base/tests/content/res/anim/anim_translate.xml
deleted file mode 100755
index 6659c2bafff5ccefd910edafa7df95dddcfb3ec3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/anim/anim_translate.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/accelerate_interpolator"
-    android:fromXDelta="100%p"
-    android:toXDelta="0"
-    android:fromYDelta="100%p"
-    android:toYDelta="0"
-    android:duration="800" />
diff --git a/proprietary/frameworks/base/tests/content/res/anim/cycle_alpha.xml b/proprietary/frameworks/base/tests/content/res/anim/cycle_alpha.xml
deleted file mode 100755
index 0a3b53c8d88d88d45f65f535e22910607e7a65c1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/anim/cycle_alpha.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-       android:interpolator="@anim/cycle_interpolator"
-       android:fromAlpha="0.0"
-       android:toAlpha="1.0"
-       android:duration="2000" />
diff --git a/proprietary/frameworks/base/tests/content/res/anim/cycle_interpolator.xml b/proprietary/frameworks/base/tests/content/res/anim/cycle_interpolator.xml
deleted file mode 100755
index d1586e5301ad636f7660a4d34652d32a369b3a6e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/anim/cycle_interpolator.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
- <cycleInterpolator xmlns:android="http://schemas.android.com/apk/res/android" android:cycles="1" />
diff --git a/proprietary/frameworks/base/tests/content/res/anim/decelerate_alpha.xml b/proprietary/frameworks/base/tests/content/res/anim/decelerate_alpha.xml
deleted file mode 100755
index 793807ee9831a1f629451c51c57d1273cc59ee00..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/anim/decelerate_alpha.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/decelerate_interpolator"
-    android:fromAlpha="0.0"
-    android:toAlpha="1.0"
-    android:duration="2000" />
diff --git a/proprietary/frameworks/base/tests/content/res/anim/layout_anim_controller_animation.xml b/proprietary/frameworks/base/tests/content/res/anim/layout_anim_controller_animation.xml
deleted file mode 100755
index 1e3608c6fb1dc042e7a15a6dd2080eb091f70149..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/anim/layout_anim_controller_animation.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-       android:interpolator="@android:anim/accelerate_interpolator"
-       android:fillAfter="true"
-       android:fromAlpha="0.0"
-       android:toAlpha="1.0"
-       android:duration="1000" />
diff --git a/proprietary/frameworks/base/tests/content/res/anim/lineartest.xml b/proprietary/frameworks/base/tests/content/res/anim/lineartest.xml
deleted file mode 100755
index 7a4162889ef54ce2c850e58227d3e055336d4fe9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/anim/lineartest.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<screenplay>
-     <paint id="paint" antiAlias="true">
-         <color id="col" color="gray"/>
-     </paint>
-     <event kind="onLoad">
-         <add id="addPaint" use="paint"/>
-         <text y="15" text="hello"/>
-     </event>
-     <event kind="keyPress" code="up">
-         <apply scope="addPaint">
-             <set target="paint" field="linearText" to="true"/>
-             <set target="col" field="color" to="black"/>
-             <animate target="paint" id="grow" field="textSize" from="12" to="15" dur=".25"/>
-         </apply>
-     </event>
-     <event kind="onEnd" target="grow">
-         <apply scope="addPaint">
-             <set target="paint" field="linearText" to="false"/>
-         </apply>
-     </event>
-     <event kind="keyPress" code="down">
-         <apply scope="addPaint">
-             <set target="col" field="color" to="gray"/>
-             <animate target="paint" id="shrink" field="textSize" from="15" to="12" dur=".25"/>
-         </apply>
-     </event>
-     <event kind="onEnd" target="shrink">
-         <apply scope="addPaint">
-             <set target="paint" field="linearText" to="false"/>
-         </apply>
-     </event>
- </screenplay>
diff --git a/proprietary/frameworks/base/tests/content/res/anim/move_ani.xml b/proprietary/frameworks/base/tests/content/res/anim/move_ani.xml
deleted file mode 100755
index b691c0d226c98ec149d80996d3119b7fb8130af8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/anim/move_ani.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-           android:fromXDelta="0"
-           android:toXDelta="4"
-           android:duration="2000"
-           android:interpolator="@anim/move_cycle" />
diff --git a/proprietary/frameworks/base/tests/content/res/anim/move_cycle.xml b/proprietary/frameworks/base/tests/content/res/anim/move_cycle.xml
deleted file mode 100755
index 2e2233a3a7c1bd77b59a90398e6defbd41d7f862..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/anim/move_cycle.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<cycleInterpolator xmlns:android="http://schemas.android.com/apk/res/android" android:cycles="20" />
diff --git a/proprietary/frameworks/base/tests/content/res/anim/movie_test.xml b/proprietary/frameworks/base/tests/content/res/anim/movie_test.xml
deleted file mode 100755
index dcebd16c065ea547ad0f5a54f8cc7a8826bac527..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/anim/movie_test.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<screenplay>
-    <event kind="onLoad">
-        <movie src="lineartest.xml"/>
-    </event>
-</screenplay>
diff --git a/proprietary/frameworks/base/tests/content/res/color/color1.xml b/proprietary/frameworks/base/tests/content/res/color/color1.xml
deleted file mode 100755
index 87034fa2aeb0574083807f0c668fb7b20aecd698..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/color/color1.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true" android:color="@color/testcolor1"/>
-    <item android:color="@color/testcolor2"/>
-</selector>
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/animated.gif b/proprietary/frameworks/base/tests/content/res/drawable/animated.gif
deleted file mode 100755
index 51baf1586394be7feae3bd475fb31e96f47c0f86..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/animated.gif and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/animationdrawable.xml b/proprietary/frameworks/base/tests/content/res/drawable/animationdrawable.xml
deleted file mode 100755
index 67569661b187f4b241ff459d97a5cbee00a9f9bb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/drawable/animationdrawable.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android" android:oneshot="false">
-    <item android:drawable="@drawable/testimage" android:duration="3000"/>
-    <item android:drawable="@drawable/pass" android:duration="2000"/>
-    <item android:drawable="@drawable/scenery" android:duration="1000"/>
-</animation-list>
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/baseline_jpeg.jpg b/proprietary/frameworks/base/tests/content/res/drawable/baseline_jpeg.jpg
deleted file mode 100755
index ed5251c846b9832d4984aa575d9ee8369e6f6681..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/baseline_jpeg.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/baseline_restart_jpeg.jpg b/proprietary/frameworks/base/tests/content/res/drawable/baseline_restart_jpeg.jpg
deleted file mode 100755
index 00dcc5b2eae25bc6bc830a464c497dad296f9e78..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/baseline_restart_jpeg.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/bmp_test.bmp b/proprietary/frameworks/base/tests/content/res/drawable/bmp_test.bmp
deleted file mode 100755
index 5ec6dd4d93bc0dfda5810fdc9ed43fba2beb4559..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/bmp_test.bmp and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/colordrawable_test.xml b/proprietary/frameworks/base/tests/content/res/drawable/colordrawable_test.xml
deleted file mode 100755
index 9d2f390e6bf638744b2db72dca4e0d1aae791234..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/drawable/colordrawable_test.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<ColorDrawable xmlns:android="http://schemas.android.com/apk/res/android" android:color="#02000000">
-    <solid android:color="#02000000"/>
-</ColorDrawable>
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/colorstatelist_test.xml b/proprietary/frameworks/base/tests/content/res/drawable/colorstatelist_test.xml
deleted file mode 100755
index c86a1a78df2b0876a9e2c26229370622fd3fe4c6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/drawable/colorstatelist_test.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-   <item android:state_focused="true" android:color="@color/resource_test_color"/>
-   <item android:state_pressed="true" android:state_enabled="false" android:color="@color/resource_test_color"/>
-   <item android:state_enabled="false" android:color="@color/resource_test_color"/>
-   <item android:state_active="true" android:color="@color/resource_test_color"/>
-   <item android:color="@color/resource_test_color"/>
- </selector>
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/faces.jpg b/proprietary/frameworks/base/tests/content/res/drawable/faces.jpg
deleted file mode 100755
index 0672022bc4afa6e44ff83169d7d61a4dc3c5b960..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/faces.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/failed.jpg b/proprietary/frameworks/base/tests/content/res/drawable/failed.jpg
deleted file mode 100755
index 1bb9b5280f87d7350d43a24d5b8d7d0b89a8c908..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/failed.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/gif_test.gif b/proprietary/frameworks/base/tests/content/res/drawable/gif_test.gif
deleted file mode 100755
index d1c2815db8cf0b985684fc72b2c292a52c0ebf68..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/gif_test.gif and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/gradientdrawable.xml b/proprietary/frameworks/base/tests/content/res/drawable/gradientdrawable.xml
deleted file mode 100755
index ed8ff961a48b047bc68649963c5a9b602c46df15..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/drawable/gradientdrawable.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient android:startColor="#ffffffff" android:centerColor="#ffff0000"
-              android:endColor="#0000ffff" />
-    <corners android:radius="8px" />
-    <padding android:left="4px" android:top="2px"
-             android:right="6px" android:bottom="10px" />
-    <size android:width="42px" android:height="63px"/>
-</shape>
-
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/ic_cts_minitab_selected.png b/proprietary/frameworks/base/tests/content/res/drawable/ic_cts_minitab_selected.png
deleted file mode 100755
index c730050f1dfe4fa2d28d3c73dc2e04955fcf9e96..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/ic_cts_minitab_selected.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/ic_cts_selected.png b/proprietary/frameworks/base/tests/content/res/drawable/ic_cts_selected.png
deleted file mode 100755
index 72a065cb85f1f927a9893e0b468e235245688f89..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/ic_cts_selected.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/icon_black.jpg b/proprietary/frameworks/base/tests/content/res/drawable/icon_black.jpg
deleted file mode 100755
index 4c9062a6da91a533488f894e04f20a2e99376152..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/icon_black.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/icon_blue.jpg b/proprietary/frameworks/base/tests/content/res/drawable/icon_blue.jpg
deleted file mode 100755
index 9e6c1c86b1f544da8568e2918b008f4dcc35ba73..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/icon_blue.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/icon_green.jpg b/proprietary/frameworks/base/tests/content/res/drawable/icon_green.jpg
deleted file mode 100755
index 55a78f208295c8636282f47ae7fd17fbe4ce7af4..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/icon_green.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/icon_red.jpg b/proprietary/frameworks/base/tests/content/res/drawable/icon_red.jpg
deleted file mode 100755
index 6bc9e1ff608ba23d17cdcad9f39576b408cf6dc6..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/icon_red.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/icon_yellow.jpg b/proprietary/frameworks/base/tests/content/res/drawable/icon_yellow.jpg
deleted file mode 100755
index e74805906008dae8048faa82b439578e57bd75d4..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/icon_yellow.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/insetdrawable.xml b/proprietary/frameworks/base/tests/content/res/drawable/insetdrawable.xml
deleted file mode 100755
index 8431c69a65a2e2a007f71933c4ab729d42dcf407..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/drawable/insetdrawable.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/testimage"/>
-
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/layerdrawable.xml b/proprietary/frameworks/base/tests/content/res/drawable/layerdrawable.xml
deleted file mode 100755
index 521703b32caa2342b52a9d9240cbf3bb2f32a0ee..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/drawable/layerdrawable.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/testimage"/>
-    <item android:drawable="@drawable/start"/>
-</layer-list>
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/levellistdrawable.xml b/proprietary/frameworks/base/tests/content/res/drawable/levellistdrawable.xml
deleted file mode 100755
index 8fa93e89046dec16cd9b99909bbb4e37db3bda8e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/drawable/levellistdrawable.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:maxLevel="50" android:drawable="@drawable/testimage"/>
-    <item android:maxLevel="100" android:drawable="@drawable/start"/>
-</level-list>
-
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/ninepatch_0.9.png b/proprietary/frameworks/base/tests/content/res/drawable/ninepatch_0.9.png
deleted file mode 100755
index 24019d8fda78d106d1a1607d32a6a965adc1a792..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/ninepatch_0.9.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/ninepatch_1.9.png b/proprietary/frameworks/base/tests/content/res/drawable/ninepatch_1.9.png
deleted file mode 100755
index c56b1dbb14f2962d7c6257f1f5fb1efaa26bfd62..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/ninepatch_1.9.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/ninepatchdrawable.xml b/proprietary/frameworks/base/tests/content/res/drawable/ninepatchdrawable.xml
deleted file mode 100755
index 6e72457ade08ddac76abcfe24686f6e814e300d5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/drawable/ninepatchdrawable.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<nine-patch xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ninepatch_0"
-    android:dither="true"
-/>
-
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/opaque.9.png b/proprietary/frameworks/base/tests/content/res/drawable/opaque.9.png
deleted file mode 100755
index a60f6d84a475464cf9efd41a63188aa2294b9fd2..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/opaque.9.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/paintdrawable_attr.xml b/proprietary/frameworks/base/tests/content/res/drawable/paintdrawable_attr.xml
deleted file mode 100755
index 444e5e2f9c3190ee8819e0893e4b5d3ca8b0a294..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/drawable/paintdrawable_attr.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-<shape  xmlns:android="http://schemas.android.com/apk/res/android"
-        android:shape="rectangle">
-
-        <solid
-            android:color="#00000000"/>
-
-        <stroke
-            android:width="2dp"
-            android:color="#ff000000"/>
-
-        <padding
-            android:paddingLeft="1dp"
-            android:paddingRight="10dp"
-            android:paddingTop="1dp"
-            android:paddingBottom="10dp"/>
-
-        <corners
-            android:radius="9dp"
-            android:bottomRightRadius="8dp"
-            android:bottomLeftRadius="8dp"
-            android:topLeftRadius="0.5dp"
-            android:topRightRadius="0.5dp"/>
-
-</shape>
-
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/pass.jpg b/proprietary/frameworks/base/tests/content/res/drawable/pass.jpg
deleted file mode 100755
index 2f4b083c1890957c3e36a17225201c43eada7e49..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/pass.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/png_test.png b/proprietary/frameworks/base/tests/content/res/drawable/png_test.png
deleted file mode 100755
index 523005168f726942e59f502a9d2d3c1da86c16a8..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/png_test.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/premul_data.png b/proprietary/frameworks/base/tests/content/res/drawable/premul_data.png
deleted file mode 100755
index 92d7e376db271ea79e2f562f9ff8b428ebdb741d..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/premul_data.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/progressive_jpeg.jpg b/proprietary/frameworks/base/tests/content/res/drawable/progressive_jpeg.jpg
deleted file mode 100755
index 6b58be435ae5a0cf2473e24c6d01aee7639497f2..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/progressive_jpeg.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/progressive_restart_jpeg.jpg b/proprietary/frameworks/base/tests/content/res/drawable/progressive_restart_jpeg.jpg
deleted file mode 100755
index 352c7a82cbbeb222722cb782ac6c6a62eb9a44f1..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/progressive_restart_jpeg.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/robot.png b/proprietary/frameworks/base/tests/content/res/drawable/robot.png
deleted file mode 100755
index 8a9e6984be96ea93dcb63ae1973e530bdfb1eda0..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/robot.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/rotatedrawable.xml b/proprietary/frameworks/base/tests/content/res/drawable/rotatedrawable.xml
deleted file mode 100755
index b9b2cfe38c155d836d9aa3b06d14e4e8f97954d0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/drawable/rotatedrawable.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:pivotX="50%" android:pivotY="50%"
-    android:fromDegrees="0" android:toDegrees="360"
-    android:drawable="@drawable/testimage"/>
-
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/scaled1.png b/proprietary/frameworks/base/tests/content/res/drawable/scaled1.png
deleted file mode 100755
index 2dad42162456605cb23d57e868a8275bf564157a..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/scaled1.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/scaled2.png b/proprietary/frameworks/base/tests/content/res/drawable/scaled2.png
deleted file mode 100755
index 6d6a94f206c72ff97538c6c5a8255b208670f481..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/scaled2.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/scaledrawable.xml b/proprietary/frameworks/base/tests/content/res/drawable/scaledrawable.xml
deleted file mode 100755
index 7e65dce18ebbf1b13a38ae5a29eb57ebac55bca5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/drawable/scaledrawable.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<scale xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fromXScale="1.0"
-    android:toXScale="1.4"
-    android:fromYScale="1.0"
-    android:toYScale="0.6"
-    android:drawable="@drawable/testimage"/>
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/scenery.jpg b/proprietary/frameworks/base/tests/content/res/drawable/scenery.jpg
deleted file mode 100755
index 7a6145b39348dcdf5481ee58d8640f450742a9c9..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/scenery.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/shapedrawable_test.xml b/proprietary/frameworks/base/tests/content/res/drawable/shapedrawable_test.xml
deleted file mode 100755
index 02da9f8428f59e2a185bca778b4f0b20d6b62cc3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/drawable/shapedrawable_test.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<MockShapeDrawable xmlns:android="http://schemas.android.com/apk/res/android"
-       android:color="#00000000" android:width="42px" android:height="63px">
-    <padding android:left="1px" android:top="2px" android:right="3px" android:bottom="4px"/>
-    <testattrs android:id="@id/background"/>
-</MockShapeDrawable>
-
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/size_48x48.jpg b/proprietary/frameworks/base/tests/content/res/drawable/size_48x48.jpg
deleted file mode 100755
index 5c2291e3e580c9b6bfbafccd6f75ea472ecf6141..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/size_48x48.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/start.jpg b/proprietary/frameworks/base/tests/content/res/drawable/start.jpg
deleted file mode 100755
index 54e05e0d4b238bf9a5a1f4a54161b3331f8c0554..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/start.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/statelistdrawable.xml b/proprietary/frameworks/base/tests/content/res/drawable/statelistdrawable.xml
deleted file mode 100755
index 9d9aa3b0c392dd1e2f543e50aa5fcfc72c6df9fe..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/drawable/statelistdrawable.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-   <item android:state_focused="true" android:drawable="@drawable/testimage"/>
-   <item android:state_enabled="false" android:drawable="@drawable/testimage"/>
-</selector>
-
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/testcolor.xml b/proprietary/frameworks/base/tests/content/res/drawable/testcolor.xml
deleted file mode 100755
index d7b2718f6c9e931b9d8eb57f6591bca818a33225..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/drawable/testcolor.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="#FFA6C839"/>
-</selector>
-
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/testimage.jpg b/proprietary/frameworks/base/tests/content/res/drawable/testimage.jpg
deleted file mode 100755
index 754df0ce5502e79ac8a7c114901b4dcfe7aa9104..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/testimage.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/transition_test.xml b/proprietary/frameworks/base/tests/content/res/drawable/transition_test.xml
deleted file mode 100755
index 3d62378f04b2ccbefbcd523c55aecd3d4f0772db..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/drawable/transition_test.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<transition xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item >
-        <color android:color="#ffff0000" />
-    </item>
-
-    <item >
-        <color android:color="#ff0000ff" />
-    </item>
-</transition>
-
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/transparent_border.9.png b/proprietary/frameworks/base/tests/content/res/drawable/transparent_border.9.png
deleted file mode 100755
index 2614c06be5aa71f2a1d14e5e7ecc92dd4b62f27d..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/transparent_border.9.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/transparent_right.9.png b/proprietary/frameworks/base/tests/content/res/drawable/transparent_right.9.png
deleted file mode 100755
index a438312a48f4c7eeaa5ec4635f53c1758907e614..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/transparent_right.9.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/typeface_test.png b/proprietary/frameworks/base/tests/content/res/drawable/typeface_test.png
deleted file mode 100755
index c337f5f6ac0d6d03f22ce4a68edda6a8039cf447..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/typeface_test.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/webp_test.webp b/proprietary/frameworks/base/tests/content/res/drawable/webp_test.webp
deleted file mode 100755
index 7b1009f0d90efb043899882011447c304332dc71..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/drawable/webp_test.webp and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/drawable/window_test_drawable.xml b/proprietary/frameworks/base/tests/content/res/drawable/window_test_drawable.xml
deleted file mode 100755
index 4281cd81fad3ac00114806d80573027c21efad3a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/drawable/window_test_drawable.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#00000000"/>
-    <stroke android:width="2dp" android:color="#ff000000"/>
-    <padding android:left="1dp" android:top="1dp"
-            android:right="1dp" android:bottom="1dp" />
-</shape>
diff --git a/proprietary/frameworks/base/tests/content/res/layout-land/mediaplayer.xml b/proprietary/frameworks/base/tests/content/res/layout-land/mediaplayer.xml
deleted file mode 100755
index 5dafdb9c9624403f416e5d5b79a48e71af639524..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout-land/mediaplayer.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <SurfaceView android:id="@+id/surface"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1">
-    </SurfaceView>
-
-    <SurfaceView android:id="@+id/surface2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1">
-    </SurfaceView>
-
-    <SurfaceView android:id="@+id/surface3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1">
-    </SurfaceView>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/abslistview_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/abslistview_layout.xml
deleted file mode 100755
index a090ce34c82768561fff64d8c5f8270e9ae0179e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/abslistview_layout.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ViewGroup_Layout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/abslistview_root"
-    android:layout_width="25px"
-    android:layout_height="25px" >
-
-   <GridView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-   <ListView>
-        <TextView
-            android:text="@string/table_layout_first"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_second"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_third"
-            android:padding="3dip" />
-    </ListView>
-</ViewGroup_Layout>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/absolute_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/absolute_layout.xml
deleted file mode 100755
index 6cec61bb270dd416a669b17981c5f55a7f70f440..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/absolute_layout.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <AbsoluteLayout
-        android:id="@+id/absolute_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_x="1dip"
-        android:layout_y="2dip">
-
-        <TextView
-            android:id="@+id/absolute_textview"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_x="10dip"
-            android:layout_y="20dip"
-            android:background="@drawable/red"
-            android:text="@string/hello_world"/>
-
-    </AbsoluteLayout>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/adapterview_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/adapterview_layout.xml
deleted file mode 100755
index e118500e4a111e38671041e8405bc2fb3db3ec3c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/adapterview_layout.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/adapterview_tv"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/alert_dialog_text_entry.xml b/proprietary/frameworks/base/tests/content/res/layout/alert_dialog_text_entry.xml
deleted file mode 100755
index 8b87a5d5e5b9e067b6e31f77a271d508a1155f18..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/alert_dialog_text_entry.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/username_view"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginLeft="20dip"
-        android:layout_marginRight="20dip"
-        android:text="@string/alert_dialog_username"
-        android:gravity="left"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <EditText
-        android:id="@+id/username_edit"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_marginLeft="20dip"
-        android:layout_marginRight="20dip"
-        android:scrollHorizontally="true"
-        android:autoText="false"
-        android:capitalize="none"
-        android:gravity="fill_horizontal"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <TextView
-        android:id="@+id/password_view"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginLeft="20dip"
-        android:layout_marginRight="20dip"
-        android:text="@string/alert_dialog_password"
-        android:gravity="left"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <EditText
-        android:id="@+id/password_edit"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_marginLeft="20dip"
-        android:layout_marginRight="20dip"
-        android:scrollHorizontally="true"
-        android:autoText="false"
-        android:capitalize="none"
-        android:gravity="fill_horizontal"
-        android:password="true"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/alert_dialog_text_entry_2.xml b/proprietary/frameworks/base/tests/content/res/layout/alert_dialog_text_entry_2.xml
deleted file mode 100755
index 848b3424aae2337981668f26762efd11de982f95..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/alert_dialog_text_entry_2.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/username_view"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginLeft="20dip"
-        android:layout_marginRight="20dip"
-        android:text="@string/alert_dialog_username"
-        android:gravity="left" />
-
-    <EditText
-        android:id="@+id/username_edit"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_marginLeft="20dip"
-        android:layout_marginRight="20dip"
-        android:scrollHorizontally="true"
-        android:autoText="false"
-        android:capitalize="none"
-        android:gravity="fill_horizontal" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/alertdialog_custom_title.xml b/proprietary/frameworks/base/tests/content/res/layout/alertdialog_custom_title.xml
deleted file mode 100755
index ff36f2a91674101f72bdc2c20c7c8be11f75e026..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/alertdialog_custom_title.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/alertdialog_custom_title"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_vertical|center_horizontal"
-    android:textAppearance="?android:attr/textAppearanceMedium"
-    android:text="@string/hello_world"/>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/alertdialog_custom_title2.xml b/proprietary/frameworks/base/tests/content/res/layout/alertdialog_custom_title2.xml
deleted file mode 100755
index 51c154d60c509b5e70b6ff0e0b1ba3d9bdcd124c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/alertdialog_custom_title2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/alertdialog_custom_title"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_vertical|center_horizontal"
-    android:text="@string/hello_android"/>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/analogclock.xml b/proprietary/frameworks/base/tests/content/res/layout/analogclock.xml
deleted file mode 100755
index 7d862c35611e9a68086cc41162ca563d0710e81a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/analogclock.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<AnalogClock android:id="@+id/clock"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="96dip"
-    android:layout_gravity="center_horizontal"
-    android:layout_height="wrap_content"/>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/anim_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/anim_layout.xml
deleted file mode 100755
index b6aa9066f1404628fe7005d40dbf5265cbe86fbb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/anim_layout.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:id="@+id/anim_window_parent">
-
-    <TextView android:id="@+id/anim_window"
-        android:layout_width="100dip"
-        android:layout_height="20dip"
-        android:text="@string/text_view_hello"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/animation_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/animation_layout.xml
deleted file mode 100755
index 13228d1495382e24fba1437dad20008249bb3481..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/animation_layout.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <ImageButton android:id="@+id/scenery"
-        android:src="@drawable/scenery"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"/>
-
-    <ImageButton android:id="@+id/start"
-        android:src="@drawable/start"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_below="@id/scenery"/>
-
-    <TextView android:id="@+id/explain"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="18sp"
-        android:autoText="true"
-        android:capitalize="sentences"
-        android:text="@string/explain"
-        android:layout_centerHorizontal="true"
-        android:layout_below="@id/start"/>
-
-    <LinearLayout android:id="@+id/button_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_centerHorizontal="true"
-        android:layout_alignParentBottom="true">
-
-        <ImageButton android:id="@+id/pass"
-            android:src="@drawable/pass"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="20px"/>
-
-        <ImageButton android:id="@+id/failed"
-            android:src="@drawable/failed"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="40px"/>
-
-    </LinearLayout>
-
-</RelativeLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/app_activity.xml b/proprietary/frameworks/base/tests/content/res/layout/app_activity.xml
deleted file mode 100755
index 8b7206f658999ea15c32691974d8f49fa6fcca0a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/app_activity.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<!-- Demonstrates receiving activity results.
-     See corresponding Java code com.android.sdk.app.ReceiveResult.java. -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
-    android:gravity="center_horizontal"
-    android:layout_width="match_parent" android:layout_height="match_parent">
-
-    <TextView
-        android:layout_width="match_parent" android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:paddingBottom="4dip"
-        android:text="@string/forwarding"/>
-
-    <Button android:id="@+id/go"
-        android:layout_width="wrap_content" android:layout_height="wrap_content"
-        android:text="@string/go">
-        <requestFocus />
-    </Button>
-
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/app_another.xml b/proprietary/frameworks/base/tests/content/res/layout/app_another.xml
deleted file mode 100755
index f4574a274b7588e7a66ab8ccdbc8818e0e7a6750..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/app_another.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<!-- Demonstrates receiving activity results.
-     See corresponding Java code com.android.sdk.app.ReceiveResult.java. -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
-    android:gravity="center_horizontal"
-    android:layout_width="match_parent" android:layout_height="match_parent">
-
-    <TextView
-        android:layout_width="match_parent" android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:paddingBottom="4dip"
-        android:text="@string/forwarding"/>
-
-    <Button android:id="@+id/back"
-        android:layout_width="wrap_content" android:layout_height="wrap_content"
-        android:text="@string/back">
-        <requestFocus />
-    </Button>
-
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/autocompletetextview_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/autocompletetextview_layout.xml
deleted file mode 100755
index be1d2845a8fb447cae7d13ff293b6bc7306a6e0a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/autocompletetextview_layout.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/autocompletetv_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/notify" />
-
-    <AutoCompleteTextView android:id="@+id/autocompletetv_edit"
-        android:completionThreshold="1"
-        android:completionHint="@string/tabs_1"
-        android:layout_width="match_parent" 
-        android:layout_height="wrap_content" />
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/available_intents_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/available_intents_layout.xml
deleted file mode 100755
index 5415657e741783adceb8658f1b0427645cdc998b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/available_intents_layout.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-    <TextView android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="4dip"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:text="@string/text_view_hello"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/checkbox_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/checkbox_layout.xml
deleted file mode 100755
index a1f17184557b3aaf4301c8fe6783779c2c80b0ea..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/checkbox_layout.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-    <CheckBox android:id="@+id/check_box"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/hello_world" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/checkedtextview_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/checkedtextview_layout.xml
deleted file mode 100755
index d5b9c1f9a3301cab8af17f278af95fdea2a61b00..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/checkedtextview_layout.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-    <ListView android:id="@+id/checkedtextview_listview"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    </ListView>
-
-    <CheckedTextView android:id="@+id/checkedtextview_test"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    </CheckedTextView>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/chronometer_stub_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/chronometer_stub_layout.xml
deleted file mode 100755
index 487f2f80abdfa87bd0325a19bf31ebf0858434ce..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/chronometer_stub_layout.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/screen"
-    android:layout_width="match_parent" android:layout_height="match_parent"
-    android:orientation="vertical">
-    <LinearLayout
-        android:id="@+id/chronometer_view_group"
-        android:layout_width="match_parent" android:layout_height="match_parent"
-        android:orientation="vertical">
-        <Chronometer
-            android:id="@+id/test_chronometer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/chronometer_text"
-            />
-    </LinearLayout>
-</ScrollView>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/context_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/context_layout.xml
deleted file mode 100755
index 6ec6c76804cc71bc9ae850457eb80223cc04d661..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/context_layout.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <DatePicker
-        android:id="@+id/contextdatepicker_dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true" />
-
-</RelativeLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/cursoradapter_group0.xml b/proprietary/frameworks/base/tests/content/res/layout/cursoradapter_group0.xml
deleted file mode 100755
index f6406868d39b723bb3f2e75477aea1099259ba87..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/cursoradapter_group0.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:id="@+id/cursorAdapter_group0">
-</ImageView>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/cursoradapter_group1.xml b/proprietary/frameworks/base/tests/content/res/layout/cursoradapter_group1.xml
deleted file mode 100755
index d1dfa3cf0de23cd8fdd82477ad0b8113950e2671..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/cursoradapter_group1.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:id="@+id/cursorAdapter_group1">
-</ImageView>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/cursoradapter_host.xml b/proprietary/frameworks/base/tests/content/res/layout/cursoradapter_host.xml
deleted file mode 100755
index 82ac72b21fac31a48b7dfd0676e67cbb37f7eec1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/cursoradapter_host.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/cursorAdapter_host">
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/cursoradapter_item0.xml b/proprietary/frameworks/base/tests/content/res/layout/cursoradapter_item0.xml
deleted file mode 100755
index 5ecd4968a909b3faa8e8fb3050a1d4fb2c319e29..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/cursoradapter_item0.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:id="@+id/cursorAdapter_item0">
-</TextView>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/cursoradapter_item1.xml b/proprietary/frameworks/base/tests/content/res/layout/cursoradapter_item1.xml
deleted file mode 100755
index 44037b0dae0738fcb05fa7831e8af1e87c4b5e5c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/cursoradapter_item1.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:id="@+id/cursorAdapter_item1">
-</TextView>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/datepicker.xml b/proprietary/frameworks/base/tests/content/res/layout/datepicker.xml
deleted file mode 100755
index 6a7b51c80ab7d4b3d3c8d21b0f477650e6db45b9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/datepicker.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <DatePicker android:id="@+id/datePicker1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:spinnersShown="false"
-                xmlns:android="http://schemas.android.com/apk/res/android">
-    </DatePicker>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/datepicker_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/datepicker_layout.xml
deleted file mode 100755
index 925674c43ced26d26e30283a9158a73e92b258b4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/datepicker_layout.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <DatePicker
-        android:id="@+id/datePicker_dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true" />
-
-</RelativeLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/dialerfilter_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/dialerfilter_layout.xml
deleted file mode 100755
index 46edbd71ecfc3cf547f65862910a55109643b0ea..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/dialerfilter_layout.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<DialerFilter android:id="@+id/dialer_filter"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <EditText android:id="@android:id/hint"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@android:drawable/editbox_background"/>
-
-    <EditText android:id="@android:id/primary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@android:id/hint"/>
-
-</DialerFilter>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/dialog_stub_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/dialog_stub_layout.xml
deleted file mode 100755
index b0a88613aefdb7b558bb4ed97316ec75c2c91cc9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/dialog_stub_layout.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
-        android:layout_width="match_parent" 
-        android:layout_height="match_parent"
-        >
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/digitalclock_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/digitalclock_layout.xml
deleted file mode 100755
index cbdb84dba4efb38fefec79f3809837e3e23aaabc..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/digitalclock_layout.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<com.android.cts.stub.alarmclock.DigitalClock android:id="@+id/digitalClock"
-     xmlns:android="http://schemas.android.com/apk/res/android"
-     android:layout_width="wrap_content"
-     android:layout_height="208dip"
-     android:gravity="center">
-     <!-- Includes vertical padding so animated background doesn't
-          stretch much -->
-     <TextView android:id="@+id/timeDisplay"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content"
-         android:textSize="64sp"
-         android:paddingRight="4dip"
-         android:paddingTop="48dip"
-         android:paddingBottom="48dip"/>
-     <LinearLayout android:id="@+id/am_pm"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content"
-         android:orientation="vertical">
-         <TextView android:id="@+id/am"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:layout_marginTop="-7dp"
-             android:text="@string/am"
-             android:textSize="28sp"/>
-         <TextView android:id="@+id/pm"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:layout_marginTop="-4dp"
-             android:text="@string/pm"
-             android:textSize="28sp"/>
-     </LinearLayout>
-</com.android.cts.stub.alarmclock.DigitalClock>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/digitalclock_simplelayout.xml b/proprietary/frameworks/base/tests/content/res/layout/digitalclock_simplelayout.xml
deleted file mode 100755
index 16f7b454ce452dc15708cbfa8d744c2986729c5f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/digitalclock_simplelayout.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/digitalclock_root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/edittext_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/edittext_layout.xml
deleted file mode 100755
index 398d3be4c5b7f6be8b94800d5d66a0bfda9a6957..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/edittext_layout.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <LinearLayout android:id="@+id/edit_text"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <EditText android:id="@+id/edittext1"
-            style="@android:style/Widget.EditText"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginTop="10dip"
-            android:scrollHorizontally="true"
-            android:capitalize="sentences"
-            android:autoText="false"
-            android:maxLines="3"
-            android:textColor="#FF0000"
-            android:text="@string/edit_text"
-        />
-    </LinearLayout>
-</ScrollView>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/expandablelistview_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/expandablelistview_layout.xml
deleted file mode 100755
index 3a3ebb7779595e955f9ec9df626b56ebd2d65493..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/expandablelistview_layout.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<ExpandableListView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/expandablelistview_test"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:drawSelectorOnTop="false" />
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/focus_finder_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/focus_finder_layout.xml
deleted file mode 100755
index 0502fd812d331085771d95e83f43804d5ad75a9d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/focus_finder_layout.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    <TableLayout android:id="@+id/layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true">
-        <TableRow>
-            <android.view.cts.TestButton android:id="@+id/top_left_button"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:text="TL" />
-            <android.view.cts.TestButton android:id="@+id/top_right_button"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:text="TR" />
-        </TableRow>
-        <TableRow>
-            <android.view.cts.TestButton android:id="@+id/bottom_left_button"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:text="BL" />
-            <android.view.cts.TestButton android:id="@+id/bottom_right_button"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:text="BR" />
-        </TableRow>  
-    </TableLayout>
-</RelativeLayout>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/focus_handling_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/focus_handling_layout.xml
deleted file mode 100755
index 84c8e6a87914da35730ebf260891b357d40b5292..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/focus_handling_layout.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <View
-        android:id="@+id/view1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/id_ok"/>
-
-    <View
-        android:id="@+id/view2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/view1"
-        android:layout_alignTop="@id/view1"
-        android:nextFocusLeft="@id/view1"
-        android:text="@string/id_ok"/>
-
-    <View
-        android:id="@+id/view3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/view1"
-        android:layout_alignLeft="@id/view1"
-        android:nextFocusUp="@id/view1"
-        android:text="@string/id_ok"/>
-
-    <View
-        android:id="@+id/view4"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/view3"
-        android:layout_alignTop="@id/view3"
-        android:layout_alignRight="@id/view2"
-        android:nextFocusUp="@id/view2"
-        android:nextFocusLeft="@id/view3"
-        android:text="@string/id_ok"/>
-</RelativeLayout>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/framelayout_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/framelayout_layout.xml
deleted file mode 100755
index 1048d1be74299c11297e13345888a49e68f77161..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/framelayout_layout.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/framelayout_container"
-                android:background="@drawable/red"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="bottom"
-                android:orientation="vertical">
-
-    <FrameLayout
-        android:layout_width="200dip"
-        android:layout_height="200dip"
-        android:background="@drawable/yellow"
-        android:id="@+id/framelayout">
-    </FrameLayout>
-
-    <FrameLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@drawable/yellow"
-        android:id="@+id/framelayout_measureall">
-
-        <TextView android:id="@+id/framelayout_textview"
-            android:background="@drawable/blue"
-            android:layout_width="100dip"
-            android:layout_height="30dip"
-            android:text="@string/hello_world"/>
-
-        <Button android:id="@+id/framelayout_button"
-            android:layout_width="50dip"
-            android:layout_height="15dip"
-            android:text="@string/go"/>
-
-    </FrameLayout>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/gallery_test.xml b/proprietary/frameworks/base/tests/content/res/layout/gallery_test.xml
deleted file mode 100755
index 03f0e6059a691efc9bf7ba0ff87515a9ec046ab7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/gallery_test.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <android.widget.cts.MyGallery xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/gallery_test"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    </android.widget.cts.MyGallery>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/gridlayout_anim_controller_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/gridlayout_anim_controller_layout.xml
deleted file mode 100755
index 0ff2d4661202f76f8b8b74f31b2085e435003a2a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/gridlayout_anim_controller_layout.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<GridView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/gridlayout_anim_gridview"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="10dp"
-    android:verticalSpacing="20dp"
-    android:horizontalSpacing="20dp"
-    android:numColumns="3"
-    android:columnWidth="60dp"
-    android:stretchMode="columnWidth"
-    android:gravity="center"
-/>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/gridlayout_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/gridlayout_layout.xml
deleted file mode 100755
index 54b3b2c0ec5a426f9eafc6b4a0c0792191b3c8ad..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/gridlayout_layout.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2012 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<GridLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    >
-</GridLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/gridview_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/gridview_layout.xml
deleted file mode 100755
index c7774a327cbd7f25baf29dc3278103c57f4f8c0a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/gridview_layout.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<GridView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/gridview"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-/>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/home_activity.xml b/proprietary/frameworks/base/tests/content/res/layout/home_activity.xml
deleted file mode 100755
index 49174daee713d8be9531f31e4ca4fd1bd520f46c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/home_activity.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-      <Button android:text="@string/holo_test"
-              android:id="@+id/button_holo"
-              android:onClick="onHoloTestClick"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content">
-      </Button>
-      <Button android:text="@string/holo_generator"
-              android:id="@+id/button2"
-              android:onClick="onHoloGenClick"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content">
-      </Button>
-      <Button android:text="@string/holo_light_test"
-              android:id="@+id/button3"
-              android:onClick="onHoloLightTestClick"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content">
-      </Button>
-      <Button android:text="@string/holo_light_generator"
-              android:id="@+id/button4"
-              android:onClick="onHoloLightGenClick"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content">
-      </Button>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/horizontal_scrollview.xml b/proprietary/frameworks/base/tests/content/res/layout/horizontal_scrollview.xml
deleted file mode 100755
index 0f88ab3fc5d9100e344186168e72a59590565fc1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/horizontal_scrollview.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<android.widget.cts.MyHorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/horizontal_scroll_view"
-    android:layout_width="100px"
-    android:layout_height="100px">
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="250px"
-        android:layout_height="wrap_content">
-
-        <Button
-            android:id="@+id/first_horizontal_child"
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_1"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_2"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_3"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_1"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_2"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_3"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_1"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_2"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_3"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_1"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_2"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_3"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_1"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_2"/>
-
-        <Button
-            android:id="@+id/last_horizontal_child"
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_3"/>
-    </LinearLayout>
-
-</android.widget.cts.MyHorizontalScrollView>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/imagebutton_test.xml b/proprietary/frameworks/base/tests/content/res/layout/imagebutton_test.xml
deleted file mode 100755
index 7d4b691a412db5226a547563ce0fad80fdc1055f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/imagebutton_test.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/imagebutton"
-    android:layout_width="96px"
-    android:layout_height="76px"
-    android:soundEffectsEnabled="false"
-/>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/imageswitcher_test.xml b/proprietary/frameworks/base/tests/content/res/layout/imageswitcher_test.xml
deleted file mode 100755
index 496b2bae21718a33fb4bbfaf76946771ba77ae43..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/imageswitcher_test.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ImageSwitcher android:id="@+id/switcher"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
-    />
-</RelativeLayout>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/imageview_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/imageview_layout.xml
deleted file mode 100755
index d1e17fa23031ee1314195b7ffd9f06f1473453d7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/imageview_layout.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ImageView
-        android:id="@+id/imageview"
-        android:layout_width="320px"
-        android:layout_height="240px"/>
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/inflater_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/inflater_layout.xml
deleted file mode 100755
index cff224e303f68c6fb816454abe3f586ee71cf8d5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/inflater_layout.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/numeric_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:editable="true"/>
-
-    <TextView android:id="@+id/numeric_integer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="integer"/>
-
-    <TextView android:id="@+id/numeric_signed"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="signed"/>
-
-    <TextView android:id="@+id/numeric_decimal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="decimal"/>
-
-    <TextView android:id="@+id/numeric_signed_integer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="signed|integer"/>
-
-    <TextView android:id="@+id/numeric_integer_decimal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="integer|decimal"/>
-
-    <TextView android:id="@+id/numeric_signed_decimal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="signed|decimal"/>
-
-    <TextView android:id="@+id/numeric_signed_decimal_integer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="signed|integer|decimal"/>
-
-     <android.view.cts.MockViewStub class="android.view.cts.MockViewStub"
-        android:id="@+id/autotext_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/inputmethod_edittext.xml b/proprietary/frameworks/base/tests/content/res/layout/inputmethod_edittext.xml
deleted file mode 100755
index 849b411884be5f31aa13f10809553fb18f872747..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/inputmethod_edittext.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:background="@drawable/blue"
-                android:padding="10px">
-
-    <EditText android:id="@+id/entry"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:background="@android:drawable/editbox_background"/>
-
-</RelativeLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/keylistener_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/keylistener_layout.xml
deleted file mode 100755
index 96a419df4a6f600ab508dcd6dc66b1e62706020c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/keylistener_layout.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/keylistener_textview"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-/>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/layoutdirection_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/layoutdirection_layout.xml
deleted file mode 100755
index e506dc11e6fd46e42e32951b2ad294a215a7d7f7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/layoutdirection_layout.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2012 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:orientation="vertical">
-
-    <LinearLayout android:id="@+id/layout_linearlayout_ltr"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layoutDirection="ltr">
-
-        <LinearLayout android:id="@+id/layout_linearlayout_ltr_child_1"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="ltr" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_ltr_child_2"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="rtl" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_ltr_child_3"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="inherit" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_ltr_child_4"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="locale" />
-
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/layout_linearlayout_rtl"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layoutDirection="rtl">
-
-        <LinearLayout android:id="@+id/layout_linearlayout_rtl_child_1"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="ltr" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_rtl_child_2"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="rtl" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_rtl_child_3"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="inherit" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_rtl_child_4"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="locale" />
-
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/layout_linearlayout_locale"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layoutDirection="locale">
-
-        <LinearLayout android:id="@+id/layout_linearlayout_locale_child_1"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="ltr" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_locale_child_2"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="rtl" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_locale_child_3"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="inherit" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_locale_child_4"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="locale" />
-
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/layout_linearlayout_inherit"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layoutDirection="inherit">
-
-        <LinearLayout android:id="@+id/layout_linearlayout_inherit_child_1"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="ltr" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_inherit_child_2"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="rtl" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_inherit_child_3"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="inherit" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_inherit_child_4"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="locale" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/linearlayout_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/linearlayout_layout.xml
deleted file mode 100755
index c70937dfc6eb3934f960e86097ca6023f673e1a0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/linearlayout_layout.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-    <LinearLayout android:id="@+id/horizontal"
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="100dip"
-        android:background="#FF909090">
-
-        <TextView android:id="@+id/gravity_top"
-            android:background="#FF00FF00"
-            android:layout_width="wrap_content"
-            android:layout_height="50dip"
-            android:layout_gravity="top"
-            android:text="@string/horizontal_text_1"/>
-
-        <TextView android:id="@+id/gravity_center_vertical"
-            android:background="#FF00FF00"
-            android:layout_width="wrap_content"
-            android:layout_height="50dip"
-            android:layout_gravity="center_vertical"
-            android:text="@string/horizontal_text_2"/>
-
-        <TextView android:id="@+id/gravity_bottom"
-            android:background="#FF00FF00"
-            android:layout_width="wrap_content"
-            android:layout_height="50dip"
-            android:layout_gravity="bottom"
-            android:text="@string/horizontal_text_3"/>
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/vertical"
-        android:orientation="vertical"
-        android:layout_width="100dip"
-        android:layout_height="wrap_content"
-        android:background="#FFFF0909">
-
-        <TextView android:id="@+id/gravity_left"
-            android:background="#FF00FF00"
-            android:layout_width="wrap_content"
-            android:layout_height="20dip"
-            android:layout_gravity="left"
-            android:text="@string/vertical_text_1"/>
-
-        <TextView android:id="@+id/gravity_center_horizontal"
-            android:background="#FF0000FF"
-            android:layout_width="wrap_content"
-            android:layout_height="20dip"
-            android:layout_gravity="center_horizontal"
-            android:text="@string/vertical_text_2"/>
-
-        <TextView android:id="@+id/gravity_right"
-            android:background="#FF00FF00"
-            android:layout_width="wrap_content"
-            android:layout_height="20dip"
-            android:layout_gravity="right"
-            android:text="@string/vertical_text_3"/>
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/weightsum"
-        android:orientation="horizontal"
-        android:weightSum="1.0"
-        android:baselineAligned="false"
-        android:layout_width="100dip"
-        android:layout_height="100dip"
-        android:background="#FF909090">
-
-        <TextView android:id="@+id/weight_0_2"
-            android:background="#FF0000FF"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.2"
-            android:text="@string/horizontal_text_1"/>
-
-        <TextView android:id="@+id/weight_0_5"
-            android:background="#FFF00F0F"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.5"
-            android:text="@string/horizontal_text_2"/>
-
-        <TextView android:id="@+id/weight_0_3"
-            android:background="#FF0000FF"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.3"
-            android:text="@string/horizontal_text_3"/>
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/baseline_aligned_child_index"
-        android:orientation="vertical"
-        android:baselineAlignedChildIndex="1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="#FFFF0909">
-
-        <TextView android:id="@+id/textview1"
-            android:background="#FF00FF00"
-            android:layout_width="wrap_content"
-            android:layout_height="20dip"
-            android:layout_gravity="left"
-            android:text="@string/vertical_text_1"/>
-
-        <TextView android:id="@+id/textview2"
-            android:background="#FF0000FF"
-            android:layout_width="wrap_content"
-            android:layout_height="20dip"
-            android:layout_gravity="center_horizontal"
-            android:text="@string/vertical_text_2"/>
-
-        <TextView android:id="@+id/textview3"
-            android:background="#FF00FF00"
-            android:layout_width="wrap_content"
-            android:layout_height="20dip"
-            android:layout_gravity="right"
-            android:text="@string/vertical_text_3"/>
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/list_activity_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/list_activity_layout.xml
deleted file mode 100755
index 0486cf0be988dd441f4bdcc9efe08e5d82f4d83a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/list_activity_layout.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/text1"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-/>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/listview_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/listview_layout.xml
deleted file mode 100755
index ee8b6de3d010b8bd84d9ba4ec7c76fa1dde89641..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/listview_layout.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/headerview1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/header_view" />
-
-    <TextView android:id="@+id/headerview2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/header_view" />
-
-    <ListView android:id="@+id/listview_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <TextView android:id="@+id/footerview1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/footer_view" />
-
-    <TextView android:id="@+id/footerview2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/footer_view" />
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/local_sample.xml b/proprietary/frameworks/base/tests/content/res/layout/local_sample.xml
deleted file mode 100755
index 6f02e7827268872a70c92049e601a79d29a4f0a4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/local_sample.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:padding="4dip"
-    android:gravity="center_horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:paddingBottom="4dip"
-        android:text="@string/text"/>
-
-    <Button android:id="@+id/go"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/text">
-        <requestFocus />
-    </Button>
-
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/mediacontroller_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/mediacontroller_layout.xml
deleted file mode 100755
index 871adf46710162cef76033f94a88a8ef0b481561..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/mediacontroller_layout.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <VideoView
-        android:id="@+id/mediacontroller_videoview"
-        android:layout_width="320px"
-        android:layout_height="240px"/>
-
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/multi_auto_complete_text_view_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/multi_auto_complete_text_view_layout.xml
deleted file mode 100755
index 50109c838901180c9e2aa1cc50a238c375b6b127..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/multi_auto_complete_text_view_layout.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/text_country" />
-
-    <MultiAutoCompleteTextView android:id="@+id/country_edit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/text_name" />
-
-    <MultiAutoCompleteTextView android:id="@+id/name_edit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/popupwindow.xml b/proprietary/frameworks/base/tests/content/res/layout/popupwindow.xml
deleted file mode 100755
index c9cefdf90b78450ee4f9fcb941e7f12f265b496b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/popupwindow.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-
-    <TextView android:id="@+id/anchor_upper"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:text="@string/text_view_hint"
-        android:layout_weight="1"/>
-
-    <LinearLayout android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-        <TextView android:id="@+id/anchor_middle_left"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:text="@string/text_view_hint"
-            android:layout_weight="1"/>
-
-        <TextView android:id="@+id/anchor_middle_right"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:text="@string/text_view_hint"
-            android:layout_weight="1"/>
-
-    </LinearLayout>
-
-    <TextView android:id="@+id/anchor_lower"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:text="@string/text_view_hint"
-        android:layout_weight="1"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/radiogroup_1.xml b/proprietary/frameworks/base/tests/content/res/layout/radiogroup_1.xml
deleted file mode 100755
index 1e9db839052145d86995943c908c5685b4a514bd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/radiogroup_1.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:layout_weight="0.5"
-    android:layout_gravity="bottom"
-    android:layout_margin="5px">
-</RadioGroup>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/ratingbar_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/ratingbar_layout.xml
deleted file mode 100755
index acc7fa8cea6b446a41247162a3c5736cfb24f6e6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/ratingbar_layout.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-
-    <RatingBar android:id="@+id/ratingbar_constructor"
-        android:isIndicator="false"
-        android:numStars="50"
-        android:rating="1.2"
-        android:stepSize="0.2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/relative_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/relative_layout.xml
deleted file mode 100755
index db4b2e8b28619ce49ff2840f82a9b3e651acec74..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/relative_layout.xml
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <RelativeLayout
-        android:id="@+id/relative_sublayout_attrs"
-        android:background="@drawable/blue"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <!-- view1, centered within its parent. -->
-        <TextView
-            android:id="@+id/relative_view1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:text="@string/relative_view1"/>
-
-        <!-- view2, below view1 and has same left position with view1. -->
-        <TextView
-            android:id="@+id/relative_view2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/relative_view1"
-            android:layout_alignLeft="@id/relative_view1"
-            android:text="@string/relative_view2"/>
-
-        <!-- view3, has same top position with view1 and same bottom position with view2,
-             and on the right of view1. -->
-        <TextView
-            android:id="@+id/relative_view3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@id/relative_view1"
-            android:layout_alignBottom="@id/relative_view2"
-            android:layout_toRightOf="@id/relative_view1"
-            android:text="@string/relative_view3"/>
-
-        <!-- view4, has same right position with view3 and above view3. -->
-        <TextView
-            android:id="@+id/relative_view4"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignRight="@id/relative_view3"
-            android:layout_above="@id/relative_view3"
-            android:text="@string/relative_view4"/>
-
-        <!-- view5 goes on the left-bottom -->
-        <TextView
-            android:id="@+id/relative_view5"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentLeft="true"
-            android:text="@string/relative_view5"/>
-
-        <!-- view6 goes on the top-right -->
-        <TextView
-            android:id="@+id/relative_view6"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentRight="true"
-            android:text="@string/relative_view6"/>
-
-        <!-- view7, has same baseline with view6 and centered horizontally within its parent. -->
-        <TextView
-            android:id="@+id/relative_view7"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBaseline="@id/relative_view6"
-            android:layout_centerHorizontal="true"
-            android:text="@string/relative_view7"/>
-
-        <!-- view8, centered vertically within its parent and on the left of view1. -->
-        <TextView
-            android:id="@+id/relative_view8"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toLeftOf="@id/relative_view1"
-            android:layout_centerVertical="true"
-            android:text="@string/relative_view8"/>
-
-        <!-- view9, has same top and bottom position with view3 and same left position
-             with its parent. -->
-        <TextView
-            android:id="@+id/relative_view9"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignLeft="@id/gravity_bottom"
-            android:layout_alignTop="@id/relative_view3"
-            android:layout_alignBottom="@id/relative_view3"
-            android:layout_alignWithParentIfMissing="true"
-            android:text="@string/relative_view9"/>
-
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/relative_sublayout_gravity"
-        android:background="@drawable/yellow"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <!-- view10 -->
-        <TextView
-            android:id="@+id/relative_view10"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/relative_view10"/>
-
-        <!-- view11 -->
-        <TextView
-            android:id="@+id/relative_view11"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/relative_view10"
-            android:text="@string/relative_view11"/>
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/relative_sublayout_ignore_gravity"
-        android:background="@drawable/red"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:ignoreGravity="@+id/relative_view12"
-        android:gravity="right">
-
-        <!-- view12 -->
-        <TextView
-            android:id="@id/relative_view12"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/relative_view12"/>
-
-        <!-- view13 -->
-        <TextView
-            android:id="@+id/relative_view13"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/relative_view13"/>
-    </RelativeLayout>
-
-    <Spinner
-        android:id="@+id/spinner1"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:prompt="@string/text_view_hello"/>
-
-    <RelativeLayout
-            android:id="@+id/relative_sublayout_attrs_2"
-            android:background="@drawable/blue"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-        <!-- view21, centered within its parent. -->
-        <TextView
-                android:id="@+id/relative_view21"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:text="@string/relative_view1"/>
-
-        <!-- view22, below view1 and has same start position with view21. -->
-        <TextView
-                android:id="@+id/relative_view22"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/relative_view21"
-                android:layout_alignStart="@id/relative_view21"
-                android:text="@string/relative_view2"/>
-
-        <!-- view23, has same top position with view21 and same bottom position with view22,
-             and on the end of view1. -->
-        <TextView
-                android:id="@+id/relative_view23"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignTop="@id/relative_view21"
-                android:layout_alignBottom="@id/relative_view22"
-                android:layout_toEndOf="@id/relative_view21"
-                android:text="@string/relative_view3"/>
-
-        <!-- view24, has same end position with view23 and above view23. -->
-        <TextView
-                android:id="@+id/relative_view24"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignEnd="@id/relative_view23"
-                android:layout_above="@id/relative_view23"
-                android:text="@string/relative_view4"/>
-
-        <!-- view25 goes on the start-bottom -->
-        <TextView
-                android:id="@+id/relative_view25"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_alignParentStart="true"
-                android:text="@string/relative_view5"/>
-
-        <!-- view26 goes on the top-end -->
-        <TextView
-                android:id="@+id/relative_view26"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentEnd="true"
-                android:text="@string/relative_view6"/>
-
-        <!-- view27, has same baseline with view26 and centered horizontally within its parent. -->
-        <TextView
-                android:id="@+id/relative_view27"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignBaseline="@id/relative_view26"
-                android:layout_centerHorizontal="true"
-                android:text="@string/relative_view7"/>
-
-        <!-- view28, centered vertically within its parent and on the start of view21. -->
-        <TextView
-                android:id="@+id/relative_view28"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_toStartOf="@id/relative_view21"
-                android:layout_centerVertical="true"
-                android:text="@string/relative_view8"/>
-
-        <!-- view29, has same top and bottom position with view23 and same start position
-             with its parent. -->
-        <TextView
-                android:id="@+id/relative_view29"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignStart="@id/gravity_bottom"
-                android:layout_alignTop="@id/relative_view23"
-                android:layout_alignBottom="@id/relative_view23"
-                android:layout_alignWithParentIfMissing="true"
-                android:text="@string/relative_view9"/>
-
-    </RelativeLayout>
-
-</RelativeLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/remote_view_test_bad_1.xml b/proprietary/frameworks/base/tests/content/res/layout/remote_view_test_bad_1.xml
deleted file mode 100755
index a65a5eca7c9e716c5ad3539894e2a5f84e705aae..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/remote_view_test_bad_1.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/linear"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <EditText android:id="@+id/edit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/remote_view_test_bad_2.xml b/proprietary/frameworks/base/tests/content/res/layout/remote_view_test_bad_2.xml
deleted file mode 100755
index 92623d810aa83d8f99ef3c9dca16a98c29d3c5fa..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/remote_view_test_bad_2.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/linear"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <WebView android:id="@+id/web"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/remote_view_test_good.xml b/proprietary/frameworks/base/tests/content/res/layout/remote_view_test_good.xml
deleted file mode 100755
index 3df9d6240018cba24b2915581780cfdecbf339be..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/remote_view_test_good.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/linear"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <ImageView android:id="@+id/image"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <FrameLayout android:id="@+id/frame"
-        android:layout_width="10dip"
-        android:layout_height="10dip" />
-
-    <RelativeLayout android:id="@+id/relative"
-        android:layout_width="10dip"
-        android:layout_height="10dip" />
-
-    <AbsoluteLayout android:id="@+id/absolute"
-        android:layout_width="10dip"
-        android:layout_height="10dip" />
-
-    <ProgressBar android:id="@+id/progress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <ImageButton android:id="@+id/image_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/remoteviews_good.xml b/proprietary/frameworks/base/tests/content/res/layout/remoteviews_good.xml
deleted file mode 100755
index 8fdbc645a33bc4c085907dc3b2727bf256701969..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/remoteviews_good.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/remoteViews_good"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout android:id="@+id/remoteView_linear"
-        android:layout_width="10dip"
-        android:layout_height="10dip" />
-
-    <TextView android:id="@+id/remoteView_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <ImageView android:id="@+id/remoteView_image"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <FrameLayout android:id="@+id/remoteView_frame"
-        android:layout_width="10dip"
-        android:layout_height="10dip" />
-
-    <RelativeLayout android:id="@+id/remoteView_relative"
-        android:layout_width="10dip"
-        android:layout_height="10dip" />
-
-    <AbsoluteLayout android:id="@+id/remoteView_absolute"
-        android:layout_width="10dip"
-        android:layout_height="10dip" />
-
-    <ProgressBar android:id="@+id/remoteView_progress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="?android:attr/progressBarStyleHorizontal" />
-
-    <Chronometer android:id="@+id/remoteView_chronometer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/remoteviews_host.xml b/proprietary/frameworks/base/tests/content/res/layout/remoteviews_host.xml
deleted file mode 100755
index ace59037bd246a5b82b082135551b6a74d4722c4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/remoteviews_host.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/remoteView_host">
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/scrollview_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/scrollview_layout.xml
deleted file mode 100755
index 3c9a474c78447bde5d8130a606d479cc5271e764..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/scrollview_layout.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<android.widget.cts.MyScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/scroll_view"
-    android:layout_width="100dip"
-    android:layout_height="100dip">
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="250dip"
-        android:layout_height="wrap_content">
-
-        <Button
-            android:id="@+id/first_child"
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_1"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_2"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_3"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_1"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_2"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_3"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_1"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_2"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_3"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_1"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_2"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_3"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_1"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_2"/>
-
-        <Button
-            android:id="@+id/last_child"
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_3"/>
-    </LinearLayout>
-
-</android.widget.cts.MyScrollView>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/searchview.xml b/proprietary/frameworks/base/tests/content/res/layout/searchview.xml
deleted file mode 100755
index dba105aeb2054b5a737d67caa5bca3fce3388ad3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/searchview.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <SearchView android:id="@+id/searchView1"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                xmlns:android="http://schemas.android.com/apk/res/android">
-    </SearchView>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/seekbar.xml b/proprietary/frameworks/base/tests/content/res/layout/seekbar.xml
deleted file mode 100755
index c6f524679853d49f06f94e4910e1d3d4f455346a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/seekbar.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-     <SeekBar android:id="@+id/seekBar"
-         android:layout_width="match_parent"
-         android:layout_height="wrap_content"
-         android:max="100"
-         android:progress="50"
-         android:secondaryProgress="75" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/simple_dropdown_item_1line.xml b/proprietary/frameworks/base/tests/content/res/layout/simple_dropdown_item_1line.xml
deleted file mode 100755
index 9a044b15b6e02107b966fb8150f863d3d64244ce..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/simple_dropdown_item_1line.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/text1"
-    style="?android:attr/dropDownItemStyle"
-    android:textAppearance="?android:attr/textAppearanceLargeInverse"
-    android:singleLine="true"
-    android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight" />
diff --git a/proprietary/frameworks/base/tests/content/res/layout/simple_spinner_item.xml b/proprietary/frameworks/base/tests/content/res/layout/simple_spinner_item.xml
deleted file mode 100755
index 247bffa690c8b2e44188b9e1b900f02a5ddc721f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/simple_spinner_item.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License"); 
-     you may not use this file except in compliance with the License. 
-     You may obtain a copy of the License at 
-
-         http://www.apache.org/licenses/LICENSE-2.0 
-
-     Unless required by applicable law or agreed to in writing, software 
-     distributed under the License is distributed on an "AS IS" BASIS, 
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-     See the License for the specific language governing permissions and 
-     limitations under the License.
--->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" 
-    android:id="@android:id/text1"
-    style="?android:attr/spinnerItemStyle"
-    android:singleLine="true"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content" />
diff --git a/proprietary/frameworks/base/tests/content/res/layout/sliding_drawer_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/sliding_drawer_layout.xml
deleted file mode 100755
index 3f84d46a5eb6ba6ce8f26b0c4a4d381d208bd7ba..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/sliding_drawer_layout.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <SlidingDrawer
-        android:id="@+id/drawer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:animateOnClick="false"
-
-        android:handle="@+id/handle"
-        android:content="@+id/content">
-
-        <ImageView
-            android:id="@id/handle"
-            android:background="#FF00FF00"
-            android:layout_width="88dip"
-            android:layout_height="44dip" />
-
-        <TextView
-            android:id="@id/content"
-            android:background="#FF0000FF"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:text="@string/hello_world" />
-
-    </SlidingDrawer>
-
-</RelativeLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/surface_view.xml b/proprietary/frameworks/base/tests/content/res/layout/surface_view.xml
deleted file mode 100755
index f4105441c60a378b79e203256da85ebfa6b77c06..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/surface_view.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <SurfaceView
-        android:id="@+id/surface_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/tabhost_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/tabhost_layout.xml
deleted file mode 100755
index 1bae57a33f5d14866506aecc48d458ebe8377ad3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/tabhost_layout.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TabHost xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/tabhost"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-    <TabWidget android:id="@android:id/tabs"
-        android:layout_width="match_parent"
-        android:layout_height="68dip"
-        android:paddingLeft="1dip"
-        android:paddingRight="1dip"
-        android:paddingTop="4dip"
-    />
-
-    <FrameLayout android:id="@android:id/tabcontent"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1">
-
-        <TextView android:id="@+id/tabhost_textview"
-            android:password="true"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/hello_world"/>
-
-        <ListView android:id="@+id/tabhost_listview"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-    </FrameLayout>
-</TabHost>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/table_layout_1.xml b/proprietary/frameworks/base/tests/content/res/layout/table_layout_1.xml
deleted file mode 100755
index 0896cd2973941376ec54ca18c1dddb2b73c7df2d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/table_layout_1.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/table1"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:collapseColumns="0"
-    android:stretchColumns="2">
-
-    <TableRow>
-        <TextView
-            android:text="@string/table_layout_first"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_second"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_third"
-            android:padding="3dip" />
-    </TableRow>
-</TableLayout>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/table_layout_2.xml b/proprietary/frameworks/base/tests/content/res/layout/table_layout_2.xml
deleted file mode 100755
index 84750fc9a90b74381a9723f9b5e1f18e62799d63..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/table_layout_2.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/table2"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:shrinkColumns="1">
-
-    <TableRow>
-        <TextView
-            android:layout_column="1"
-            android:text="@string/table_layout_long"
-            android:padding="3dip" />
-        <TextView
-            android:layout_span="2"
-            android:text="@string/table_layout_second"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_third"
-            android:padding="3dip" />
-    </TableRow>
-</TableLayout>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/textview_autolink.xml b/proprietary/frameworks/base/tests/content/res/layout/textview_autolink.xml
deleted file mode 100755
index 53d89f36de047ce18f4ac6531e82f351edddb823..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/textview_autolink.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/autolink_default"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-    <TextView android:id="@+id/autolink_web"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:autoLink="web"/>
-
-    <TextView android:id="@+id/autolink_email"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:autoLink="email"/>
-
-    <TextView android:id="@+id/autolink_phone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:autoLink="phone"/>
-
-    <TextView android:id="@+id/autolink_all"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:autoLink="all"/>
-
-    <TextView android:id="@+id/autolink_compound1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:autoLink="web|email"/>
-
-    <TextView android:id="@+id/autolink_compound2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:autoLink="web|phone"/>
-
-    <TextView android:id="@+id/autolink_compound3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:autoLink="email|phone"/>
-
-    <TextView android:id="@+id/autolink_compound4"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:autoLink="phone|all"/>
-
-</FrameLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/textview_autotext.xml b/proprietary/frameworks/base/tests/content/res/layout/textview_autotext.xml
deleted file mode 100755
index 9a1e9efe2de24c6b2326bf60573e0b3bd6f7fabf..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/textview_autotext.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/autotext_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <TextView android:id="@+id/autotext_false"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:autoText="false"/>
-
-    <TextView android:id="@+id/autotext_true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:autoText="true"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/textview_buffertype.xml b/proprietary/frameworks/base/tests/content/res/layout/textview_buffertype.xml
deleted file mode 100755
index 33b0d207f09e9306bdc9bcf40c20af7235073119..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/textview_buffertype.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/buffertype_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <TextView android:id="@+id/buffertype_normal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:bufferType="normal"/>
-
-    <TextView android:id="@+id/buffertype_spannable"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:bufferType="spannable"/>
-
-    <TextView android:id="@+id/buffertype_editable"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:bufferType="editable"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/textview_capitalize.xml b/proprietary/frameworks/base/tests/content/res/layout/textview_capitalize.xml
deleted file mode 100755
index 4b80ce0f8fdab990f77f49688b5d5189829caf8f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/textview_capitalize.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/capitalize_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:editable="true"/>
-
-    <TextView android:id="@+id/capitalize_none"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:capitalize="none"/>
-
-    <TextView android:id="@+id/capitalize_sentences"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:capitalize="sentences"/>
-
-    <TextView android:id="@+id/capitalize_words"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:capitalize="words"/>
-
-    <TextView android:id="@+id/capitalize_characters"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:capitalize="characters"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/textview_content.xml b/proprietary/frameworks/base/tests/content/res/layout/textview_content.xml
deleted file mode 100755
index 189f812ae47ac5d0a3b5ffd2558ba3fafabc748b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/textview_content.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/text_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <TextView android:id="@+id/text_resid"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/text_view_hello"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/textview_digits.xml b/proprietary/frameworks/base/tests/content/res/layout/textview_digits.xml
deleted file mode 100755
index 2a0d470ba31a8bf1f68fe1727f8e346002fedcde..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/textview_digits.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/digits_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:editable="true"/>
-
-    <TextView android:id="@+id/digits_hex"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:digits="0123456789ABCDEFabcdef.-"/>
-
-    <TextView android:id="@+id/digits_blank"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:digits=""/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/textview_ellipsize.xml b/proprietary/frameworks/base/tests/content/res/layout/textview_ellipsize.xml
deleted file mode 100755
index 0fc57793999e8faac5ffa69da1aec735cb54cfa9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/textview_ellipsize.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/ellipsize_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <TextView android:id="@+id/ellipsize_none"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ellipsize="none"/>
-
-    <TextView android:id="@+id/ellipsize_start"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ellipsize="start"/>
-
-    <TextView android:id="@+id/ellipsize_middle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ellipsize="middle"/>
-
-    <TextView android:id="@+id/ellipsize_end"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/textview_ems.xml b/proprietary/frameworks/base/tests/content/res/layout/textview_ems.xml
deleted file mode 100755
index a169cb011a56f0e2e2eaf58aa62e88d30f557aff..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/textview_ems.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/ems_default"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:scrollHorizontally="true"/>
-
-    <TextView android:id="@+id/ems_huge"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:ems="60"
-        android:text="@string/explain"
-        android:scrollHorizontally="true"/>
-
-    <TextView android:id="@+id/ems_tiny"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:ems="1"
-        android:text="@string/explain"
-        android:scrollHorizontally="true"/>
-
-    <TextView android:id="@+id/ems_zero"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:ems="0"
-        android:text="@string/explain"
-        android:scrollHorizontally="true"/>
-
-    <TextView android:id="@+id/minEms_tiny"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minEms="1"
-        android:scrollHorizontally="true"/>
-
-    <TextView android:id="@+id/minEms_huge"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minEms="1000"
-        android:scrollHorizontally="true"/>
-
-    <TextView android:id="@+id/minEms_zero"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minEms="0"
-        android:scrollHorizontally="true"/>
-
-    <TextView android:id="@+id/maxEms_tiny"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:maxEms="1"
-        android:scrollHorizontally="true"/>
-
-    <TextView android:id="@+id/maxEms_huge"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:maxEms="1000"
-        android:scrollHorizontally="true"/>
-
-    <TextView android:id="@+id/maxEms_zero"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:maxEms="0"
-        android:scrollHorizontally="true"/>
-
-    <TextView android:id="@+id/minEms_maxEms_correct"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:maxEms="60"
-        android:minEms="10"
-        android:scrollHorizontally="true"/>
-
-    <TextView android:id="@+id/minEms_maxEms_wrong"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:maxEms="10"
-        android:minEms="60"
-        android:scrollHorizontally="true"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/textview_gravity.xml b/proprietary/frameworks/base/tests/content/res/layout/textview_gravity.xml
deleted file mode 100755
index a4a7592179cd5cd7b4aaf12c8312b6cec3340870..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/textview_gravity.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/gravity_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <TextView android:id="@+id/gravity_bottom"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="bottom"/>
-
-    <TextView android:id="@+id/gravity_right"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="right"/>
-
-    <TextView android:id="@+id/gravity_fill"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="fill"/>
-
-    <TextView android:id="@+id/gravity_center"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"/>
-
-    <TextView android:id="@+id/gravity_center_vertical_right"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical|right"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/textview_hint_linksclickable_freezestext.xml b/proprietary/frameworks/base/tests/content/res/layout/textview_hint_linksclickable_freezestext.xml
deleted file mode 100755
index a22e42988928205b7fe214c8528aee6322d6b0a3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/textview_hint_linksclickable_freezestext.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/hint_linksClickable_freezesText_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <TextView android:id="@+id/hint_blank"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint=""/>
-
-    <TextView android:id="@+id/hint_string"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/text_view_simple_hint"/>
-
-    <TextView android:id="@+id/hint_resid"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/text_view_hint"/>
-
-    <TextView android:id="@+id/linksClickable_true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:linksClickable="true"/>
-
-    <TextView android:id="@+id/linksClickable_false"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:linksClickable="false"/>
-
-    <TextView android:id="@+id/freezesText_true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:freezesText="true"/>
-
-    <TextView android:id="@+id/freezesText_false"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:freezesText="false"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/textview_inputmethod_blank.xml b/proprietary/frameworks/base/tests/content/res/layout/textview_inputmethod_blank.xml
deleted file mode 100755
index 442061162bb277df4cc9c57cee1cdef482033776..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/textview_inputmethod_blank.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputMethod=""/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/textview_inputmethod_builtin.xml b/proprietary/frameworks/base/tests/content/res/layout/textview_inputmethod_builtin.xml
deleted file mode 100755
index e09a0ea3264ea0651cb1b4ab0c86bb5aa22468de..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/textview_inputmethod_builtin.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/inputMethod_builtIn_digits"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputMethod="android.text.method.DigitsKeyListener"/>
-
-    <TextView android:id="@+id/inputMethod_builtIn_datetime"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputMethod="android.text.method.DateTimeKeyListener"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/textview_inputmethod_notexist.xml b/proprietary/frameworks/base/tests/content/res/layout/textview_inputmethod_notexist.xml
deleted file mode 100755
index 9030b629baf4d1485dda08a442857d0b95339eec..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/textview_inputmethod_notexist.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputMethod="android.text.method.NotExistKeyListener"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/textview_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/textview_layout.xml
deleted file mode 100755
index 108e3f0ee09014ea9d4bc3c98613ac6f0fb9a7dd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/textview_layout.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/layout_textviewtest">
-
-    <ScrollView android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-        <LinearLayout android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-            <TextView android:id="@+id/textview_textAttr"
-                    android:text="@string/text_view_hello"
-                    android:textColor="@drawable/black"
-                    android:textColorHighlight="@drawable/yellow"
-                    android:textColorHint="@drawable/red"
-                    android:textColorLink="@drawable/blue"
-                    android:textScaleX="1.2"
-                    android:typeface="normal"
-                    android:textSize="20px"
-                    android:textStyle="normal"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-        
-            <TextView android:id="@+id/textview_password"
-                    android:password="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-        
-            <TextView android:id="@+id/textview_singleLine"
-                    android:singleLine="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-        
-            <TextView android:id="@+id/textview_text"
-                    android:text="@string/text_view_hello"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-            <TextView android:id="@+id/textview_text_two_lines"
-                    android:text="@string/text_view_hello_two_lines"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-            <android.widget.cts.MockTextView
-                    android:id="@+id/mock_textview_left"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:requiresFadingEdge="horizontal"
-                    android:singleLine="true"
-                    android:text="@string/long_text"
-                    android:gravity="left"
-                    />
-
-            <android.widget.cts.MockTextView
-                    android:id="@+id/mock_textview_right"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:requiresFadingEdge="horizontal"
-                    android:singleLine="true"
-                    android:text="@string/long_text"
-                    android:gravity="right"
-                    />
-
-            <android.widget.cts.MockTextView
-                    android:id="@+id/mock_textview_center"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:requiresFadingEdge="horizontal"
-                    android:singleLine="true"
-                    android:text="@string/long_text"
-                    android:gravity="center"
-                    />
-        </LinearLayout>
-
-    </ScrollView>
-
-    <TextView android:id="@+id/textview_ltr"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"/>
-
-    <TextView android:id="@+id/textview_rtl"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"/>
-
-    <TextView android:id="@+id/textview_drawable_1_1"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:drawableLeft="@drawable/icon_blue"
-              android:drawableRight="@drawable/icon_red"
-              android:drawableTop="@drawable/icon_green"
-              android:drawableBottom="@drawable/icon_yellow"
-            />
-
-    <TextView android:id="@+id/textview_drawable_1_2"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:drawableLeft="@drawable/icon_blue"
-              android:drawableRight="@drawable/icon_red"
-              android:drawableTop="@drawable/icon_green"
-              android:drawableBottom="@drawable/icon_yellow"
-              android:layoutDirection="rtl"
-            />
-
-    <TextView android:id="@+id/textview_drawable_2_1"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:drawableStart="@drawable/icon_blue"
-              android:drawableEnd="@drawable/icon_red"
-              android:drawableTop="@drawable/icon_green"
-              android:drawableBottom="@drawable/icon_yellow"
-            />
-
-    <TextView android:id="@+id/textview_drawable_2_2"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:drawableStart="@drawable/icon_blue"
-              android:drawableEnd="@drawable/icon_red"
-              android:drawableTop="@drawable/icon_green"
-              android:drawableBottom="@drawable/icon_yellow"
-              android:layoutDirection="rtl"
-            />
-
-    <TextView android:id="@+id/textview_drawable_3_1"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:drawableLeft="@drawable/icon_black"
-              android:drawableRight="@drawable/icon_black"
-              android:drawableStart="@drawable/icon_blue"
-              android:drawableEnd="@drawable/icon_red"
-              android:drawableTop="@drawable/icon_green"
-              android:drawableBottom="@drawable/icon_yellow"
-            />
-
-    <TextView android:id="@+id/textview_drawable_3_2"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:drawableLeft="@drawable/icon_black"
-              android:drawableRight="@drawable/icon_black"
-              android:drawableStart="@drawable/icon_blue"
-              android:drawableEnd="@drawable/icon_red"
-              android:drawableTop="@drawable/icon_green"
-              android:drawableBottom="@drawable/icon_yellow"
-              android:layoutDirection="rtl"
-            />
-
-
-    <LinearLayout android:orientation="vertical"
-                  android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  android:layoutDirection="ltr">
-
-        <TextView android:id="@+id/textview_drawable_4_1"
-                  android:layout_height="wrap_content"
-                  android:layout_width="wrap_content"
-                  android:drawableStart="@drawable/icon_blue"
-                  android:drawableEnd="@drawable/icon_red"
-                  android:drawableTop="@drawable/icon_green"
-                  android:drawableBottom="@drawable/icon_yellow"
-                />
-
-        <TextView android:id="@+id/textview_drawable_5_1"
-                  android:layout_height="wrap_content"
-                  android:layout_width="wrap_content"
-                  android:drawableLeft="@drawable/icon_black"
-                  android:drawableRight="@drawable/icon_black"
-                  android:drawableStart="@drawable/icon_blue"
-                  android:drawableEnd="@drawable/icon_red"
-                  android:drawableTop="@drawable/icon_green"
-                  android:drawableBottom="@drawable/icon_yellow"
-                />
-
-    </LinearLayout>
-
-    <LinearLayout android:orientation="vertical"
-                  android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  android:layoutDirection="rtl">
-
-        <TextView android:id="@+id/textview_drawable_4_2"
-                  android:layout_height="wrap_content"
-                  android:layout_width="wrap_content"
-                  android:drawableStart="@drawable/icon_blue"
-                  android:drawableEnd="@drawable/icon_red"
-                  android:drawableTop="@drawable/icon_green"
-                  android:drawableBottom="@drawable/icon_yellow"
-                />
-
-        <TextView android:id="@+id/textview_drawable_5_2"
-                  android:layout_height="wrap_content"
-                  android:layout_width="wrap_content"
-                  android:drawableLeft="@drawable/icon_black"
-                  android:drawableRight="@drawable/icon_black"
-                  android:drawableStart="@drawable/icon_blue"
-                  android:drawableEnd="@drawable/icon_red"
-                  android:drawableTop="@drawable/icon_green"
-                  android:drawableBottom="@drawable/icon_yellow"
-                />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/textview_numeric.xml b/proprietary/frameworks/base/tests/content/res/layout/textview_numeric.xml
deleted file mode 100755
index e60cb26bb644eb3dc416159f6a429ff0fa01a2c4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/textview_numeric.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/numeric_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:editable="true"/>
-
-    <TextView android:id="@+id/numeric_integer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="integer"/>
-
-    <TextView android:id="@+id/numeric_signed"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="signed"/>
-
-    <TextView android:id="@+id/numeric_decimal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="decimal"/>
-
-    <TextView android:id="@+id/numeric_signed_integer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="signed|integer"/>
-
-    <TextView android:id="@+id/numeric_integer_decimal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="integer|decimal"/>
-
-    <TextView android:id="@+id/numeric_signed_decimal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="signed|decimal"/>
-
-    <TextView android:id="@+id/numeric_signed_decimal_integer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="signed|integer|decimal"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/textview_phonenumber.xml b/proprietary/frameworks/base/tests/content/res/layout/textview_phonenumber.xml
deleted file mode 100755
index d0975c67f6cef918e922fcba315d809a7f8205a2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/textview_phonenumber.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/phoneNumber_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:editable="true"/>
-
-    <TextView android:id="@+id/phoneNumber_true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:phoneNumber="true"/>
-
-    <TextView android:id="@+id/phoneNumber_false"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:phoneNumber="false"
-        android:editable="true"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/textview_selectallonfocus.xml b/proprietary/frameworks/base/tests/content/res/layout/textview_selectallonfocus.xml
deleted file mode 100755
index b1c3682537c9e6c39d7195a9ddd47bd46f2dc752..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/textview_selectallonfocus.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/selectAllOnFocus_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:focusable="true"/>
-
-    <TextView android:id="@+id/selectAllOnFocus_true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:selectAllOnFocus="true"
-        android:focusable="true"/>
-
-    <TextView android:id="@+id/selectAllOnFocus_false"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:selectAllOnFocus="false"
-        android:focusable="true"/>
-
-        <TextView android:id="@+id/selectAllOnFocus_dummy"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:focusable="true"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/timepicker.xml b/proprietary/frameworks/base/tests/content/res/layout/timepicker.xml
deleted file mode 100755
index 352f69be4ae150547fc32f0ed05d8d982929ce2f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/timepicker.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TimePicker xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/togglebutton_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/togglebutton_layout.xml
deleted file mode 100755
index bb8a07d760fe5a1809437a1bbfd93362c6ff25a3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/togglebutton_layout.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <ToggleButton android:id="@+id/toggle1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <ToggleButton android:id="@+id/toggle2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-    </LinearLayout>
-
-</ScrollView>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/twolinelistitem.xml b/proprietary/frameworks/base/tests/content/res/layout/twolinelistitem.xml
deleted file mode 100755
index ec256c1162a1a98a6f987b14a8219f27572f901d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/twolinelistitem.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TwoLineListItem xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:id="@+id/twoLineListItem">
-
-    <TextView android:id="@android:id/text1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/twolinelistitem_test_text1"/>
-
-    <TextView android:id="@android:id/text2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/twolinelistitem_test_text2"/>
-
-</TwoLineListItem>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/urlspan_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/urlspan_layout.xml
deleted file mode 100755
index 2ca95acc62a81b9e7352bb4ac27d1c03adc262cd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/urlspan_layout.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-    <TextView android:id="@+id/url"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="4dip"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:text="@string/text_view_hello"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/using_views_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/using_views_layout.xml
deleted file mode 100755
index b35aa08872e2558bae5c99d09b86a08dd1975428..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/using_views_layout.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:id="@+id/country"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/country"/>
-
-    <EditText
-        android:id="@+id/entry"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@android:drawable/editbox_background"
-        android:layout_below="@id/country"/>
-
-    <Button
-        android:id="@+id/cancel"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/entry"
-        android:layout_alignParentRight="true"
-        android:layout_marginLeft="10dip"
-        android:text="@string/id_cancel"/>
-
-    <Button
-        android:id="@+id/ok"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toLeftOf="@id/cancel"
-        android:layout_alignTop="@id/cancel"
-        android:text="@string/id_ok"/>
-
-    <TextView
-        android:id="@+id/symbol"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/ok"
-        android:text="@string/symbol"/>
-
-    <TextView
-        android:id="@+id/symbolball"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/symbol"
-        android:layout_marginLeft="20dip"/>
-
-    <TextView
-        android:id="@+id/warning"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#aa0000"
-        android:layout_below="@id/symbolball"
-        android:text="@string/country_warning"
-        android:visibility="invisible"
-        android:layout_weight="2"/>
-
-</RelativeLayout>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/videoview_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/videoview_layout.xml
deleted file mode 100755
index 9b042cbbb161571a8a84ed58e3a0cb937d56748f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/videoview_layout.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <VideoView
-        android:id="@+id/videoview"
-        android:layout_width="160px"
-        android:layout_height="120px"/>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/view_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/view_layout.xml
deleted file mode 100755
index 4443ba8dc83e6e9f35ae65b9259269aba807842c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/view_layout.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 Esmertec AG.
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/viewlayout_root"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <android.view.cts.MockView
-        android:id="@+id/mock_view"
-        android:layout_width="100px"
-        android:layout_height="200px"/>
-
-    <android.view.cts.MockView
-        android:id="@+id/scroll_view"
-        android:layout_width="100px"
-        android:layout_height="200px"
-        android:scrollbars="horizontal|vertical"
-        android:fadingEdge="horizontal|vertical"
-        android:fadingEdgeLength="20px"/>
-
-    <android.view.cts.MockView
-        android:id="@+id/scroll_view_2"
-        android:layout_width="100px"
-        android:layout_height="200px"
-        android:scrollbars="horizontal|vertical"
-        android:requiresFadingEdge="horizontal|vertical"
-        android:fadingEdgeLength="20px"/>
-
-    <View
-        android:id="@+id/fit_windows"
-        android:fitsSystemWindows="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/view_layout_position.xml b/proprietary/frameworks/base/tests/content/res/layout/view_layout_position.xml
deleted file mode 100755
index 7d28186afc530cc54aac190c7f6108fb18fcd44a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/view_layout_position.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 Esmertec AG.
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-            android:id="@+id/testparent"
-            android:layout_marginLeft = "1dip"
-            android:layout_marginTop = "2dip"
-            android:layout_marginRight = "3dip"
-            android:layout_marginBottom = "4dip"
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-        <View
-            android:id="@+id/testview"
-            android:layout_marginLeft = "5dip"
-            android:layout_marginTop = "6dip"
-            android:layout_marginRight = "7dip"
-            android:layout_marginBottom = "8dip"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
-
-    </LinearLayout>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/view_visibility_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/view_visibility_layout.xml
deleted file mode 100755
index 92d22ed6fece6f2b4f50ca94e31c1b0761c1d214..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/view_visibility_layout.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <View
-        android:id="@+id/textview1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="visible"/>
-
-    <View
-        android:id="@+id/textview2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="invisible"/>
-
-    <View
-        android:id="@+id/textview3"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"/>
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/viewanimator_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/viewanimator_layout.xml
deleted file mode 100755
index 96b24837d96898e96f240dce5da86bf52e430dff..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/viewanimator_layout.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<!-- Demonstrates using a relative layout to create a form -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:focusable="true"
-    android:background="@drawable/blue">
-
-    <TextView android:id="@+id/label"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
-        android:text="@string/viewanimator_test"/>
-
-    <EditText android:id="@+id/entry"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@android:drawable/editbox_background"
-        android:layout_below="@id/label"/>
-
-    <Button android:id="@+id/cancel"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/entry"
-        android:layout_alignParentRight="true"
-        android:layout_marginLeft="10px"
-        android:text="@string/id_cancel" />
-
-    <Button android:id="@+id/ok"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toLeftOf="@id/cancel"
-        android:layout_alignTop="@id/cancel"
-        android:text="@string/id_ok" />
-
-</RelativeLayout>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/viewflipper_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/viewflipper_layout.xml
deleted file mode 100755
index 6480379e29de40fae1d065bfe617ed8b25058107..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/viewflipper_layout.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-        android:padding="10dip"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-    <ViewFlipper android:id="@+id/viewflipper_test"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:flipInterval="1000"
-                android:layout_marginBottom="20dip" >
-                <TextView android:id="@+id/viewflipper_textview1"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_horizontal"
-                        android:textSize="26sp"
-                        android:visibility="gone"
-                        android:text="@string/hello_world"/>
-                <TextView android:id="@+id/viewflipper_textview2"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_horizontal"
-                        android:textSize="26sp"
-                        android:visibility="gone"
-                        android:text="@string/hello_android"/>
-    </ViewFlipper>
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/viewgroup_margin_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/viewgroup_margin_layout.xml
deleted file mode 100755
index 8e750c9d1decd8b4996ce9ff2f18cfdf86d75721..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/viewgroup_margin_layout.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:padding="10dip"
-    android:layout_width="200dip"
-    android:layout_height="300dip">
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/viewgrouptest_stub.xml b/proprietary/frameworks/base/tests/content/res/layout/viewgrouptest_stub.xml
deleted file mode 100755
index ee591265c7634c7a5c432dafc47c67c92d860cfb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/viewgrouptest_stub.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<android.widget.cts.MockLinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/mocklinearlayout">
-
-    <!-- view1 goes on top -->
-    <TextView
-        android:id="@+id/viewgrouptest_stub"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-    />
-
-</android.widget.cts.MockLinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/viewstub_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/viewstub_layout.xml
deleted file mode 100755
index 5c7ff22d381365504c2c76911d635fc4c65b4143..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/viewstub_layout.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ViewStub android:id="@+id/viewstub"
-        android:inflatedId="@+id/inflated_id"
-        android:layout="@layout/textview_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/viewswitcher_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/viewswitcher_layout.xml
deleted file mode 100755
index 933dc325284d3186290f74e73efa63fd6d1d8fb6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/viewswitcher_layout.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ViewSwitcher android:id="@+id/viewswitcher_test"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/viewtreeobserver_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/viewtreeobserver_layout.xml
deleted file mode 100755
index 66e98b21bb24c7692f9ae2f00fca85c2870c2108..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/viewtreeobserver_layout.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/linearlayout"
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <View android:id="@+id/view1"
-        android:layout_width="match_parent"
-        android:layout_height="10dip"
-        android:focusable="true"/>
-
-    <View android:id="@+id/view2"
-        android:layout_width="match_parent"
-        android:layout_height="10dip"
-        android:focusable="true"/>
-
-    <Button android:id="@+id/button1"
-        android:layout_width="wrap_content"
-        android:layout_height="10dip" />
-
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/content/res/layout/webview_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/webview_layout.xml
deleted file mode 100755
index 7a0ed0d1fa1516abe6cb153db75fb0ee9c7e021e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/webview_layout.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <WebView android:id="@+id/web_page"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/windowstub_addlayout.xml b/proprietary/frameworks/base/tests/content/res/layout/windowstub_addlayout.xml
deleted file mode 100755
index 0d6399e9b678500b99a4de1c795d5c46f5126472..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/windowstub_addlayout.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView android:id="@+id/listview_addwindow"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</ScrollView>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/windowstub_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/windowstub_layout.xml
deleted file mode 100755
index 0cf7d6d6068b8f3f2972cfee501f5f45e116e1d3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/windowstub_layout.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/listview_window"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
-     </TextView>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/windowstub_presentation.xml b/proprietary/frameworks/base/tests/content/res/layout/windowstub_presentation.xml
deleted file mode 100755
index 80490c412d7d5332017ca478a525dace7a498710..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/windowstub_presentation.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <Button
-        android:id="@+id/presentation_button1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_weight="1"
-        android:text="@string/vertical_text_1" />
-    <Button
-        android:id="@+id/presentation_button2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_weight="1"
-        android:text="@string/vertical_text_2" />
-    <Button
-        android:id="@+id/presentation_button3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_weight="1"
-        android:text="@string/vertical_text_3" />
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/xml_test.xml b/proprietary/frameworks/base/tests/content/res/layout/xml_test.xml
deleted file mode 100755
index 470228172c8c4207daeebb38e361e1e35ab1b451..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/xml_test.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/content/res/layout/zoombutton_layout.xml b/proprietary/frameworks/base/tests/content/res/layout/zoombutton_layout.xml
deleted file mode 100755
index 1b1e0b2c9bc8c341ee44830934a4bcc0cf85e976..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/layout/zoombutton_layout.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<ZoomButton xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/zoombutton_test"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-/>
-
diff --git a/proprietary/frameworks/base/tests/content/res/menu/browser.xml b/proprietary/frameworks/base/tests/content/res/menu/browser.xml
deleted file mode 100755
index 29e51496afb0e00ebe174eb60515199e3b44890c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/menu/browser.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <group android:id="@+id/MAIN_MENU">
-        <item android:id="@+id/goto_menu_id"
-            android:title="@string/hello_world"
-            android:alphabeticShortcut="l"/>
-    </group>
-
-</menu>
diff --git a/proprietary/frameworks/base/tests/content/res/menu/category_order.xml b/proprietary/frameworks/base/tests/content/res/menu/category_order.xml
deleted file mode 100755
index 06a69932aec49f32d197a41bbea95e21acd4db09..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/menu/category_order.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- This group uses the default category. -->
-    <group android:id="@+id/most_used_items">
-
-        <item android:id="@+id/last_most_item"
-            android:orderInCategory="5"
-            android:title="Last most often" />
-
-        <item android:id="@+id/middle_most_item"
-            android:orderInCategory="3"
-            android:title="Middle most often" />
-
-        <item android:id="@+id/first_most_item"
-            android:orderInCategory="1"
-            android:title="First most often" />
-
-    </group>
-
-    <!-- This group uses the secondary category, which is used for less oftenly used items.
-         Notice these items will show up after the above items.
-         (Furthermore, notice how the orders in each category are independent from the other
-         category.) -->
-    <group android:id="@+id/least_used_items"
-        android:menuCategory="secondary">
-
-        <item android:id="@+id/last_least_item"
-            android:orderInCategory="4"
-            android:title="Last least often" />
-
-        <item android:id="@+id/middle_least_item"
-            android:orderInCategory="2"
-            android:title="Middle least often" />
-
-        <item android:id="@+id/first_least_item"
-            android:orderInCategory="0"
-            android:title="First least often" />
-
-    </group>
-
-</menu>
diff --git a/proprietary/frameworks/base/tests/content/res/menu/checkable.xml b/proprietary/frameworks/base/tests/content/res/menu/checkable.xml
deleted file mode 100755
index 339d9c9cf93d1b76d448fb3006fd5d8333cc2c30..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/menu/checkable.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Checkable items appear only in submenus or context menus. -->
-
-    <!-- Carefully look at the attribute name checkableBehavior on groups, but
-         the attribute name checkable on items. The checkableBehavior encompasses
-         the number of items that will be checkable within that group. -->
-
-    <item android:title="None">
-        <menu>
-            <!-- The none checkableBehavior is default, but we explicitly show it here. -->
-            <group android:id="@+id/noncheckable_group"
-                    android:checkableBehavior="none">
-                <!-- Notice how these items inherit from the group. -->
-                <item android:id="@+id/noncheckable_item_1"
-                        android:title="Item 1" />
-                <item android:id="@+id/noncheckable_item_2"
-                        android:title="Item 2" />
-                <item android:id="@+id/noncheckable_item_3"
-                        android:title="Item 3" />
-            </group>
-        </menu>
-    </item>
-
-    <item android:title="All">
-        <menu>
-            <group android:id="@+id/checkable_group"
-                    android:checkableBehavior="all">
-                <!-- Notice how these items inherit from the group. -->
-                <item android:id="@+id/checkable_item_1"
-                        android:title="Item 1" />
-                <item android:id="@+id/checkable_item_2"
-                        android:title="Item 2"
-                        android:checked="true" />
-                <item android:id="@+id/checkable_item_3"
-                        android:title="Item 3"
-                        android:checked="true" />
-            </group>
-        </menu>
-    </item>
-
-    <item android:title="Single">
-        <menu>
-            <group android:id="@+id/exclusive_checkable_group"
-                    android:checkableBehavior="single">
-                <!-- Notice how these items inherit from the group. -->
-                <item android:id="@+id/exclusive_checkable_item_1"
-                        android:title="Item 1" />
-                <item android:id="@+id/exclusive_checkable_item_2"
-                        android:title="Item 2" />
-                <item android:id="@+id/exclusive_checkable_item_3"
-                        android:title="Item 3"
-                        android:checked="true" />
-            </group>
-        </menu>
-    </item>
-
-    <item android:title="All without group"
-            android:id="@+id/submenu">
-        <menu>
-            <!-- Notice how these items have each set. -->
-            <item android:id="@+id/nongroup_checkable_item_1"
-                    android:title="Item 1"
-                    android:checkable="true" />
-            <item android:id="@+id/nongroup_checkable_item_2"
-                    android:title="Item 2"
-                    android:checkable="true"
-                    android:checked="true" />
-            <item android:id="@+id/nongroup_checkable_item_3"
-                    android:title="Item 3"
-                    android:checkable="true"
-                    android:checked="true" />
-        </menu>
-    </item>
-
-</menu>
diff --git a/proprietary/frameworks/base/tests/content/res/menu/menu_searchview.xml b/proprietary/frameworks/base/tests/content/res/menu/menu_searchview.xml
deleted file mode 100755
index d9f64755d5f444286e2cd103774b0895762f8246..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/menu/menu_searchview.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/menu_search"
-        android:title="Search"
-        android:icon="@android:drawable/ic_menu_search"
-        android:showAsAction="ifRoom"
-        android:actionLayout="@layout/searchview" />
-</menu>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/content/res/menu/title_icon.xml b/proprietary/frameworks/base/tests/content/res/menu/title_icon.xml
deleted file mode 100755
index d8cdc52e9ecafb28ccda55fdb1e8344e2017505c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/menu/title_icon.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:id="@+id/start"
-        android:title="Start"
-        android:icon="@drawable/start" />
-
-    <item android:id="@+id/pass"
-        android:title="Pass"
-        android:icon="@drawable/pass" />
-
-    <item android:id="@+id/failed"
-        android:title="Failed"
-        android:icon="@drawable/failed" />
-
-</menu>
diff --git a/proprietary/frameworks/base/tests/content/res/menu/visible_shortcut.xml b/proprietary/frameworks/base/tests/content/res/menu/visible_shortcut.xml
deleted file mode 100755
index 4d6f3620f6861416a5212d82804155bf24fb7f1f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/menu/visible_shortcut.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:id="@+id/visible_item"
-        android:title="Visible"
-        android:alphabeticShortcut="a" />
-
-    <item android:id="@+id/hidden_item"
-        android:title="Hidden"
-        android:visible="false"
-        android:alphabeticShortcut="b" />
-
-    <group android:id="@+id/hidden_group"
-        android:visible="false">
-
-        <item android:id="@+id/hidden_by_group"
-            android:title="Hidden by group"
-            android:alphabeticShortcut="c" />
-
-    </group>
-
-</menu>
diff --git a/proprietary/frameworks/base/tests/content/res/raw/basetex.png b/proprietary/frameworks/base/tests/content/res/raw/basetex.png
deleted file mode 100755
index c47a8a5dfee29d5ec48f54d83428d0311e908166..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/basetex.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/ddstex.dds b/proprietary/frameworks/base/tests/content/res/raw/ddstex.dds
deleted file mode 100755
index a865693fb56cdb8019c8c562861e0a136a4bf81e..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/ddstex.dds and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/leak.bc b/proprietary/frameworks/base/tests/content/res/raw/leak.bc
deleted file mode 100755
index 327f25c690e71dde212631d4b65c026a47d01c38..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/leak.bc and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/pvrtex.pvr b/proprietary/frameworks/base/tests/content/res/raw/pvrtex.pvr
deleted file mode 100755
index c92962d0b47e40f31e992f75cc49d928a5d869af..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/pvrtex.pvr and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/samplefont.ttf b/proprietary/frameworks/base/tests/content/res/raw/samplefont.ttf
deleted file mode 100755
index 49f1c620b548e3abd34cf3bd8f0fd73b86b0199e..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/samplefont.ttf and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/scenery.jpg b/proprietary/frameworks/base/tests/content/res/raw/scenery.jpg
deleted file mode 100755
index 7d1f5e18f4a8b6143ad2da065f00bf6a6b713926..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/scenery.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/set_target_api_11.bc b/proprietary/frameworks/base/tests/content/res/raw/set_target_api_11.bc
deleted file mode 100755
index fa04be6597ffc11e967d3e1c257f6c8041d8fa30..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/set_target_api_11.bc and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/set_target_api_12.bc b/proprietary/frameworks/base/tests/content/res/raw/set_target_api_12.bc
deleted file mode 100755
index abe314f88835b67f343c19d8b6c434b3693047c6..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/set_target_api_12.bc and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/set_target_api_13.bc b/proprietary/frameworks/base/tests/content/res/raw/set_target_api_13.bc
deleted file mode 100755
index 4fa5b756eb49ce9871f86eeb52dd46c093e2f0dc..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/set_target_api_13.bc and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/set_target_api_14.bc b/proprietary/frameworks/base/tests/content/res/raw/set_target_api_14.bc
deleted file mode 100755
index 876b37c7d797de0052b2faaca00a8c2f487f239c..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/set_target_api_14.bc and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/set_target_api_15.bc b/proprietary/frameworks/base/tests/content/res/raw/set_target_api_15.bc
deleted file mode 100755
index d2de6d91e9e09c923bed3812f4bfc4ad903d2d66..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/set_target_api_15.bc and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/set_target_api_16.bc b/proprietary/frameworks/base/tests/content/res/raw/set_target_api_16.bc
deleted file mode 100755
index ca9aa65b99095086b7e1a76cf177bf16eec765e9..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/set_target_api_16.bc and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/set_target_api_17.bc b/proprietary/frameworks/base/tests/content/res/raw/set_target_api_17.bc
deleted file mode 100755
index b08b389550da55adca1faf46ac966e253778f2bb..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/set_target_api_17.bc and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/set_target_api_too_high.bc b/proprietary/frameworks/base/tests/content/res/raw/set_target_api_too_high.bc
deleted file mode 100755
index 95b20266a7737ce2060b8ec8bb8953324e0a90cb..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/set_target_api_too_high.bc and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/sig_devkeys.bin b/proprietary/frameworks/base/tests/content/res/raw/sig_devkeys.bin
deleted file mode 100755
index 3c2ad83b6220e542329435bf3148e1874eacaaa0..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/sig_devkeys.bin and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/sig_devkeys_media.bin b/proprietary/frameworks/base/tests/content/res/raw/sig_devkeys_media.bin
deleted file mode 100755
index 670d0d90c949a33e34a83ba4c3eb22212406cbe8..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/sig_devkeys_media.bin and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/sig_devkeys_platform.bin b/proprietary/frameworks/base/tests/content/res/raw/sig_devkeys_platform.bin
deleted file mode 100755
index 066e2d000714b7d96caee2f10f9009304622d689..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/sig_devkeys_platform.bin and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/sig_devkeys_shared.bin b/proprietary/frameworks/base/tests/content/res/raw/sig_devkeys_shared.bin
deleted file mode 100755
index 70257979575f322bfdb4e302b3c6cb75ecaeeddf..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/sig_devkeys_shared.bin and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/sig_media.bin b/proprietary/frameworks/base/tests/content/res/raw/sig_media.bin
deleted file mode 100755
index a43bc68a280d0db6dbe5698f5e1a15488208d392..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/sig_media.bin and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/sig_platform.bin b/proprietary/frameworks/base/tests/content/res/raw/sig_platform.bin
deleted file mode 100755
index 33a683ee8cc7d5beeeb906d759890203295f5ff9..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/sig_platform.bin and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/sig_shared.bin b/proprietary/frameworks/base/tests/content/res/raw/sig_shared.bin
deleted file mode 100755
index 094b1b91449f690ae63b21386d94d826e5c21513..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/sig_shared.bin and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/sig_testkey.bin b/proprietary/frameworks/base/tests/content/res/raw/sig_testkey.bin
deleted file mode 100755
index e2bef19e60e03e2cbb26fb01d5c5213be723d32e..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/sig_testkey.bin and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/sphere.a3d b/proprietary/frameworks/base/tests/content/res/raw/sphere.a3d
deleted file mode 100755
index 3d78b0195f27068151ad225451af57ffb8c8c464..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/sphere.a3d and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/test1.obb b/proprietary/frameworks/base/tests/content/res/raw/test1.obb
deleted file mode 100755
index a6b3e1c84cd57a9d970feb1ca450d8e7a6aff9d7..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/test1.obb and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/test1_nosig.obb b/proprietary/frameworks/base/tests/content/res/raw/test1_nosig.obb
deleted file mode 100755
index 5c3573f72a1eb09b3b7de669c15754a0ba4c308d..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/test1_nosig.obb and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/test1_wrongpackage.obb b/proprietary/frameworks/base/tests/content/res/raw/test1_wrongpackage.obb
deleted file mode 100755
index d0aafe16e1ac351f67a60f3f42475b7becd681be..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/test1_wrongpackage.obb and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/testimage.jpg b/proprietary/frameworks/base/tests/content/res/raw/testimage.jpg
deleted file mode 100755
index d3dae03217989761015af1434b69ae588a96f860..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/testimage.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/testmp3.mp3 b/proprietary/frameworks/base/tests/content/res/raw/testmp3.mp3
deleted file mode 100755
index 657faf77186fbe5b80ab6d79fc94a418e5e0053f..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/testmp3.mp3 and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/testvideo.3gp b/proprietary/frameworks/base/tests/content/res/raw/testvideo.3gp
deleted file mode 100755
index 1503272e6a8fe49cc7cee197a5487f993495438d..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/content/res/raw/testvideo.3gp and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/content/res/raw/text.txt b/proprietary/frameworks/base/tests/content/res/raw/text.txt
deleted file mode 100755
index 3d8c5195bffcf0a36aec4727d59d344b722fa2e9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/raw/text.txt
+++ /dev/null
@@ -1 +0,0 @@
-OneTwoThreeFourFiveSixSevenEightNineTen
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/content/res/values-12key-63x57/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-12key-63x57/configVarying.xml
deleted file mode 100755
index 5229f28f2dff385dba3d78e2aaa96d0e18da729c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-12key-63x57/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 12key 63x57</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 12key 63x57</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-12key-dpad/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-12key-dpad/configVarying.xml
deleted file mode 100755
index 4622574ca5fc60929bb1df4241fa883701a35489..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-12key-dpad/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 12key dpad</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 12key dpad</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-12key/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-12key/configVarying.xml
deleted file mode 100755
index 38174d7aa0e83eb1d55b2f0348ed38b2d89217f4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-12key/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 12key</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 12key</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-240dpi/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-240dpi/configVarying.xml
deleted file mode 100755
index 3b437998c3d5e735f16a2e5511bbecb838fc3f1e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-240dpi/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 240dpi</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 240dpi</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-32dpi-keysexposed/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-32dpi-keysexposed/configVarying.xml
deleted file mode 100755
index 67dd4a5b8f124f213fdeb67ad5759eb02379a45e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-32dpi-keysexposed/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 32dpi keysexposed</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 32dpi keysexposed</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-32dpi-stylus/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-32dpi-stylus/configVarying.xml
deleted file mode 100755
index 948784a25945256f0b11842633c89a265425193e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-32dpi-stylus/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 32dpi stylus</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 32dpi stylus</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-32dpi/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-32dpi/configVarying.xml
deleted file mode 100755
index f903f0fdf7a101e1cf7656f53fd59329c24b191e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-32dpi/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 32dpi</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 32dpi</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-480x320/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-480x320/configVarying.xml
deleted file mode 100755
index ade144bbcb53f62ae5c372a0ecafd3f17b125725..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-480x320/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 480x320</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 480x320</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-640x400/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-640x400/configVarying.xml
deleted file mode 100755
index 30332c0967b0ee55144b2a9e0845efaae7155976..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-640x400/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 640x400</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 640x400</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-cs/strings.xml b/proprietary/frameworks/base/tests/content/res/values-cs/strings.xml
deleted file mode 100755
index 396bebd4e081b28ce0da7bba2b1b51cf4b1181e5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-cs/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <plurals name="plurals_test">
-        <item quantity="one">A Czech dog</item>
-        <item quantity="few">Few Czech dogs</item>
-        <item quantity="other">Some Czech dogs</item>
-    </plurals>
-</resources>
-
diff --git a/proprietary/frameworks/base/tests/content/res/values-dpad-63x57/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-dpad-63x57/configVarying.xml
deleted file mode 100755
index 6b93c7d14f42c878921dab8181131783746ab285..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-dpad-63x57/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple dpad 63x57</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag dpad 63x57</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-dpad/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-dpad/configVarying.xml
deleted file mode 100755
index 0b0760fa133c4dc0eb5263f34346e95aa47e369e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-dpad/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple dpad</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag dpad</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-fr-rFR/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-fr-rFR/configVarying.xml
deleted file mode 100755
index 5ecac7caff8adc75437536118e0e2ede7f2dbd02..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-fr-rFR/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple fr FR</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag fr FR</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-fr/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-fr/configVarying.xml
deleted file mode 100755
index 8413b5a7008693ce6e7a1ec2bf3c3e78ae584fdd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-fr/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple fr</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag fr</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-h550dp/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-h550dp/configVarying.xml
deleted file mode 100755
index 2faab0edfc847bdc8fb1d0b61120de8e2b47c8b2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-h550dp/configVarying.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple h550</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag h550</item>
-    </bag>
-    <item type="configVarying" name="h">550</item>
-    <item type="configVarying" name="wh">550</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-h670dp/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-h670dp/configVarying.xml
deleted file mode 100755
index 21ade5bde1b6f703a66fff652d4a64b71ec2c75f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-h670dp/configVarying.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple h670</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag h670</item>
-    </bag>
-    <item type="configVarying" name="h">670</item>
-    <item type="configVarying" name="wh">670</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-keysexposed-12key/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-keysexposed-12key/configVarying.xml
deleted file mode 100755
index 311d5db5726801820e4c3b8e367c64e28533dea3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-keysexposed-12key/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple keysexposed 12key</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag keysexposed 12key</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-keysexposed-dpad/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-keysexposed-dpad/configVarying.xml
deleted file mode 100755
index 7c6caeb1dcd7d630ca432d74714355411e9b814e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-keysexposed-dpad/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple keysexposed dpad</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag keysexposed dpad</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-keysexposed/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-keysexposed/configVarying.xml
deleted file mode 100755
index befd5352df0f6fde3ffe5fc4172fcdf79edfdb34..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-keysexposed/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple keysexposed</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag keysexposed</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-land/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-land/configVarying.xml
deleted file mode 100755
index d5ece199bfed254960eada34260819c6a1fbbf07..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-land/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple landscape</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag landscape</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-land/dimens.xml b/proprietary/frameworks/base/tests/content/res/values-land/dimens.xml
deleted file mode 100755
index 88220fa831a75ca5ae068d0a769569f8dd1a5529..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-land/dimens.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources>
-    <dimen name="reference_width">480dp</dimen>
-    <dimen name="reference_height">320dp</dimen>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-large/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-large/configVarying.xml
deleted file mode 100755
index 7b2df7c1d11122e84772904817e9d7eef88b7375..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-large/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple large</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag large</item>
-    </bag>
-    <item type="configVarying" name="large">large</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-mcc110-xx/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-mcc110-xx/configVarying.xml
deleted file mode 100755
index 82e24355d035bb424e4f050925913a4adbde2e39..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-mcc110-xx/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mcc110 xx</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mcc110 xx</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-mcc111-mnc222/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-mcc111-mnc222/configVarying.xml
deleted file mode 100755
index 7f85a14f2e9fffecad5480832812edb2d523200b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-mcc111-mnc222/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mcc111 mnc222</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mcc111 mnc222</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-mcc111-xx-rYY/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-mcc111-xx-rYY/configVarying.xml
deleted file mode 100755
index 6b094dc1683246f8b3054e3cd654cff43cf5db50..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-mcc111-xx-rYY/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mcc111 xx-rYY</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mcc111 xx-rYY</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-mcc111-xx/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-mcc111-xx/configVarying.xml
deleted file mode 100755
index 6d01bcee8aed2868ddaefe88c097ce3d1d38d997..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-mcc111-xx/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mcc111 xx</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mcc111 xx</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-mcc111/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-mcc111/configVarying.xml
deleted file mode 100755
index 656c2bdce32b3fe692fbbcdb6ca10512220cb661..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-mcc111/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mcc111</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mcc111</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-mcc112/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-mcc112/configVarying.xml
deleted file mode 100755
index 9c05d77b6d7b7425efc453d623c095c21461fe75..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-mcc112/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mcc112</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mcc112</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-mnc220-xx/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-mnc220-xx/configVarying.xml
deleted file mode 100755
index fbc78882d8aa5d3142238aff54bf3926ada27cdc..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-mnc220-xx/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mnc220 xx</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mnc220 xx</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-mnc222-32dpi/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-mnc222-32dpi/configVarying.xml
deleted file mode 100755
index 03bea33ae2d07af0ca3bfaaf600990748e01935b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-mnc222-32dpi/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mnc222 32dpi</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mnc222 32dpi</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-mnc222-square/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-mnc222-square/configVarying.xml
deleted file mode 100755
index 4a64117de261e12731421ea74680e80b217eb01d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-mnc222-square/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mnc222 square</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mnc222 square</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-mnc222-xx/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-mnc222-xx/configVarying.xml
deleted file mode 100755
index 80570f549e35756f1626494a301e4f54ea99e7a9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-mnc222-xx/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mnc222 xx</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mnc222 xx</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-mnc222/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-mnc222/configVarying.xml
deleted file mode 100755
index 54bb47e6083a5f22e269703ca443c11e3a23be93..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-mnc222/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mnc222</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mnc222</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-mnc223/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-mnc223/configVarying.xml
deleted file mode 100755
index 8936cbcb09bfc54ab5c83bbcc021d799d8178397..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-mnc223/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mnc223</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mnc223</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-nokeys/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-nokeys/configVarying.xml
deleted file mode 100755
index e0b23bcf603a30ae3b4c8b5cf3d871e14703cbb0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-nokeys/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple nokeys</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag nokeys</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-nonav/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-nonav/configVarying.xml
deleted file mode 100755
index 1ec8520729a366a7a4a39ac418d4fb972fc773c2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-nonav/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple nonav</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag nonav</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-normal/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-normal/configVarying.xml
deleted file mode 100755
index b45ee49dddf90b7a510afcfcc7ec04c6328b9d99..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-normal/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple normal</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag normal</item>
-    </bag>
-    <item type="configVarying" name="normal">normal</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-notouch/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-notouch/configVarying.xml
deleted file mode 100755
index ed0833b09310f20f6e1e67dfcbe2323b47682520..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-notouch/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple notouch</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag notouch</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-small/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-small/configVarying.xml
deleted file mode 100755
index 15a9f8f1bb9feac4de815afb333c222762a620ee..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-small/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple small</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag small</item>
-    </bag>
-    <item type="configVarying" name="small">small</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-square-32dpi/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-square-32dpi/configVarying.xml
deleted file mode 100755
index f205f46fccf37d968dcbfc6530f4e9c18422b96f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-square-32dpi/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple square 32dpi</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag square 32dpi</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-square-stylus/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-square-stylus/configVarying.xml
deleted file mode 100755
index 861c21590b4d238b3d885fde1e47327eafab031c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-square-stylus/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple square stylus</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag square stylus</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-square/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-square/configVarying.xml
deleted file mode 100755
index 055fd35153273e00f05f1a8701c318543e2226e9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-square/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple square</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag square</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-stylus-12key/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-stylus-12key/configVarying.xml
deleted file mode 100755
index 47db444dfefad1849499f6aa29fd3411a924c9b8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-stylus-12key/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple stylus 12key</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag stylus 12key</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-stylus-keysexposed/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-stylus-keysexposed/configVarying.xml
deleted file mode 100755
index cf5598f6267856308dd2d50daf6cc3da33a818e8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-stylus-keysexposed/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple stylus keysexposed</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag stylus keysexposed</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-stylus/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-stylus/configVarying.xml
deleted file mode 100755
index 862c2bcd7ef45b9ae1c374f2a8a157720120f2b0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-stylus/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple stylus</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag stylus</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-sw590dp-hdpi/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-sw590dp-hdpi/configVarying.xml
deleted file mode 100755
index 9864e505a38ad88b727f29fcf15a5e510143fd85..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-sw590dp-hdpi/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple sw590 hdpi</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag sw590 hdpi</item>
-    </bag>
-    <item type="configVarying" name="sw">590 hdpi</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-sw590dp-mdpi/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-sw590dp-mdpi/configVarying.xml
deleted file mode 100755
index 7089ca95ae82fc5cb5b785a2d5c96050e58cc08b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-sw590dp-mdpi/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple sw590 mdpi</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag sw590 mdpi</item>
-    </bag>
-    <item type="configVarying" name="sw">590 mdpi</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-sw590dp-xhdpi/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-sw590dp-xhdpi/configVarying.xml
deleted file mode 100755
index 5c55f2c2e068972824b1955b866504b86b10771e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-sw590dp-xhdpi/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple sw590 xhdpi</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag sw590 xhdpi</item>
-    </bag>
-    <item type="configVarying" name="sw">590 xhdpi</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-sw590dp/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-sw590dp/configVarying.xml
deleted file mode 100755
index 85639214d535e90f48e0ed370f6c1c44c33ce72e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-sw590dp/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple sw590</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag sw590</item>
-    </bag>
-    <item type="configVarying" name="sw">590</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-sw591dp-hdpi/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-sw591dp-hdpi/configVarying.xml
deleted file mode 100755
index 880dced27963223352c72fd5ff730cee6bee22e8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-sw591dp-hdpi/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple sw591 hdpi</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag sw591 hdpi</item>
-    </bag>
-    <item type="configVarying" name="sw">591 hdpi</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-sw591dp/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-sw591dp/configVarying.xml
deleted file mode 100755
index 4a0ee8533e5161b3c840708fa09d8992fadac8bb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-sw591dp/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple sw591</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag sw591</item>
-    </bag>
-    <item type="configVarying" name="sw">591</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-sw600dp-land/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-sw600dp-land/configVarying.xml
deleted file mode 100755
index c18dda6a3b3510b523cdeb1f9b1157bb4d6dc972..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-sw600dp-land/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple sw600 land</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag sw600 land</item>
-    </bag>
-    <item type="configVarying" name="sw">600 land</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-sw600dp-land/dimens.xml b/proprietary/frameworks/base/tests/content/res/values-sw600dp-land/dimens.xml
deleted file mode 100755
index 1b1c95e20edef59a3d869e5919ac8eae21b2a8b8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-sw600dp-land/dimens.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources>
-    <dimen name="reference_width">1024dip</dimen>
-    <dimen name="reference_height">600dip</dimen>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-sw600dp/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-sw600dp/configVarying.xml
deleted file mode 100755
index 5ecea456dfc061d9c0761b7867e0bb09dd9e01d8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-sw600dp/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple sw600</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag sw600</item>
-    </bag>
-    <item type="configVarying" name="sw">600</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-sw600dp/dimens.xml b/proprietary/frameworks/base/tests/content/res/values-sw600dp/dimens.xml
deleted file mode 100755
index ab7b46423f41fea97058975b0315c371d5db55eb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-sw600dp/dimens.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources>
-    <dimen name="reference_width">600dp</dimen>
-    <dimen name="reference_height">1024dp</dimen>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-sw720dp/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-sw720dp/configVarying.xml
deleted file mode 100755
index 99af476750cb9df38ae0b5cc80cf7c65678e0443..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-sw720dp/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple sw720</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag sw720</item>
-    </bag>
-    <item type="configVarying" name="sw">720</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-v10/strings.xml b/proprietary/frameworks/base/tests/content/res/values-v10/strings.xml
deleted file mode 100755
index 6cd55fa2a3e95c03e208feca0873747c82252658..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-v10/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v10cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-v11/strings.xml b/proprietary/frameworks/base/tests/content/res/values-v11/strings.xml
deleted file mode 100755
index d4d75ff6f69397ce9833f3dcce558e8a50905a4e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-v11/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v11cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-v12/strings.xml b/proprietary/frameworks/base/tests/content/res/values-v12/strings.xml
deleted file mode 100755
index ab421fa29b141c7f551615fd3275cbb2007b478a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-v12/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v12cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-v13/strings.xml b/proprietary/frameworks/base/tests/content/res/values-v13/strings.xml
deleted file mode 100755
index c3f723c95bf3ab21f50c24a99d933c2879a19500..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-v13/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v13cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-v14/strings.xml b/proprietary/frameworks/base/tests/content/res/values-v14/strings.xml
deleted file mode 100755
index 45f5fbeaf94ed8795cca0616941dd681c0dd3a38..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-v14/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v14cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-v15/strings.xml b/proprietary/frameworks/base/tests/content/res/values-v15/strings.xml
deleted file mode 100755
index c1d5e483f5db5919e2a82e75d4d3d66ca98abd09..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-v15/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v15cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-v16/strings.xml b/proprietary/frameworks/base/tests/content/res/values-v16/strings.xml
deleted file mode 100755
index e7a3e8e1a241419290b6d36771e73be9ca077cb5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-v16/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v16cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-v17/strings.xml b/proprietary/frameworks/base/tests/content/res/values-v17/strings.xml
deleted file mode 100755
index fcf9d917730aee14a3109f39f7b301382646a402..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-v17/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v17cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-v18/strings.xml b/proprietary/frameworks/base/tests/content/res/values-v18/strings.xml
deleted file mode 100755
index d03c5cba10282aeae29025a7bcd94efe4645ec1b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-v18/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v18cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-v19/strings.xml b/proprietary/frameworks/base/tests/content/res/values-v19/strings.xml
deleted file mode 100755
index 833ca082201ae2cf90840a395571b15a89e63535..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-v19/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v19cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-v20/strings.xml b/proprietary/frameworks/base/tests/content/res/values-v20/strings.xml
deleted file mode 100755
index f47207aeeed6e054d3da8aef165ff28d932dfa82..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-v20/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v20cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-v21/strings.xml b/proprietary/frameworks/base/tests/content/res/values-v21/strings.xml
deleted file mode 100755
index ac8f8a764e1ecebbde9e58c721bfe2b29b8657c5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-v21/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v21cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-v22/strings.xml b/proprietary/frameworks/base/tests/content/res/values-v22/strings.xml
deleted file mode 100755
index 6b51a01970543ec61131580b69a4da4d56aa7104..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-v22/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v22cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-v3/strings.xml b/proprietary/frameworks/base/tests/content/res/values-v3/strings.xml
deleted file mode 100755
index a4d012abb24de3948118ac9cc0cc7ddeda9e0ddd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-v3/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v3cur</string>
-   <string name="version_v3">v3</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-v4/strings.xml b/proprietary/frameworks/base/tests/content/res/values-v4/strings.xml
deleted file mode 100755
index e6d414a5898cdc0e997ac0e2ed8ede5ebfa0817d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-v4/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v4cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-v5/strings.xml b/proprietary/frameworks/base/tests/content/res/values-v5/strings.xml
deleted file mode 100755
index ef3a564658b743b1ddfb9c8bb688d964105b75a2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-v5/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v5cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-v6/strings.xml b/proprietary/frameworks/base/tests/content/res/values-v6/strings.xml
deleted file mode 100755
index fb1f15dff66a67bd155c6093b31e4549f8819b36..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-v6/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v6cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-v7/strings.xml b/proprietary/frameworks/base/tests/content/res/values-v7/strings.xml
deleted file mode 100755
index 4c3df45b5b1010b068f0ea38bf9ee4a5d6dda480..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-v7/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v7cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-v8/strings.xml b/proprietary/frameworks/base/tests/content/res/values-v8/strings.xml
deleted file mode 100755
index b4e1d88c15ee1328ca7bd576e5e2cf16161a2821..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-v8/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v8cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-v9/strings.xml b/proprietary/frameworks/base/tests/content/res/values-v9/strings.xml
deleted file mode 100755
index a03ea12b24764a4829486ac4dcdfbc431c3f3ade..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-v9/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v9cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-w600dp-h550dp/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-w600dp-h550dp/configVarying.xml
deleted file mode 100755
index d4361a86e8163e8a49a20eef011ecee479fd57e3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-w600dp-h550dp/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple sw600</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag sw600</item>
-    </bag>
-    <item type="configVarying" name="wh">600-550</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-w600dp/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-w600dp/configVarying.xml
deleted file mode 100755
index b8248a63063abc6752907e0baa17ed9200319eb5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-w600dp/configVarying.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple w600</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag w600</item>
-    </bag>
-    <item type="configVarying" name="w">600</item>
-    <item type="configVarying" name="wh">600</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-w720dp-h670dp/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-w720dp-h670dp/configVarying.xml
deleted file mode 100755
index c2057864f44fbc9b7027f7cbb279248a9e6c16b8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-w720dp-h670dp/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 720-670</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 720-670</item>
-    </bag>
-    <item type="configVarying" name="wh">720-670</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-w720dp/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-w720dp/configVarying.xml
deleted file mode 100755
index 3211ad4634c4f885d9b2f29b3ba5dc8c6ba61011..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-w720dp/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple w720</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag w720</item>
-    </bag>
-    <item type="configVarying" name="w">720</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-wheel/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-wheel/configVarying.xml
deleted file mode 100755
index 64173a899cfb90440e55d331c08458fed780d352..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-wheel/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple wheel</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag wheel</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-xlarge/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-xlarge/configVarying.xml
deleted file mode 100755
index fb9cad7c78f7da633e9568a7c9fceb110b63888a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-xlarge/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple xlarge</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag xlarge</item>
-    </bag>
-    <item type="configVarying" name="xlarge">xlarge</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-xx-32dpi/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-xx-32dpi/configVarying.xml
deleted file mode 100755
index dc17c6b2dbaa34cb575c997788ee42fec068a33f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-xx-32dpi/configVarying.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <item type="configVarying" name="simple">simple xx 32dpi</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag xx 32dpi</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-xx-rYY/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-xx-rYY/configVarying.xml
deleted file mode 100755
index 903d008aa0214d38f940e91208b266ac37142628..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-xx-rYY/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple xx-rYY</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag xx-rYY</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-xx-square/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-xx-square/configVarying.xml
deleted file mode 100755
index 6ef5d431f299821c2fe56cbad2923e48b44787ac..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-xx-square/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple xx square</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag xx square</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values-xx/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values-xx/configVarying.xml
deleted file mode 100755
index 191e4f763a3cc0fd4eba07717851c2eeb1d5b839..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values-xx/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple xx</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag xx</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values/arrays.xml b/proprietary/frameworks/base/tests/content/res/values/arrays.xml
deleted file mode 100755
index 71e013317f3bf9c91f3ad260c014d325a7687b02..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values/arrays.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources>
-    <item type="integer" name="reference" format="integer">101</item>
-
-      <string-array name="strings">
-        <item>zero</item>
-        <item>1</item>
-        <item>@string/reference</item>
-    </string-array>
-
-    <integer-array name="integers">
-        <item>0</item>
-        <item>1</item>
-        <item>@integer/reference</item>
-    </integer-array>
-
-    <array name="difficultyLevel">
-        <item>Easy</item>
-        <item>Medium</item>
-        <item>Hard</item>
-    </array>
-
-    <string-array name="string">
-        <item>Test String 1</item>
-        <item>Test String 2</item>
-        <item>Test String 3</item>
-    </string-array>
-
-    <integer-array name="table_row_layout">
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-        <item>8</item>
-        <item>9</item>
-        <item>10</item>
-    </integer-array>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values/attrs.xml b/proprietary/frameworks/base/tests/content/res/values/attrs.xml
deleted file mode 100755
index 97938933925bee9b8f3bfd62e12d84c7320b66f2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values/attrs.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources>
-    <declare-styleable name="Style1">
-        <attr name="Type1" format="integer">
-            <enum name="type" value="28" />
-            <enum name="data" value="0xff00ff00" />
-            <enum name="asset_cookie" value="0" />
-            <enum name="resource_id" value="0" />
-            <enum name="changing_config" value="0" />
-        </attr>
-        <attr name="Type2" format="integer">
-            <enum name="type" value="28" />
-            <enum name="data" value="0xff0000ff" />
-            <enum name="asset_cookie" value="0" />
-            <enum name="resource_id" value="0" />
-            <enum name="changing_config" value="0" />
-        </attr>
-    </declare-styleable>
-    <attr name="type1" format="boolean"/>
-    <attr name="type2" format="boolean"/>
-    <attr name="type3" format="color"/>
-    <attr name="type4" format="reference|color"/>
-    <attr name="type5" format="dimension"/>
-    <attr name="type6" format="dimension"/>
-    <attr name="type7" format="dimension"/>
-    <attr name="type8" format="reference"/>
-    <attr name="type9" format="float"/>
-    <attr name="type10" format="fraction"/>
-    <attr name="type11" format="integer"/>
-    <attr name="type12" format="integer"/>
-    <attr name="type13" format="reference|string"/>
-    <attr name="type14" format="string"/>
-    <attr name="type15" format="reference"/>
-    <attr name="type16" format="string"/>
-    <declare-styleable name="style1">
-        <attr name="type1"/>
-        <attr name="type2"/>
-        <attr name="type3"/>
-        <attr name="type4"/>
-        <attr name="type5"/>
-        <attr name="type6"/>
-        <attr name="type7"/>
-        <attr name="type8"/>
-        <attr name="type9"/>
-        <attr name="type10"/>
-        <attr name="type11"/>
-        <attr name="type12"/>
-        <attr name="type13"/>
-        <attr name="type14"/>
-        <attr name="type15"/>
-        <attr name="type16"/>
-    </declare-styleable>
-    <attr name="testEnum">
-        <enum name="val1" value="1" />
-        <enum name="val2" value="2" />
-        <enum name="val10" value="10" />
-    </attr>
-    <attr name="testFlags">
-        <flag name="bit1" value="0x1" />
-        <flag name="bit2" value="0x2" />
-        <flag name="bit31" value="0x40000000" />
-    </attr>
-    <attr name="testString" format="string" />
-    <declare-styleable name="EnumStyle">
-        <attr name="testEnum" />
-    </declare-styleable>
-    <declare-styleable name="FlagStyle">
-        <attr name="testFlags" />
-    </declare-styleable>
-    <declare-styleable name="TestConfig">
-        <attr name="testString" />
-    </declare-styleable>
-    <!-- Size of text. Recommended dimension type for text is "sp" for scaled-pixels (example: 15sp).
-         Supported values include the following:<p/>
-    <ul>
-        <li><b>px</b> Pixels</li>
-        <li><b>sp</b> Scaled pixels (scaled to relative pixel size on screen). See {@link android.util.DisplayMetrics} for more information.</li>
-        <li><b>pt</b> Points</li>
-        <li><b>dip</b> Device independent pixels. See {@link android.util.DisplayMetrics} for more information.</li>
-    </ul>
-    -->
-    <attr name="textSize" format="dimension" />
-    <attr name="typeface">
-        <enum name="normal" value="0" />
-        <enum name="sans" value="1" />
-        <enum name="serif" value="2" />
-        <enum name="monospace" value="3" />
-    </attr>
-    <!-- Default text typeface style. -->
-    <attr name="textStyle">
-        <flag name="normal" value="0" />
-        <flag name="bold" value="1" />
-        <flag name="italic" value="2" />
-    </attr>
-    <!-- Color of text (usually same as colorForeground). -->
-    <attr name="textColor" format="reference|color" />
-    <!-- Color of highlighted text. -->
-    <attr name="textColorHighlight" format="reference|color" />
-    <!-- Color of hint text (displayed when the field is empty). -->
-    <attr name="textColorHint" format="reference|color" />
-    <!-- Color of link text (URLs). -->
-    <attr name="textColorLink" format="reference|color" />
-    <declare-styleable name="TextAppearance">
-        <attr name="textColor"/>
-        <attr name="textSize"/>
-        <attr name="textStyle"/>
-        <attr name="typeface"/>
-        <attr name="textColorHighlight"/>
-        <attr name="textColorHint"/>
-        <attr name="textColorLink"/>
-    </declare-styleable>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values/bools.xml b/proprietary/frameworks/base/tests/content/res/values/bools.xml
deleted file mode 100755
index f119cda25a81f8489c157882d190be576f109495..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values/bools.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources>
-	<bool name="trueRes">true</bool>
-	<bool name="falseRes">false</bool>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values/colors.xml b/proprietary/frameworks/base/tests/content/res/values/colors.xml
deleted file mode 100755
index f3cc3255e58e96c02d8288a2c1aab696b2814719..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values/colors.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources>
-    <drawable name="red">#7f00</drawable>
-    <drawable name="blue">#770000ff</drawable>
-    <drawable name="black">#77ffffff</drawable>
-    <drawable name="yellow">#77ffff00</drawable>
-    <color name="testcolor1">#ff00ff00</color>
-    <color name="testcolor2">#ffff0000</color>
-    <color name="failColor">#ff0000ff</color>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values/configVarying.xml b/proprietary/frameworks/base/tests/content/res/values/configVarying.xml
deleted file mode 100755
index 7b7d576a2b34eb703b4d3f8a8adc2ace7bf917df..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values/configVarying.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple default</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag default</item>
-    </bag>
-    <item type="configVarying" name="small">default</item>
-    <item type="configVarying" name="normal">default</item>
-    <item type="configVarying" name="large">default</item>
-    <item type="configVarying" name="xlarge">default</item>
-    <item type="configVarying" name="sw">default</item>
-    <item type="configVarying" name="w">default</item>
-    <item type="configVarying" name="h">default</item>
-    <item type="configVarying" name="wh">default</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values/dimens.xml b/proprietary/frameworks/base/tests/content/res/values/dimens.xml
deleted file mode 100755
index bae216f14d5bf93ef8f45e3bb8715f6d15e38359..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values/dimens.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources>
-    <item name="frac100perc" type="dimen" format="fraction">100%</item>
-    <item name="frac1perc" type="dimen" format="fraction">1%</item>
-    <item name="fracp1perc" type="dimen" format="fraction">.1%</item>
-    <item name="fracp01perc" type="dimen" format="fraction">.01%</item>
-    <item name="frac0perc" type="dimen" format="fraction">0%</item>
-    <item name="frac1p1perc" type="dimen" format="fraction">1.1%</item>
-    <item name="frac100p1perc" type="dimen" format="fraction">100.1%</item>
-    <item name="frac25510perc" type="dimen" format="fraction">25510%</item>
-    <item name="frac25610perc" type="dimen" format="fraction">25610%</item>
-    <item name="frac6553510perc" type="dimen" format="fraction">6553510%</item>
-    <item name="frac6553610perc" type="dimen" format="fraction">6553610%</item>
-
-    <item name="frac100pperc" type="dimen" format="fraction">100%p</item>
-    <item name="frac1pperc" type="dimen" format="fraction">1%p</item>
-    <item name="fracp1pperc" type="dimen" format="fraction">.1%p</item>
-    <item name="fracp01pperc" type="dimen" format="fraction">.01%p</item>
-    <item name="frac0pperc" type="dimen" format="fraction">0%p</item>
-    <item name="frac1p1pperc" type="dimen" format="fraction">1.1%p</item>
-    <item name="frac100p1pperc" type="dimen" format="fraction">100.1%p</item>
-    <item name="frac25510pperc" type="dimen" format="fraction">25510%p</item>
-    <item name="frac25610pperc" type="dimen" format="fraction">25610%p</item>
-    <item name="frac6553510pperc" type="dimen" format="fraction">6553510%p</item>
-    <item name="frac6553610pperc" type="dimen" format="fraction">6553610%p</item>
-</resources>
-
diff --git a/proprietary/frameworks/base/tests/content/res/values/ids.xml b/proprietary/frameworks/base/tests/content/res/values/ids.xml
deleted file mode 100755
index 30e081bba1abd91047309468967566e4bea86046..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values/ids.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-  <item type="id" name="background" />
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values/resources_test.xml b/proprietary/frameworks/base/tests/content/res/values/resources_test.xml
deleted file mode 100755
index 91c2c4aa92dd75ce738e5b954bdb84d25de83d45..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values/resources_test.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-     <!-- The width that is used when creating thumbnails of applications. -->
-     <dimen name="thumbnail_width">84dp</dimen>
-     <!-- The height that is used when creating thumbnails of applications. -->
-     <dimen name="thumbnail_height">63dp</dimen>
-     <!-- The standard size (both width and height) of an application icon that
-          will be displayed in the app launcher and elsewhere. -->
-     <dimen name="app_icon_size">48px</dimen>
-     <dimen name="toast_y_offset">64dip</dimen>
-     <plurals name="plurals_test">
-        <item quantity="one">A dog</item>
-        <item quantity="other">Some dogs</item>
-      </plurals>
-     <color name="resource_test_color">#003B3B3B</color>
-     <integer name="resource_test_int">10</integer>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values/strings.xml b/proprietary/frameworks/base/tests/content/res/values/strings.xml
deleted file mode 100755
index 0ab3dd6d0a3720869dfe58495738cab9f5276c3f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values/strings.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permlab_testGranted">Test Granted</string>
-    <string name="permdesc_testGranted">Used for running CTS tests, for testing operations
-        where we have the permission.</string>
-    <string name="permlab_testDynamic">Test Dynamic</string>
-    <string name="permdesc_testDynamic">Used for running CTS tests, for testing adding
-        dynamic permissions.</string>
-    <string name="permlab_testDenied">Test Denied</string>
-    <string name="permdesc_testDenied">Used for running CTS tests, for testing operations
-        where we do not have the permission.</string>
-    <string name="explain">1. click start. \n2. if above image shaked, then press pass button,
-         else press failed button.</string>
-    <string name="text_view_hello">Hello! Text view!</string>
-    <string name="text_view_hello_two_lines">Hello! \nText view!</string>
-    <string name="text_view_simple_hint">This is a hint.</string>
-    <string name="text_view_hint">This is a string for testing hint of textview.</string>
-    <string name="activity_forwarding">App/Forwarding</string>
-    <string name="forwarding">$$$</string>
-    <string name="go">Go</string>
-    <string name="back">Back</string>
-    <string name="forward_target">
-        Press back button and notice we don\'t see the previous activity.
-    </string>
-    <string name="edit_text">testing</string>
-    <string name="text">DialogTest</string>
-    <string name="text_country">Country</string>
-    <string name="text_name">Name</string>
-    <string name="hello_world">Hello, World!</string>
-    <string name="hello_android">Hello, Android!</string>
-    <string name="alert_dialog_username">Name:</string>
-    <string name="alert_dialog_password">Password:</string>
-    <string name="alert_dialog_positive">Positive</string>
-    <string name="alert_dialog_negative">Negative</string>
-    <string name="alert_dialog_neutral">Neutral</string>
-    <string name="notify">Notify </string>
-    <string name="tabs_1">testing</string>
-    <string name="table_layout_first">first</string>
-    <string name="table_layout_second">second</string>
-    <string name="table_layout_third">third</string>
-    <string name="table_layout_long">Very long to make the string out of the screen</string>
-    <string name="chronometer_text">Test Chronometer</string>
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
-    <string name="viewgroup_test">ViewGroup test</string>
-    <string name="viewanimator_test">ViewAnimator test</string>
-    <string name="id_ok">OK</string>
-    <string name="id_cancel">Cancel</string>
-    <string name="context_test_string1">This is %s string.</string>
-    <string name="context_test_string2">This is test string.</string>
-    <string name="animationutils_test_instructions">Choose different animations</string>
-    <string name="animationutils_test_alpha">Alpha animation</string>
-    <string name="animationutils_test_scale">Scale animation</string>
-    <string name="animationutils_test_rotate">Rotate animation</string>
-    <string name="animationutils_test_translate">Translate animation</string>
-    <string name="animationutils_test_set">Animation set</string>
-    <string name="animationutils_test_layout">Layout animation</string>
-    <string name="animationutils_test_gridlayout">Grid layout animation</string>
-    <string name="twolinelistitem_test_text1">text1</string>
-    <string name="twolinelistitem_test_text2">text2</string>
-    <string name="metadata_text">metadata text</string>
-    <string name="horizontal_text_1">horizontal 1</string>
-    <string name="horizontal_text_2">horizontal 2</string>
-    <string name="horizontal_text_3">horizontal 3</string>
-    <string name="vertical_text_1">vertical 1</string>
-    <string name="vertical_text_2">vertical 2</string>
-    <string name="vertical_text_3">vertical 3</string>
-    <string name="reference">here</string>
-    <string name="coerceIntegerToString">100</string>
-    <string name="coerceBooleanToString">true</string>
-    <string name="coerceColorToString">#fff</string>
-    <string name="coerceFloatToString">100.0</string>
-    <string name="coerceDimensionToString">100px</string>
-    <string name="coerceFractionToString">100<xliff:g id="percent">%</xliff:g></string>
-    <string name="formattedStringNone">Format[]</string>
-    <string name="formattedStringOne">Format[<xliff:g id="format">%d</xliff:g>]</string>
-    <string name="formattedStringTwo">Format[<xliff:g id="format">%3$d,%2$s</xliff:g>]</string>
-    <string name="checkboxpref_key">checkboxpref_key</string>
-   <string name="checkboxpref_title">title of preference</string>
-   <string name="checkboxpref_summary">summary of preference</string>
-   <string name="checkboxpref_summary_on">summary on of preference</string>
-   <string name="checkboxpref_summary_off">summary off of preference</string>
-   <string name="checkboxpref_depend">checkboxpref_depend</string>
-   <string name="checkboxpref_depend_title"> depend title of preference</string>
-   <string name="checkboxpref_depend_summary"> depend summary of preference</string>
-   <string name="edittextpref_key">edittextpref_key</string>
-   <string name="edittextpref_default_value">default value of preference</string>
-   <string name="edittextpref_title">title of edit text preference</string>
-   <string name="edittextpref_summary">summary of edit text preference</string>
-   <string name="edittextpref_dialog_title">dialog title of edit text preference</string>
-   <string name="edittextpref_text">text of  edit text preference</string>
-   <string name="listpref_key">listpref_key</string>
-   <string name="listpref_title">title of list preference</string>
-   <string name="listpref_summary">summary of list preference</string>
-   <string name="listpref_dialogtitle">dialog title of list preference</string>
-   <string name="easy">Easy</string>
-   <string name="medium">Medium</string>
-   <string name="hard">Hard</string>
-   <string name="footer_view">Footer view</string>
-   <string name="header_view">Header view</string>
-   <string name="dialogpref_title">title of dialog preference </string>
-   <string name="dialogpref_dialog_title">dialog title of dialog preference </string>
-   <string name="dialogpref_key">dialogpref_key</string>
-   <string name="dialogpref_default_value">default value of dialog preference</string>
-   <string name="dialogpref_summary">summary of dialog preference</string>
-   <string name="dialogpref_message">message of dialog preference</string>
-   <string name="dialogpref_sure">Sure</string>
-   <string name="dialogpref_cancel">Cancel</string>
-   <string name="pref_key">pref_key</string>
-   <string name="pref_title">title of preference</string>
-   <string name="pref_summary">summary of preference</string>
-   <string name="pref_depend_key">pref_depend_key</string>
-   <string name="pref_depend_title"> depend title of preference</string>
-   <string name="pref_depend_summary"> depend summary of preference</string>
-   <string name="android_intent_action_preference">android.intent.action.PREFERENCE</string>
-   <string name="def_pref_key">def_pref_key</string>
-   <string name="def_pref_title">default preference</string>
-   <string name="def_pref_summary">This is default preference of cts</string>
-   <string name="relative_view1">view 1</string>
-   <string name="relative_view2">view 2</string>
-   <string name="relative_view3">view 3</string>
-   <string name="relative_view4">view 4</string>
-   <string name="relative_view5">view 5</string>
-   <string name="relative_view6">view 6</string>
-   <string name="relative_view7">view 7</string>
-   <string name="relative_view8">view 8</string>
-   <string name="relative_view9">view 9</string>
-   <string name="relative_view10">view 10</string>
-   <string name="relative_view11">view 11</string>
-   <string name="relative_view12">view 12</string>
-   <string name="relative_view13">view 13</string>
-   <string name="country">Country:</string>
-   <string name="symbol">Symbol:</string>
-   <string name="country_warning">No such country registered</string>
-   <string name="version_cur">base</string>
-   <string name="version_old">base</string>
-   <string name="version_v3">base</string>
-   <string name="authenticator_label">Android CTS</string>
-   <string name="search_label">Android CTS</string>
-
-   <string name="button">Button</string>
-   <string name="holo_test">Holo Test</string>
-   <string name="holo_generator">Holo Generator</string>
-   <string name="holo_light_test">Holo Light Test</string>
-   <string name="holo_light_generator">Holo Light Generator</string>
-   <string name="reference_image">Reference Image: </string>
-   <string name="generated_image">Generated Image: </string>
-   <string name="themes_prompt">Select a Theme:</string>
-   <string name="sample_text">Sample text goes here. I wanted something creative and whimsical
-but then I just got bored...</string>
-    <string name="long_text">This is a really long string which exceeds the width of the view.
-New devices have a much larger screen which actually enables long strings to be displayed
-with no fading. I have made this string longer to fix this case. If you are correcting this
-text, I would love to see the kind of devices you guys now use! Guys, maybe some devices need longer string! </string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/values/styles.xml b/proprietary/frameworks/base/tests/content/res/values/styles.xml
deleted file mode 100755
index f8b56fdc3da3c474a7febdd8666fc1361935e421..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/values/styles.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-
-    <style name="Whatever">
-        <item name="type1">true</item>
-        <item name="type2">false</item>
-        <item name="type3">#ff0000ff</item>
-        <item name="type4">#ff00ff00</item>
-        <item name="type5">0.75px</item>
-        <item name="type6">10px</item>
-        <item name="type7">18px</item>
-        <item name="type8">@drawable/pass</item>
-        <item name="type9">3.14</item>
-        <item name="type10">100%</item>
-        <item name="type11">365</item>
-        <item name="type12">86400</item>
-        <item name="type13">@string/hello_android</item>
-        <item name="type14">TypedArray Test!</item>
-        <item name="type15">@array/difficultyLevel</item>
-        <item name="type16">Typed Value!</item>
-    </style>
-
-    <style name="TextViewWithoutColorAndAppearance">
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <style name="TextViewWithColorButWithOutAppearance">
-        <item name="android:textColor">#ff0000ff</item>
-    </style>
-
-    <style name="TextViewWithColorAndAppearance">
-        <item name="android:textColor">#ff0000ff</item>
-        <item name="android:textAppearance">@style/TextAppearance.WithColor</item>
-    </style>
-
-    <style name="TextViewWithoutColorButWithAppearance">
-        <item name="android:textAppearance">@style/TextAppearance.WithColor</item>
-    </style>
-
-    <style name="TextAppearance" parent="android:TextAppearance">
-    </style>
-
-    <style name="TextAppearance.WithColor">
-        <item name="android:textColor">#ffff0000</item>
-    </style>
-
-    <style name="TextAppearance.All">
-        <item name="android:textColor">@drawable/black</item>
-        <item name="android:textSize">20px</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textColorHint">@drawable/red</item>
-        <item name="android:textColorLink">@drawable/blue</item>
-        <item name="android:textColorHighlight">@drawable/yellow</item>
-    </style>
-
-    <style name="TextAppearance.Colors">
-        <item name="android:textColor">@drawable/black</item>
-        <item name="android:textColorHint">@drawable/blue</item>
-        <item name="android:textColorLink">@drawable/yellow</item>
-        <item name="android:textColorHighlight">@drawable/red</item>
-    </style>
-
-    <style name="TextAppearance.NotColors">
-        <item name="android:textSize">17px</item>
-        <item name="android:typeface">sans</item>
-        <item name="android:textStyle">normal</item>
-    </style>
-
-    <style name="TextAppearance.Style">
-        <item name="android:textStyle">normal</item>
-    </style>
-
-    <style name="TestEnum1">
-        <item name="testEnum">val1</item>
-    </style>
-
-    <style name="TestEnum2">
-        <item name="testEnum">val2</item>
-    </style>
-
-    <style name="TestEnum10">
-        <item name="testEnum">val10</item>
-    </style>
-
-    <style name="TestFlag1">
-        <item name="testFlags">bit1</item>
-    </style>
-
-    <style name="TestFlag2">
-        <item name="testFlags">bit2</item>
-    </style>
-
-    <style name="TestFlag31">
-        <item name="testFlags">bit31</item>
-    </style>
-
-    <style name="TestFlag1And2">
-        <item name="testFlags">bit1|bit2</item>
-    </style>
-
-    <style name="TestFlag1And2And31">
-        <item name="testFlags">bit1|bit2|bit31</item>
-    </style>
-
-    <style name="TestEnum1.EmptyInherit" />
-
-    <style name="Theme_AlertDialog">
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <style name="TestProgressBar">
-        <item name="android:indeterminateOnly">false</item>
-        <item name="android:progressDrawable">?android:drawable/progress_horizontal</item>
-        <item name="android:indeterminateDrawable">?android:drawable/progress_horizontal</item>
-        <item name="android:minHeight">20dip</item>
-        <item name="android:maxHeight">20dip</item>
-        <item name="android:focusable">true</item>
-    </style>
-
-    <style name="Test_Theme">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:panelColorForeground">#ff000000</item>
-        <item name="android:panelColorBackground">#ffffffff</item>
-    </style>
-
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/xml/alias.xml b/proprietary/frameworks/base/tests/content/res/xml/alias.xml
deleted file mode 100755
index f88f3dc4299568de641a8e040d08cabfc8e567fd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/alias.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<alias xmlns:android="http://schemas.android.com/apk/res/android">
-    <intent android:action="android.intent.action.MAIN"
-        android:targetPackage="com.android.cts.stub"
-        android:targetClass="android.app.cts.ChildActivity"
-        android:data="http://www.google.com/">
-    </intent>
-</alias>
-
diff --git a/proprietary/frameworks/base/tests/content/res/xml/anim_list_correct.xml b/proprietary/frameworks/base/tests/content/res/xml/anim_list_correct.xml
deleted file mode 100755
index 660aa96e96a102c25d2d81dc52d60a52a40a01ad..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/anim_list_correct.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:visible="false"
-    android:variablePadding="true"
-    android:oneshot="true" >
-
-    <item android:drawable="@drawable/testimage"
-        android:duration="2000" />
-
-    <item android:duration="1000" >
-        <color android:color="#77ffffff" />
-    </item>
-</animation-list>
-
diff --git a/proprietary/frameworks/base/tests/content/res/xml/anim_list_missing_item_drawable.xml b/proprietary/frameworks/base/tests/content/res/xml/anim_list_missing_item_drawable.xml
deleted file mode 100755
index 99052f4f0a2426a7dddd52e31064f1eea3ca1ca4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/anim_list_missing_item_drawable.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:duration="2000" />
-</animation-list>
-
diff --git a/proprietary/frameworks/base/tests/content/res/xml/anim_list_missing_item_duration.xml b/proprietary/frameworks/base/tests/content/res/xml/anim_list_missing_item_duration.xml
deleted file mode 100755
index e3986c2f5dfcc083514ba856733ec19932bbf668..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/anim_list_missing_item_duration.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:drawable="@drawable/testimage" />
-</animation-list>
-
diff --git a/proprietary/frameworks/base/tests/content/res/xml/anim_list_missing_list_attrs.xml b/proprietary/frameworks/base/tests/content/res/xml/anim_list_missing_list_attrs.xml
deleted file mode 100755
index 25d2dfec1dc326535e39501a8fa3d6083a5a4869..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/anim_list_missing_list_attrs.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:drawable="@drawable/testimage"
-        android:duration="2000" />
-</animation-list>
-
diff --git a/proprietary/frameworks/base/tests/content/res/xml/authenticator.xml b/proprietary/frameworks/base/tests/content/res/xml/authenticator.xml
deleted file mode 100755
index 1e298b133b5dbe1569af0dc59ac746491ec653f5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/authenticator.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright (c) 2009, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<!-- The attributes in this XML file provide configuration information -->
-<!-- for the Account Manager. -->
-
-<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="android.content.cts.account.type"
-    android:icon="@drawable/ic_cts_selected"
-    android:smallIcon="@drawable/ic_cts_minitab_selected"
-    android:label="@string/authenticator_label"
-/>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/content/res/xml/base_attributes.xml b/proprietary/frameworks/base/tests/content/res/xml/base_attributes.xml
deleted file mode 100755
index adb44de32e2e101af692c59ebb96522a3c778449..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/base_attributes.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<alias xmlns:android="http://schemas.android.com/apk/res/android">
-    <base_attr_pixel>
-        <Attributes xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="400px"
-            android:layout_height="600px"/>
-    </base_attr_pixel>
-    <base_attr_fillwrap>
-        <Attributes xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
-    </base_attr_fillwrap>
-    <base_attr_noheight>
-        <Attributes xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="600px"/>
-    </base_attr_noheight>
-</alias>
diff --git a/proprietary/frameworks/base/tests/content/res/xml/bitmapdrawable.xml b/proprietary/frameworks/base/tests/content/res/xml/bitmapdrawable.xml
deleted file mode 100755
index f9001aa9e4821540f83b335622379950e060cf39..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/bitmapdrawable.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<alias xmlns:android="http://schemas.android.com/apk/res/android">
-    <bitmap_allattrs>
-        <bitmap android:src="@drawable/testimage"
-            android:gravity="top|right"
-            android:dither="true"
-            android:antialias="true"
-            android:filter="false"
-            android:tileMode="repeat"/>
-    </bitmap_allattrs>
-
-    <bitmap_partattrs>
-        <bitmap android:src="@drawable/size_48x48"
-            android:gravity="center"
-            android:tileMode="mirror"/>
-    </bitmap_partattrs>
-
-    <bitmap_wrongsrc>
-        <bitmap android:src="@drawable/colorstatelist_test"/>
-    </bitmap_wrongsrc>
-
-    <bitmap_nosrc>
-        <bitmap android:gravity="center"/>
-    </bitmap_nosrc>
-</alias>
diff --git a/proprietary/frameworks/base/tests/content/res/xml/colors.xml b/proprietary/frameworks/base/tests/content/res/xml/colors.xml
deleted file mode 100755
index 8c44a667aec3cb8c53e424d7c7b9b31a8de57048..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/colors.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-<resources>
-    <color name="testcolor1">#ff00ff00</color>
-    <color name="testcolor2">#ffff0000</color>
-    <color name="failColor">#ff0000ff</color>
-</resources>
-
diff --git a/proprietary/frameworks/base/tests/content/res/xml/drawable_test.xml b/proprietary/frameworks/base/tests/content/res/xml/drawable_test.xml
deleted file mode 100755
index f2a2e5d2ed20a0e8b9538ab08978cbdd0193c13f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/drawable_test.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<drawable xmlns:android="http://schemas.android.com/apk/res/android" android:visible="false">
-</drawable>
-
diff --git a/proprietary/frameworks/base/tests/content/res/xml/extra.xml b/proprietary/frameworks/base/tests/content/res/xml/extra.xml
deleted file mode 100755
index b3bffb4ce403616af81e7f9a973a2eba75b25b40..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/extra.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<tag xmlns:android="http://schemas.android.com/apk/res/android" android:name="Bruce" android:value="Lee">
-    <extra android:name="google" android:value="android">
-    </extra>
-</tag>
diff --git a/proprietary/frameworks/base/tests/content/res/xml/input_extras.xml b/proprietary/frameworks/base/tests/content/res/xml/input_extras.xml
deleted file mode 100755
index ce5eb5eea0dddbd3730fadeccfb17512920e1d37..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/input_extras.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<input-extras xmlns:android="http://schemas.android.com/apk/res/android">
-    <extra android:name="google" android:value="android"/>
-    <extra android:name="test" android:value="cts"/>
-</input-extras>
-
diff --git a/proprietary/frameworks/base/tests/content/res/xml/intentfilter.xml b/proprietary/frameworks/base/tests/content/res/xml/intentfilter.xml
deleted file mode 100755
index 7ed3a534112ae83c6128973dbef1d2eaf7c36067..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/intentfilter.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-<intent-filter xmlns="http://schemas.android.com/apk/res/android">
-    <action name="testAction"/>
-    <cat name="testCategory" />
-    <type name="vnd.android.cursor.dir/person"/>
-    <scheme name="testScheme"/>
-    <auth host="testHost" port="80"/>
-    <path name="testPath" literal="test"/>
-    <path name="testPath" prefix="test"/>
-    <path name="testPath" sglob="test"/>
-</intent-filter>
diff --git a/proprietary/frameworks/base/tests/content/res/xml/layerdrawable.xml b/proprietary/frameworks/base/tests/content/res/xml/layerdrawable.xml
deleted file mode 100755
index 9bb1268f6d717f5407b5476fbf8ea96c8f3bb5c8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/layerdrawable.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<alias xmlns:android="http://schemas.android.com/apk/res/android">
-    <layer-list_full>
-        <layer-list>
-            <item><color android:color="#88ffffff">
-                <padding android:left="1px" android:top="2px" android:right="3px"
-                    android:bottom="4px"/>
-            </color></item>
-            <item android:drawable="@drawable/testimage"/>
-            <item>
-                <rotate
-                    android:pivotX="50%" android:pivotY="50%"
-                    android:fromDegrees="0" android:toDegrees="360"
-                    android:drawable="@drawable/testimage"/>
-                <padding android:left="4px" android:top="3px"
-                    android:right="2px" android:bottom="1px" />
-            </item>
-            <bitmap android:src="@drawable/testimage"/>
-            <item android:id="@id/background"
-                android:drawable="@drawable/window_test_drawable" />
-        </layer-list>
-    </layer-list_full>
-    <layer-list_empty>
-        <layer-list>
-            <bitmap android:src="@drawable/testimage"/>
-        </layer-list>
-    </layer-list_empty>
-    <layer-list_exception>
-        <layer-list>
-            <item android:id="@id/background"/>
-        </layer-list>
-    </layer-list_exception>
-</alias>
diff --git a/proprietary/frameworks/base/tests/content/res/xml/layout.xml b/proprietary/frameworks/base/tests/content/res/xml/layout.xml
deleted file mode 100755
index 6bcb27deaa1bb39f3477bd149f718b6968bd3cdc..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/layout.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<alias xmlns:android="http://schemas.android.com/apk/res/android">
-    <AbsoluteLayout    android:layout_width="20dip"
-               android:layout_height="30dip"
-               android:layout_x="10dip"
-               android:layout_y="20dip">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_x="0dip"
-                android:layout_y="0dip"
-                android:text="@string/notify">
-                <requestFocuse/>
-            </TextView>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_x="0dip"
-                android:layout_y="0dip"
-                android:text="@string/notify"/>
-
-            <View
-                android:id="@+id/fit_windows"
-                android:fitsSystemWindows="true"
-                android:layout_height="wrap_content"/>
-            <include layout="@xml/merge" />
-    </AbsoluteLayout>
-
-</alias>
diff --git a/proprietary/frameworks/base/tests/content/res/xml/level_list_correct.xml b/proprietary/frameworks/base/tests/content/res/xml/level_list_correct.xml
deleted file mode 100755
index 241ec16f1e2c1c42def95a96fc3ae38167080a86..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/level_list_correct.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<level-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:drawable="@drawable/testimage"
-        android:minLevel="100"
-        android:maxLevel="200" />
-
-    <item android:minLevel="200"
-        android:maxLevel="300" >
-        <color android:color="#77ffffff" />
-    </item>
-</level-list>
-
diff --git a/proprietary/frameworks/base/tests/content/res/xml/level_list_missing_item_drawable.xml b/proprietary/frameworks/base/tests/content/res/xml/level_list_missing_item_drawable.xml
deleted file mode 100755
index 506b10f952600e87690fad93badd3b1f1cc87c8f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/level_list_missing_item_drawable.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<level-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:minLevel="100"
-        android:maxLevel="200"/>
-</level-list>
-
diff --git a/proprietary/frameworks/base/tests/content/res/xml/level_list_missing_item_minlevel_maxlevel.xml b/proprietary/frameworks/base/tests/content/res/xml/level_list_missing_item_minlevel_maxlevel.xml
deleted file mode 100755
index f77bfd5cd4d020224b083176f7e9bc3207904e2f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/level_list_missing_item_minlevel_maxlevel.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<level-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:drawable="@drawable/testimage" />
-</level-list>
-
diff --git a/proprietary/frameworks/base/tests/content/res/xml/merge.xml b/proprietary/frameworks/base/tests/content/res/xml/merge.xml
deleted file mode 100755
index 710e9040aa2b4b1be0b2198b0f877c4ff079b839..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/merge.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-   <AbsoluteLayout    android:layout_width="20dip"
-               android:layout_height="30dip"
-               android:layout_x="10dip"
-               android:layout_y="20dip">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_x="0dip"
-                android:layout_y="0dip"
-                android:text="@string/notify"/>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_x="0dip"
-                android:layout_y="0dip"
-                android:text="@string/notify"/>
-
-    </AbsoluteLayout>
-
-</merge>
diff --git a/proprietary/frameworks/base/tests/content/res/xml/metadata.xml b/proprietary/frameworks/base/tests/content/res/xml/metadata.xml
deleted file mode 100755
index 336b931db7c918b373355f4e0e40005388885b27..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<thedata xmlns:android="http://schemas.android.com/apk/res/android"
-    rawText="some raw text"
-    rawColor="#ffffff00"
-    android:color="#f00"
-    android:text="@string/metadata_text"/>
diff --git a/proprietary/frameworks/base/tests/content/res/xml/method.xml b/proprietary/frameworks/base/tests/content/res/xml/method.xml
deleted file mode 100755
index 763faa5ca636c8b624b129dc9c30859e738cdc67..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/method.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<input-method xmlns:android="http://schemas.android.com/apk/res/android"
-        android:settingsActivity="android.view.inputmethod.cts.InputMethodInfoStub"
-/>
diff --git a/proprietary/frameworks/base/tests/content/res/xml/pm_test.xml b/proprietary/frameworks/base/tests/content/res/xml/pm_test.xml
deleted file mode 100755
index 4db24cf3246512619a82cb57a1c61e6c8ef285e1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/pm_test.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
- <!-- This xml is just test for PackageManager Test -->
-<resources>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/res/xml/preferences_from_intent.xml b/proprietary/frameworks/base/tests/content/res/xml/preferences_from_intent.xml
deleted file mode 100755
index 0911403138173f8ad0c6db2d3c8a96c4363c281b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/preferences_from_intent.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <CheckBoxPreference android:key="check_box_preference_from_intent"
-        android:defaultValue="false"
-        android:title="Check box preference"
-        android:summary="This is a check box preference."
-        />
-</PreferenceScreen>
diff --git a/proprietary/frameworks/base/tests/content/res/xml/preferences_from_resource.xml b/proprietary/frameworks/base/tests/content/res/xml/preferences_from_resource.xml
deleted file mode 100755
index d954032f456a71e8823743ab78993677d67fd3c7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/preferences_from_resource.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <CheckBoxPreference android:key="check_box_preference_from_resource"
-        android:defaultValue="false"
-        android:title="Check box preference"
-        android:summary="This is a check box preference."
-        />
-</PreferenceScreen>
diff --git a/proprietary/frameworks/base/tests/content/res/xml/scaledrawable.xml b/proprietary/frameworks/base/tests/content/res/xml/scaledrawable.xml
deleted file mode 100755
index d8d5f73bfdb3c3f20a61787d66569811326d29c7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/scaledrawable.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<alias xmlns:android="http://schemas.android.com/apk/res/android">
-    <scale_allattrs>
-        <scale
-            android:scaleWidth="0.4"
-            android:scaleHeight="0.3"
-            android:scaleGravity="center"
-            android:drawable="@drawable/testimage">
-            <color android:color="#88ffffff"/>
-            <bitmap android:src="@drawable/size_48x48"/>
-        </scale>
-    </scale_allattrs>
-
-    <scale_nodrawable>
-        <scale
-            android:scaleWidth="0.7"
-            android:scaleHeight="0.3"
-            android:scaleGravity="center"/>
-    </scale_nodrawable>
-</alias>
diff --git a/proprietary/frameworks/base/tests/content/res/xml/searchable.xml b/proprietary/frameworks/base/tests/content/res/xml/searchable.xml
deleted file mode 100755
index f526341b5570ac30598579a8098d87a6efcd9233..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/searchable.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<searchable xmlns:android="http://schemas.android.com/apk/res/android"
-    android:label="@string/search_label"
-/>
diff --git a/proprietary/frameworks/base/tests/content/res/xml/selector_correct.xml b/proprietary/frameworks/base/tests/content/res/xml/selector_correct.xml
deleted file mode 100755
index 917833f2ecaee544e2cc6f2fe6f4d47a3222c281..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/selector_correct.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:visible="false"
-    android:variablePadding="true"
-    android:constantSize="true" >
-
-    <item android:state_focused="true"
-        android:state_pressed="false"
-        android:drawable="@drawable/testimage" />
-
-    <item >
-        <color android:color="#77ffffff" />
-    </item>
-</selector>
-
diff --git a/proprietary/frameworks/base/tests/content/res/xml/selector_missing_item_drawable.xml b/proprietary/frameworks/base/tests/content/res/xml/selector_missing_item_drawable.xml
deleted file mode 100755
index 35bef42245f8d0e2efa8e31ec64cfb4cf6d46d0e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/selector_missing_item_drawable.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:visible="false"
-    android:variablePadding="true"
-    android:constantSize="true" >
-
-    <item android:state_focused="true"
-        android:state_pressed="false" />
-</selector>
-
diff --git a/proprietary/frameworks/base/tests/content/res/xml/selector_missing_selector_attrs.xml b/proprietary/frameworks/base/tests/content/res/xml/selector_missing_selector_attrs.xml
deleted file mode 100755
index 87ccc3c26b893edc89898440965aa5b4d61e4c44..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/selector_missing_selector_attrs.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:drawable="@drawable/testimage"
-        android:state_focused="true"
-        android:state_pressed="false" />
-</selector>
-
diff --git a/proprietary/frameworks/base/tests/content/res/xml/syncadapter.xml b/proprietary/frameworks/base/tests/content/res/xml/syncadapter.xml
deleted file mode 100755
index 1c0bb72dc03baa01f97631819a09780f015816bc..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/syncadapter.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright (c) 2009, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<!-- The attributes in this XML file provide configuration information -->
-<!-- for the SyncAdapter. -->
-
-<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:contentAuthority="android.content.cts.authority"
-    android:accountType="android.content.cts.account.type"
-/>
diff --git a/proprietary/frameworks/base/tests/content/res/xml/test_color.xml b/proprietary/frameworks/base/tests/content/res/xml/test_color.xml
deleted file mode 100755
index 97f7dec9a00ffe8466e5720d4140fcd0222a16ee..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/res/xml/test_color.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-        android:versionName="testNonResourcesString">
-    <color name="testcolor1">#ff00ff00</color>
-    <color name="testcolor2">#ffff0000</color>
-    <color name="failColor">#ff0000ff</color>
-</resources>
diff --git a/proprietary/frameworks/base/tests/content/src/android/content/cts/DummyProvider.java b/proprietary/frameworks/base/tests/content/src/android/content/cts/DummyProvider.java
deleted file mode 100755
index b4345195153a444a5100ec1fe0925535c8e8feda..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/src/android/content/cts/DummyProvider.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import dalvik.annotation.TestTargetClass;
-
-import android.content.ContentProvider;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.UriMatcher;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.net.Uri;
-
-/**
- * A simple content provider for AsyncQueryHandlerTest and ContentQueryMapTest.
- *
- * @see AsyncQueryHandlerTest
- * @see ContentQueryMapTest
- */
-@TestTargetClass(ContentProvider.class)
-public class DummyProvider extends ContentProvider {
-    private static final String MOCK_OPERATION = "mockOperation";
-
-    private static final String DATABASE_NAME = "dummy.db";
-    private static final String NAME_VALUE_TABLE = "name_value";
-
-    private DatabaseHelper mDbHelper;
-    private static UriMatcher sMatcher = new UriMatcher(UriMatcher.NO_MATCH);
-
-    private static final int MATCH_NAME_VALUE      = 1;
-    private static final int MATCH_MOCK_OPERATION  = 2;
-
-    public static final long MOCK_OPERATION_SLEEP_TIME = 2000;
-
-    public static final String AUTHORITY = "android.content.cts.dummyprovider";
-    public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY);
-    public static final Uri CONTENT_URI_MOCK_OPERATION = Uri.withAppendedPath(CONTENT_URI,
-            MOCK_OPERATION);
-
-    public static final String _ID   = "_id";
-    public static final String NAME  = "name";
-    public static final String VALUE = "value";
-
-    static {
-        sMatcher.addURI(AUTHORITY, null, MATCH_NAME_VALUE);
-        sMatcher.addURI(AUTHORITY, MOCK_OPERATION, MATCH_MOCK_OPERATION);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see android.content.ContentProvider#onCreate()
-     */
-    @Override
-    public boolean onCreate() {
-        mDbHelper = new DatabaseHelper(getContext());
-        return true;
-    }
-
-    private class DatabaseHelper extends SQLiteOpenHelper {
-        private static final int DATABASE_VERSION = 1;
-
-        DatabaseHelper(Context context) {
-            super(context, DATABASE_NAME, null, DATABASE_VERSION);
-        }
-
-        @Override
-        public void onCreate(SQLiteDatabase db) {
-            // create an empty name_value table
-            db.execSQL("CREATE TABLE " + NAME_VALUE_TABLE + " (" + _ID + " INTEGER PRIMARY KEY,"
-                    + NAME + " TEXT," + VALUE + " TEXT" + ");");
-        }
-
-        @Override
-        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see android.content.ContentProvider#insert(android.net.Uri,
-     * android.content.ContentValues)
-     */
-    @Override
-    public Uri insert(Uri uri, ContentValues values) {
-        String tbName = getTableName(uri);
-        if (tbName == null) {
-            return null;
-        }
-        SQLiteDatabase db = mDbHelper.getWritableDatabase();
-        db.insert(tbName, VALUE, values);
-        getContext().getContentResolver().notifyChange(uri, null);
-        return uri;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see android.content.ContentProvider#query(android.net.Uri,
-     * java.lang.String[], java.lang.String, java.lang.String[],
-     * java.lang.String)
-     */
-    @Override
-    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
-            String sortOrder) {
-        String tbName = getTableName(uri);
-        if (tbName == null) {
-            return null;
-        }
-        SQLiteDatabase db = mDbHelper.getReadableDatabase();
-        Cursor c = db.query(tbName, projection, selection, selectionArgs, null, null, sortOrder);
-        c.setNotificationUri(getContext().getContentResolver(), uri);
-        return c;
-    }
-
-    private String getTableName(Uri uri) {
-        switch (sMatcher.match(uri)) {
-            case MATCH_NAME_VALUE:
-                return NAME_VALUE_TABLE;
-            case MATCH_MOCK_OPERATION:
-                doMockOperation();
-                return null;
-            default:
-                throw new UnsupportedOperationException();
-        }
-    }
-
-    /**
-     * Simulate a long-running DB operation by sleeping.
-     */
-    private void doMockOperation() {
-        long time = System.currentTimeMillis();
-        long target = time + MOCK_OPERATION_SLEEP_TIME;
-        while (time < target) {
-            try {
-                Thread.sleep(target - time);
-            } catch (InterruptedException ignored) {
-                // ignore and continue sleeping, since a true long-running DB operation would not
-                // be affected by interrupt() either
-            }
-            time = System.currentTimeMillis();
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see android.content.ContentProvider#update(android.net.Uri,
-     * android.content.ContentValues, java.lang.String, java.lang.String[])
-     */
-    @Override
-    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-        String tbName = getTableName(uri);
-        if (tbName == null) {
-            return 0;
-        }
-        SQLiteDatabase db = mDbHelper.getWritableDatabase();
-        int count = db.update(tbName, values, selection, selectionArgs);
-        getContext().getContentResolver().notifyChange(uri, null);
-        return count;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see android.content.ContentProvider#delete(android.net.Uri,
-     * java.lang.String, java.lang.String[])
-     */
-    @Override
-    public int delete(Uri uri, String selection, String[] selectionArgs) {
-        String tbName = getTableName(uri);
-        if (tbName == null) {
-            return 0;
-        }
-        SQLiteDatabase db = mDbHelper.getWritableDatabase();
-        int count = db.delete(tbName, selection, selectionArgs);
-        getContext().getContentResolver().notifyChange(uri, null);
-        return count;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see android.content.ContentProvider#getType(android.net.Uri)
-     */
-    @Override
-    public String getType(Uri uri) {
-        return null;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/content/src/android/content/cts/MockAccountAuthenticator.java b/proprietary/frameworks/base/tests/content/src/android/content/cts/MockAccountAuthenticator.java
deleted file mode 100755
index 9a1b5b3baab405612411e6170c0d8950a95af629..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/src/android/content/cts/MockAccountAuthenticator.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import android.accounts.AbstractAccountAuthenticator;
-import android.accounts.Account;
-import android.accounts.AccountAuthenticatorResponse;
-import android.accounts.AccountManager;
-import android.accounts.NetworkErrorException;
-import android.content.Context;
-import android.os.Bundle;
-
-public class MockAccountAuthenticator extends AbstractAccountAuthenticator {
-
-    private static MockAccountAuthenticator sMockAuthenticator = null;
-    public static final String ACCOUNT_NAME = "android.content.cts.account.name";
-    public static final String ACCOUNT_TYPE = "android.content.cts.account.type";
-    public static final String ACCOUNT_PASSWORD = "android.content.cts.account.password";
-    public static final String AUTH_TOKEN = "mockAuthToken";
-    public static final String AUTH_TOKEN_LABEL = "mockAuthTokenLabel";
-
-    public MockAccountAuthenticator(Context context) {
-        super(context);
-    }
-
-    private Bundle createResultBundle() {
-        Bundle result = new Bundle();
-        result.putString(AccountManager.KEY_ACCOUNT_NAME, ACCOUNT_NAME);
-        result.putString(AccountManager.KEY_ACCOUNT_TYPE, ACCOUNT_TYPE);
-        result.putString(AccountManager.KEY_AUTHTOKEN, AUTH_TOKEN);
-
-        return result;
-    }
-
-    @Override
-    public Bundle addAccount(AccountAuthenticatorResponse response, String accountType,
-            String authTokenType, String[] requiredFeatures, Bundle options)
-            throws NetworkErrorException {
-        return createResultBundle();
-    }
-
-    @Override
-    public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) {
-        return createResultBundle();
-    }
-
-    @Override
-    public Bundle updateCredentials(AccountAuthenticatorResponse response, Account account,
-            String authTokenType, Bundle options) throws NetworkErrorException {
-        return createResultBundle();
-    }
-
-    @Override
-    public Bundle confirmCredentials(AccountAuthenticatorResponse response, Account account,
-            Bundle options) throws NetworkErrorException {
-
-        Bundle result = new Bundle();
-        result.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, true);
-        return result;
-    }
-
-    @Override
-    public Bundle getAuthToken(AccountAuthenticatorResponse response, Account account,
-            String authTokenType, Bundle options) throws NetworkErrorException {
-        return createResultBundle();
-    }
-
-    @Override
-    public String getAuthTokenLabel(String authTokenType) {
-        return AUTH_TOKEN_LABEL;
-    }
-
-    @Override
-    public Bundle hasFeatures(AccountAuthenticatorResponse response, Account account,
-            String[] features) throws NetworkErrorException {
-
-        Bundle result = new Bundle();
-        result.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, true);
-        return result;
-    }
-
-    public static synchronized MockAccountAuthenticator getMockAuthenticator(Context context) {
-        if (null == sMockAuthenticator) {
-            sMockAuthenticator = new MockAccountAuthenticator(context);
-        }
-        return sMockAuthenticator;
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/content/src/android/content/cts/MockAccountService.java b/proprietary/frameworks/base/tests/content/src/android/content/cts/MockAccountService.java
deleted file mode 100755
index a076d777c9848321b059b3f8f0035047140bdbfd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/src/android/content/cts/MockAccountService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-
-/**
- * a basic Mock Service for wrapping the MockAccountAuthenticator
- */
-public class MockAccountService extends Service {
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return MockAccountAuthenticator.getMockAuthenticator(this).getIBinder();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/content/src/android/content/cts/MockContentProvider.java b/proprietary/frameworks/base/tests/content/src/android/content/cts/MockContentProvider.java
deleted file mode 100755
index de82c0d0839a3c93f62d0634dd69c1d9eed946d8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/src/android/content/cts/MockContentProvider.java
+++ /dev/null
@@ -1,417 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
-
-import android.content.ContentProvider;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.UriMatcher;
-import android.content.ContentProvider.PipeDataWriter;
-import android.content.res.AssetFileDescriptor;
-import android.database.Cursor;
-import android.database.SQLException;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.database.sqlite.SQLiteQueryBuilder;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.CancellationSignal;
-import android.os.ParcelFileDescriptor;
-import android.text.TextUtils;
-import android.util.Log;
-
-public class MockContentProvider extends ContentProvider
-        implements PipeDataWriter<String> {
-
-    private SQLiteOpenHelper mOpenHelper;
-
-    private static final String DEFAULT_AUTHORITY = "ctstest";
-    private static final String DEFAULT_DBNAME = "ctstest.db";
-    private static final int DBVERSION = 2;
-
-    private static final int TESTTABLE1 = 1;
-    private static final int TESTTABLE1_ID = 2;
-    private static final int TESTTABLE1_CROSS = 3;
-    private static final int TESTTABLE2 = 4;
-    private static final int TESTTABLE2_ID = 5;
-    private static final int SELF_ID = 6;
-    private static final int CRASH_ID = 6;
-
-    private final String mAuthority;
-    private final String mDbName;
-    private final UriMatcher URL_MATCHER;
-    private HashMap<String, String> CTSDBTABLE1_LIST_PROJECTION_MAP;
-    private HashMap<String, String> CTSDBTABLE2_LIST_PROJECTION_MAP;
-
-    private static class DatabaseHelper extends SQLiteOpenHelper {
-
-        DatabaseHelper(Context context, String dbname) {
-            super(context, dbname, null, DBVERSION);
-        }
-
-        @Override
-        public void onCreate(SQLiteDatabase db) {
-            db.execSQL("CREATE TABLE TestTable1 ("
-                    + "_id INTEGER PRIMARY KEY, " + "key TEXT, " + "value INTEGER"
-                    + ");");
-
-            db.execSQL("CREATE TABLE TestTable2 ("
-                    + "_id INTEGER PRIMARY KEY, " + "key TEXT, " + "value INTEGER"
-                    + ");");
-        }
-
-        @Override
-        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-            db.execSQL("DROP TABLE IF EXISTS TestTable1");
-            db.execSQL("DROP TABLE IF EXISTS TestTable2");
-            onCreate(db);
-        }
-    }
-
-    public MockContentProvider() {
-        this(DEFAULT_AUTHORITY, DEFAULT_DBNAME);
-    }
-
-    public MockContentProvider(String authority, String dbName) {
-        mAuthority = authority;
-        mDbName = dbName;
-
-        URL_MATCHER = new UriMatcher(UriMatcher.NO_MATCH);
-        URL_MATCHER.addURI(mAuthority, "testtable1", TESTTABLE1);
-        URL_MATCHER.addURI(mAuthority, "testtable1/#", TESTTABLE1_ID);
-        URL_MATCHER.addURI(mAuthority, "testtable1/cross", TESTTABLE1_CROSS);
-        URL_MATCHER.addURI(mAuthority, "testtable2", TESTTABLE2);
-        URL_MATCHER.addURI(mAuthority, "testtable2/#", TESTTABLE2_ID);
-        URL_MATCHER.addURI(mAuthority, "self", SELF_ID);
-        URL_MATCHER.addURI(mAuthority, "crash", CRASH_ID);
-
-        CTSDBTABLE1_LIST_PROJECTION_MAP = new HashMap<String, String>();
-        CTSDBTABLE1_LIST_PROJECTION_MAP.put("_id", "_id");
-        CTSDBTABLE1_LIST_PROJECTION_MAP.put("key", "key");
-        CTSDBTABLE1_LIST_PROJECTION_MAP.put("value", "value");
-
-        CTSDBTABLE2_LIST_PROJECTION_MAP = new HashMap<String, String>();
-        CTSDBTABLE2_LIST_PROJECTION_MAP.put("_id", "_id");
-        CTSDBTABLE2_LIST_PROJECTION_MAP.put("key", "key");
-        CTSDBTABLE2_LIST_PROJECTION_MAP.put("value", "value");
-    }
-
-    @Override
-    public boolean onCreate() {
-        mOpenHelper = new DatabaseHelper(getContext(), mDbName);
-        if (android.provider.Settings.System.getInt(getContext().getContentResolver(),
-                "__cts_crash_on_launch", 0) != 0) {
-            // The test case wants us to crash our process on first launch.
-            // Well, okay then!
-            Log.i("MockContentProvider", "TEST IS CRASHING SELF, CROSS FINGERS!");
-            android.provider.Settings.System.putInt(getContext().getContentResolver(),
-                    "__cts_crash_on_launch", 0);
-            android.os.Process.killProcess(android.os.Process.myPid());
-        }
-        return true;
-    }
-
-    @Override
-    public int delete(Uri uri, String selection, String[] selectionArgs) {
-        SQLiteDatabase db = mOpenHelper.getWritableDatabase();
-        String segment;
-        int count;
-
-        switch (URL_MATCHER.match(uri)) {
-        case TESTTABLE1:
-            if (null == selection) {
-                // get the count when remove all rows
-                selection = "1";
-            }
-            count = db.delete("TestTable1", selection, selectionArgs);
-            break;
-        case TESTTABLE1_ID:
-            segment = uri.getPathSegments().get(1);
-            count = db.delete("TestTable1", "_id=" + segment +
-                    (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""),
-                    selectionArgs);
-            break;
-        case TESTTABLE2:
-            count = db.delete("TestTable2", selection, selectionArgs);
-            break;
-        case TESTTABLE2_ID:
-            segment = uri.getPathSegments().get(1);
-            count = db.delete("TestTable2", "_id=" + segment +
-                    (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""),
-                    selectionArgs);
-            break;
-        case SELF_ID:
-            // Wha...?  Delete ME?!?  O.K.!
-            Log.i("MockContentProvider", "Delete self requested!");
-            count = 1;
-            android.os.Process.killProcess(android.os.Process.myPid());
-            break;
-        default:
-            throw new IllegalArgumentException("Unknown URL " + uri);
-        }
-
-        getContext().getContentResolver().notifyChange(uri, null);
-        return count;
-    }
-
-    @Override
-    public String getType(Uri uri) {
-        switch (URL_MATCHER.match(uri)) {
-        case TESTTABLE1:
-            return "vnd.android.cursor.dir/com.android.content.testtable1";
-        case TESTTABLE1_ID:
-            return "vnd.android.cursor.item/com.android.content.testtable1";
-        case TESTTABLE1_CROSS:
-            return "vnd.android.cursor.cross/com.android.content.testtable1";
-        case TESTTABLE2:
-            return "vnd.android.cursor.dir/com.android.content.testtable2";
-        case TESTTABLE2_ID:
-            return "vnd.android.cursor.item/com.android.content.testtable2";
-
-        default:
-            throw new IllegalArgumentException("Unknown URL " + uri);
-        }
-    }
-
-    @Override
-    public Uri insert(Uri uri, ContentValues initialValues) {
-        long rowID;
-        ContentValues values;
-        String table;
-        Uri testUri;
-
-        if (initialValues != null)
-            values = new ContentValues(initialValues);
-        else
-            values = new ContentValues();
-
-        if (values.containsKey("value") == false)
-            values.put("value", -1);
-
-        switch (URL_MATCHER.match(uri)) {
-        case TESTTABLE1:
-            table = "TestTable1";
-            testUri = Uri.parse("content://" + mAuthority + "/testtable1");
-            break;
-        case TESTTABLE2:
-            table = "TestTable2";
-            testUri = Uri.parse("content://" + mAuthority + "/testtable2");
-            break;
-        default:
-            throw new IllegalArgumentException("Unknown URL " + uri);
-        }
-
-        SQLiteDatabase db = mOpenHelper.getWritableDatabase();
-        rowID = db.insert(table, "key", values);
-
-        if (rowID > 0) {
-            Uri url = ContentUris.withAppendedId(testUri, rowID);
-            getContext().getContentResolver().notifyChange(url, null);
-            return url;
-        }
-
-        throw new SQLException("Failed to insert row into " + uri);
-    }
-
-    @Override
-    public Cursor query(Uri uri, String[] projection, String selection,
-            String[] selectionArgs, String sortOrder) {
-        return query(uri, projection, selection, selectionArgs, sortOrder, null);
-    }
-
-    @Override
-    public Cursor query(Uri uri, String[] projection, String selection,
-            String[] selectionArgs, String sortOrder, CancellationSignal cancellationSignal) {
-
-        SQLiteQueryBuilder qb = new SQLiteQueryBuilder();
-
-        switch (URL_MATCHER.match(uri)) {
-        case TESTTABLE1:
-            qb.setTables("TestTable1");
-            qb.setProjectionMap(CTSDBTABLE1_LIST_PROJECTION_MAP);
-            break;
-
-        case TESTTABLE1_ID:
-            qb.setTables("TestTable1");
-            qb.appendWhere("_id=" + uri.getPathSegments().get(1));
-            break;
-
-        case TESTTABLE1_CROSS:
-            // Create a ridiculous cross-product of the test table.  This is done
-            // to create an artificially long-running query to enable us to test
-            // remote query cancellation in ContentResolverTest.
-            qb.setTables("TestTable1 a, TestTable1 b, TestTable1 c, TestTable1 d, TestTable1 e");
-            break;
-
-        case TESTTABLE2:
-            qb.setTables("TestTable2");
-            qb.setProjectionMap(CTSDBTABLE2_LIST_PROJECTION_MAP);
-            break;
-
-        case TESTTABLE2_ID:
-            qb.setTables("TestTable2");
-            qb.appendWhere("_id=" + uri.getPathSegments().get(1));
-            break;
-
-        case CRASH_ID:
-            if (android.provider.Settings.System.getInt(getContext().getContentResolver(),
-                    "__cts_crash_on_launch", 0) != 0) {
-                // The test case wants us to crash while querying.
-                // Well, okay then!
-                Log.i("MockContentProvider", "TEST IS CRASHING SELF, CROSS FINGERS!");
-                android.provider.Settings.System.putInt(getContext().getContentResolver(),
-                        "__cts_crash_on_launch", 0);
-                android.os.Process.killProcess(android.os.Process.myPid());
-            }
-            qb.setTables("TestTable1");
-            qb.setProjectionMap(CTSDBTABLE1_LIST_PROJECTION_MAP);
-            break;
-
-        default:
-            throw new IllegalArgumentException("Unknown URL " + uri);
-        }
-
-        /* If no sort order is specified use the default */
-        String orderBy;
-        if (TextUtils.isEmpty(sortOrder))
-            orderBy = "_id";
-        else
-            orderBy = sortOrder;
-
-        SQLiteDatabase db = mOpenHelper.getReadableDatabase();
-        Cursor c = qb.query(db, projection, selection, selectionArgs, null, null, orderBy,
-                null, cancellationSignal);
-
-        c.setNotificationUri(getContext().getContentResolver(), uri);
-        return c;
-    }
-
-    @Override
-    public int update(Uri uri, ContentValues values, String selection,
-            String[] selectionArgs) {
-        SQLiteDatabase db = mOpenHelper.getWritableDatabase();
-        String segment;
-        int count;
-
-        switch (URL_MATCHER.match(uri)) {
-        case TESTTABLE1:
-            count = db.update("TestTable1", values, selection, selectionArgs);
-            break;
-
-        case TESTTABLE1_ID:
-            segment = uri.getPathSegments().get(1);
-            count = db.update("TestTable1", values, "_id=" + segment +
-                    (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""),
-                    selectionArgs);
-            break;
-
-        case TESTTABLE2:
-            count = db.update("TestTable2", values, selection, selectionArgs);
-            break;
-
-        case TESTTABLE2_ID:
-            segment = uri.getPathSegments().get(1);
-            count = db.update("TestTable2", values, "_id=" + segment +
-                    (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""),
-                    selectionArgs);
-            break;
-
-        default:
-            throw new IllegalArgumentException("Unknown URL " + uri);
-        }
-
-        getContext().getContentResolver().notifyChange(uri, null);
-        return count;
-    }
-
-    @Override
-    public AssetFileDescriptor openAssetFile(Uri uri, String mode) throws FileNotFoundException {
-        switch (URL_MATCHER.match(uri)) {
-            case CRASH_ID:
-                if (android.provider.Settings.System.getInt(getContext().getContentResolver(),
-                        "__cts_crash_on_launch", 0) != 0) {
-                    // The test case wants us to crash while querying.
-                    // Well, okay then!
-                    Log.i("MockContentProvider", "TEST IS CRASHING SELF, CROSS FINGERS!");
-                    android.provider.Settings.System.putInt(getContext().getContentResolver(),
-                            "__cts_crash_on_launch", 0);
-                    android.os.Process.killProcess(android.os.Process.myPid());
-                }
-                return new AssetFileDescriptor(
-                        openPipeHelper(uri, null, null,
-                                "This is the openAssetFile test data!", this), 0,
-                        AssetFileDescriptor.UNKNOWN_LENGTH);
-
-            default:
-                return super.openAssetFile(uri, mode);
-        }
-    }
-
-    @Override
-    public AssetFileDescriptor openTypedAssetFile(Uri uri, String mimeTypeFilter, Bundle opts)
-            throws FileNotFoundException {
-        switch (URL_MATCHER.match(uri)) {
-            case CRASH_ID:
-                if (android.provider.Settings.System.getInt(getContext().getContentResolver(),
-                        "__cts_crash_on_launch", 0) != 0) {
-                    // The test case wants us to crash while querying.
-                    // Well, okay then!
-                    Log.i("MockContentProvider", "TEST IS CRASHING SELF, CROSS FINGERS!");
-                    android.provider.Settings.System.putInt(getContext().getContentResolver(),
-                            "__cts_crash_on_launch", 0);
-                    android.os.Process.killProcess(android.os.Process.myPid());
-                }
-                return new AssetFileDescriptor(
-                        openPipeHelper(uri, null, null,
-                                "This is the openTypedAssetFile test data!", this), 0,
-                        AssetFileDescriptor.UNKNOWN_LENGTH);
-
-            default:
-                return super.openTypedAssetFile(uri, mimeTypeFilter, opts);
-        }
-    }
-
-    @Override
-    public void writeDataToPipe(ParcelFileDescriptor output, Uri uri, String mimeType, Bundle opts,
-            String args) {
-        FileOutputStream fout = new FileOutputStream(output.getFileDescriptor());
-        PrintWriter pw = null;
-        try {
-            pw = new PrintWriter(new OutputStreamWriter(fout, "UTF-8"));
-            pw.print(args);
-        } catch (UnsupportedEncodingException e) {
-            Log.w("MockContentProvider", "Ooops", e);
-        } finally {
-            if (pw != null) {
-                pw.flush();
-            }
-            try {
-                fout.close();
-            } catch (IOException e) {
-            }
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/content/src/android/content/cts/MockRemoteContentProvider.java b/proprietary/frameworks/base/tests/content/src/android/content/cts/MockRemoteContentProvider.java
deleted file mode 100755
index fc43701901cb2faf1083b6b08b0c9bc8a29699d1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/src/android/content/cts/MockRemoteContentProvider.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-public class MockRemoteContentProvider extends MockContentProvider {
-    public MockRemoteContentProvider() {
-        super("remotectstest", "remotectstest.db");
-    }
-}
diff --git a/proprietary/frameworks/base/tests/content/src/android/content/cts/MockSyncAdapter.java b/proprietary/frameworks/base/tests/content/src/android/content/cts/MockSyncAdapter.java
deleted file mode 100755
index df24749df0e0fc831101ef3c33aedbd94f4ffd17..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/src/android/content/cts/MockSyncAdapter.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import android.accounts.Account;
-import android.content.ContentResolver;
-import android.content.ISyncAdapter;
-import android.content.ISyncContext;
-import android.os.Bundle;
-import android.os.RemoteException;
-
-import java.util.ArrayList;
-import java.util.concurrent.CountDownLatch;
-
-public class MockSyncAdapter extends ISyncAdapter.Stub {
-
-    private static MockSyncAdapter sSyncAdapter = null;
-
-    private ArrayList<Account> mAccounts = new ArrayList<Account>();
-    private String mAuthority;
-    private Bundle mExtras;
-    private boolean mInitialized;
-    private boolean mStartSync;
-    private boolean mCancelSync;
-    private CountDownLatch mLatch;
-
-    public ArrayList<Account> getAccounts() {
-        return mAccounts;
-    }
-
-    public String getAuthority() {
-        return mAuthority;
-    }
-
-    public Bundle getExtras() {
-        return mExtras;
-    }
-
-    public boolean isInitialized() {
-        return mInitialized;
-    }
-
-    public boolean isStartSync() {
-        return mStartSync;
-    }
-
-    public boolean isCancelSync() {
-        return mCancelSync;
-    }
-
-    public void clearData() {
-        mAccounts.clear();
-        mAuthority = null;
-        mExtras = null;
-        mInitialized = false;
-        mStartSync = false;
-        mCancelSync = false;
-        mLatch = null;
-    }
-
-    public void setLatch(CountDownLatch mLatch) {
-        this.mLatch = mLatch;
-    }
-
-    public void startSync(ISyncContext syncContext, String authority, Account account,
-            Bundle extras) throws RemoteException {
-
-        mAccounts.add(account);
-        mAuthority = authority;
-        mExtras = extras;
-
-        if (null != extras && extras.getBoolean(ContentResolver.SYNC_EXTRAS_INITIALIZE)) {
-            mInitialized = true;
-            mStartSync = false;
-            mCancelSync = false;
-        } else {
-            mInitialized = false;
-            mStartSync = true;
-            mCancelSync = false;
-        }
-
-        if (null != mLatch) {
-            mLatch.countDown();
-        }
-    }
-
-    public void cancelSync(ISyncContext syncContext) throws RemoteException {
-        mAccounts.clear();
-        mAuthority = null;
-        mExtras = null;
-
-        mInitialized = false;
-        mStartSync = false;
-        mCancelSync = true;
-
-        if (null != mLatch) {
-            mLatch.countDown();
-        }
-    }
-
-    public void initialize(android.accounts.Account account, java.lang.String authority)
-            throws android.os.RemoteException {
-
-        mAccounts.add(account);
-        mAuthority = authority;
-
-        mInitialized = true;
-        mStartSync = false;
-        mCancelSync = false;
-
-        if (null != mLatch) {
-            mLatch.countDown();
-        }
-    }
-
-    public static MockSyncAdapter getMockSyncAdapter() {
-        if (null == sSyncAdapter) {
-            sSyncAdapter = new MockSyncAdapter();
-        }
-        return sSyncAdapter;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/content/src/android/content/cts/MockSyncAdapterService.java b/proprietary/frameworks/base/tests/content/src/android/content/cts/MockSyncAdapterService.java
deleted file mode 100755
index 4dcf6daff36d33e3b9f70c2a7622fa242a6af7be..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/src/android/content/cts/MockSyncAdapterService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-
-public class MockSyncAdapterService extends Service {
-    @Override
-    public IBinder onBind(Intent intent) {
-        return MockSyncAdapter.getMockSyncAdapter();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/content/src/android/cts/util/PollingCheck.java b/proprietary/frameworks/base/tests/content/src/android/cts/util/PollingCheck.java
deleted file mode 100755
index be6b0b064af8110591d7bddde5f3df8b231dc088..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/src/android/cts/util/PollingCheck.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.cts.util;
-
-import java.util.concurrent.Callable;
-
-import junit.framework.Assert;
-
-public abstract class PollingCheck {
-    private static final long TIME_SLICE = 50;
-    private long mTimeout = 3000;
-
-    public PollingCheck() {
-    }
-
-    public PollingCheck(long timeout) {
-        mTimeout = timeout;
-    }
-
-    protected abstract boolean check();
-
-    public void run() {
-        if (check()) {
-            return;
-        }
-
-        long timeout = mTimeout;
-        while (timeout > 0) {
-            try {
-                Thread.sleep(TIME_SLICE);
-            } catch (InterruptedException e) {
-                Assert.fail("unexpected InterruptedException");
-            }
-
-            if (check()) {
-                return;
-            }
-
-            timeout -= TIME_SLICE;
-        }
-
-        Assert.fail("unexpected timeout");
-    }
-
-    public static void check(CharSequence message, long timeout, Callable<Boolean> condition)
-            throws Exception {
-        while (timeout > 0) {
-            if (condition.call()) {
-                return;
-            }
-
-            Thread.sleep(TIME_SLICE);
-            timeout -= TIME_SLICE;
-        }
-
-        Assert.fail(message.toString());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/content/tests/Android.mk b/proprietary/frameworks/base/tests/content/tests/Android.mk
deleted file mode 100755
index 6584803faab13195e906975467fd64a5c565bb7c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/tests/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := optional
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) 
-
-LOCAL_PACKAGE_NAME := MediaTekCtsContentTestCases
-
-LOCAL_INSTRUMENTATION_FOR := MediaTekContentTestStubs
-
-
-include $(BUILD_PACKAGE)
diff --git a/proprietary/frameworks/base/tests/content/tests/Android.mk_ b/proprietary/frameworks/base/tests/content/tests/Android.mk_
deleted file mode 100755
index 6584803faab13195e906975467fd64a5c565bb7c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/tests/Android.mk_
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := optional
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) 
-
-LOCAL_PACKAGE_NAME := MediaTekCtsContentTestCases
-
-LOCAL_INSTRUMENTATION_FOR := MediaTekContentTestStubs
-
-
-include $(BUILD_PACKAGE)
diff --git a/proprietary/frameworks/base/tests/content/tests/AndroidManifest.xml b/proprietary/frameworks/base/tests/content/tests/AndroidManifest.xml
deleted file mode 100755
index cece10aafc84e7958782e2c5d0a7f961f429bd1c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/tests/AndroidManifest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mediatek.content">
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.android.cts.stub"
-                     android:label="Test for Mediatek Content"/>
-
-</manifest>
-
diff --git a/proprietary/frameworks/base/tests/content/tests/NOTICE b/proprietary/frameworks/base/tests/content/tests/NOTICE
deleted file mode 100755
index 07ac62763c586ad861dbeaf3001038e903f9f401..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/tests/NOTICE
+++ /dev/null
@@ -1,30 +0,0 @@
-* Copyright (C) 2009 The Android Open Source Project:
-
-
-
-* Copyright (C) 2008 The Android Open Source Project:
-
-
-
-* Copyright (C) 2010 The Android Open Source Project:
-
-
-
-/*
-* Copyright (C) 2011-2014 MediaTek Inc.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-:
- 
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/content/tests/README b/proprietary/frameworks/base/tests/content/tests/README
deleted file mode 100755
index 0de833bd55e9f04b09f22d712c51e9ca2d28508b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/tests/README
+++ /dev/null
@@ -1,19 +0,0 @@
-Test cases for android frameworks content provider module
-
-WHAT IT DOES?
-=============
-MediaTekCtsContentTestCases.apk is a test case application for content provider
-
-The test cases are most come from Android CTS test cases
-
-HOW IT WAS BUILT?
-==================
-make 'vendor/mediatek/proprietary/frameworks/base/tests/content/tests' folder to get
-test apk
-
-HOW TO USE IT?
-==============
-After build MediaTekCtsContentTestCases.apk, install to phone with
-MediaTekContentTestStubs.apk, and run command:
-'adb shell am instrument -w com.mediatek.content/android.test.InstrumentationTestRunner'
-to get result
diff --git a/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/AsyncQueryHandlerTest.java b/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/AsyncQueryHandlerTest.java
deleted file mode 100755
index 856b3bd6b570443fa02c9a0137e778531785d013..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/AsyncQueryHandlerTest.java
+++ /dev/null
@@ -1,509 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package android.content.cts;
-
-
-import android.content.AsyncQueryHandler;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Looper;
-import android.test.AndroidTestCase;
-
-/**
- * Test {@link AsyncQueryHandler} and {@link WorkerHandler}}.
- *
- * @see DummyProvider
- */
-public class AsyncQueryHandlerTest extends AndroidTestCase {
-    private static final long TEST_TIME_OUT = DummyProvider.MOCK_OPERATION_SLEEP_TIME + 5000;
-
-    private static final int INSERT_TOKEN_1    = 100;
-    private static final int INSERT_TOKEN_2    = 101;
-    private static final int QUERY_TOKEN_1     = 200;
-    private static final int QUERY_TOKEN_2     = 201;
-    private static final int MOCK_QUERY_TOKEN  = 202;
-    private static final int DELETE_TOKEN_1    = 300;
-    private static final int DELETE_TOKEN_2    = 301;
-    private static final int UPDATE_TOKEN_1    = 400;
-    private static final int UPDATE_TOKEN_2    = 401;
-
-    private static final Object INSERT_COOKIE = "insert cookie";
-    private static final Object QUERY_COOKIE  = "query cookie";
-    private static final Object DELETE_COOKIE = "delete cookie";
-    private static final Object UPDATE_COOKIE = "update cookie";
-
-    private static final String NAME0 = "name0";
-    private static final String NAME1 = "name1";
-    private static final String NAME2 = "name2";
-    private static final String NAME3 = "name3";
-    private static final String NAME4 = "name4";
-
-    private static final int NAME_COLUMN_INDEX = 1;
-
-    private static final boolean CANCELABLE = true;
-    private static final boolean NO_CANCEL = false;
-
-    private static final String[] PROJECTIONS = new String[] {
-            DummyProvider._ID, DummyProvider.NAME};
-
-    private static final String ORDER_BY = "_id ASC";
-    private static final int ORIGINAL_ROW_COUNT = 3;
-
-    private MockAsyncQueryHandler mAsyncHandler;
-    private ContentResolver mResolver;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mResolver = mContext.getContentResolver();
-
-        ContentValues values0 = new ContentValues();
-        values0.put(DummyProvider.NAME, NAME0);
-        mResolver.insert(DummyProvider.CONTENT_URI, values0);
-
-        ContentValues values1 = new ContentValues();
-        values1.put(DummyProvider.NAME, NAME1);
-        mResolver.insert(DummyProvider.CONTENT_URI, values1);
-
-        ContentValues values2 = new ContentValues();
-        values2.put(DummyProvider.NAME, NAME2);
-        mResolver.insert(DummyProvider.CONTENT_URI, values2);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mResolver.delete(DummyProvider.CONTENT_URI, null, null);
-
-        super.tearDown();
-    }
-
-    public void testConstructor() {
-        new AsyncQueryHandler(mResolver) { };
-
-        new AsyncQueryHandler(null) { };
-    }
-
-    public void testStartInsert() throws InterruptedException {
-        final ContentValues values1 = new ContentValues();
-        values1.put(DummyProvider.NAME, NAME3);
-        final ContentValues values2 = new ContentValues();
-        values2.put(DummyProvider.NAME, NAME4);
-
-        mAsyncHandler = createAsyncQueryHandlerSync();
-        assertFalse(mAsyncHandler.hadInserted(0));
-
-        // insert without cancelling.
-        startInsert(INSERT_TOKEN_1, INSERT_COOKIE, DummyProvider.CONTENT_URI, values1, NO_CANCEL);
-
-        assertTrue(mAsyncHandler.hadInserted(TEST_TIME_OUT));
-        assertEquals(INSERT_TOKEN_1, mAsyncHandler.getToken());
-        assertEquals(INSERT_COOKIE, mAsyncHandler.getCookie());
-        assertEquals(DummyProvider.CONTENT_URI, (Uri) mAsyncHandler.getResult());
-
-        mAsyncHandler.reset();
-        // insert will be cancelled.
-        startInsert(INSERT_TOKEN_2, INSERT_COOKIE, DummyProvider.CONTENT_URI, values2, CANCELABLE);
-        mAsyncHandler.cancelOperation(INSERT_TOKEN_2);
-        assertFalse(mAsyncHandler.hadInserted(TEST_TIME_OUT));
-
-        // only value1 has been inserted.
-        Cursor cursor = null;
-        try {
-            cursor = mResolver.query(DummyProvider.CONTENT_URI, PROJECTIONS, null, null, ORDER_BY);
-            assertEquals(ORIGINAL_ROW_COUNT + 1, cursor.getCount());
-            cursor.moveToLast();
-            assertEquals(NAME3, cursor.getString(NAME_COLUMN_INDEX));
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
-        }
-    }
-
-    public void testStartQuery() throws InterruptedException {
-        mAsyncHandler = createAsyncQueryHandlerSync();
-        assertFalse(mAsyncHandler.hadQueried(0));
-
-        // query without cancelling.
-        startQuery(QUERY_TOKEN_1, QUERY_COOKIE, DummyProvider.CONTENT_URI,
-                PROJECTIONS, null, null, ORDER_BY, NO_CANCEL);
-
-        assertTrue(mAsyncHandler.hadQueried(TEST_TIME_OUT));
-        assertEquals(QUERY_TOKEN_1, mAsyncHandler.getToken());
-        assertEquals(QUERY_COOKIE, mAsyncHandler.getCookie());
-        Cursor cursor = (Cursor) mAsyncHandler.getResult();
-        assertNotNull(cursor);
-        try {
-            assertEquals(ORIGINAL_ROW_COUNT, cursor.getCount());
-            assertEquals(2, cursor.getColumnCount());
-            cursor.moveToFirst();
-            assertEquals(NAME0, cursor.getString(NAME_COLUMN_INDEX));
-
-            cursor.moveToNext();
-            assertEquals(NAME1, cursor.getString(NAME_COLUMN_INDEX));
-
-            cursor.moveToNext();
-            assertEquals(NAME2, cursor.getString(NAME_COLUMN_INDEX));
-        } finally {
-            cursor.close();
-        }
-
-        // query will be cancelled.
-        mAsyncHandler.reset();
-        startQuery(QUERY_TOKEN_2, QUERY_COOKIE, DummyProvider.CONTENT_URI,
-                PROJECTIONS, null, null, ORDER_BY, CANCELABLE);
-        mAsyncHandler.cancelOperation(QUERY_TOKEN_2);
-        assertFalse(mAsyncHandler.hadQueried(TEST_TIME_OUT));
-    }
-
-    public void testStartUpdate() throws InterruptedException {
-        final ContentValues values1 = new ContentValues();
-        values1.put(DummyProvider.NAME, NAME3);
-        final ContentValues values2 = new ContentValues();
-        values2.put(DummyProvider.NAME, NAME4);
-
-        mAsyncHandler = createAsyncQueryHandlerSync();
-        assertFalse(mAsyncHandler.hadUpdated(0));
-
-        // update without cancelling.
-        startUpdate(UPDATE_TOKEN_1, UPDATE_COOKIE, DummyProvider.CONTENT_URI, values1,
-                DummyProvider.NAME + "=?", new String[] { NAME0 }, NO_CANCEL);
-
-        assertTrue(mAsyncHandler.hadUpdated(TEST_TIME_OUT));
-        assertEquals(UPDATE_TOKEN_1, mAsyncHandler.getToken());
-        assertEquals(UPDATE_COOKIE, mAsyncHandler.getCookie());
-        assertEquals(1, ((Integer) mAsyncHandler.getResult()).intValue());
-
-        mAsyncHandler.reset();
-        // update will be cancelled.
-        startUpdate(UPDATE_TOKEN_2, UPDATE_COOKIE, DummyProvider.CONTENT_URI, values2,
-                DummyProvider.NAME + "=?", new String[] { NAME1 }, CANCELABLE);
-        mAsyncHandler.cancelOperation(UPDATE_TOKEN_2);
-        assertFalse(mAsyncHandler.hadUpdated(TEST_TIME_OUT));
-
-        // only values has been updated.
-        Cursor cursor = null;
-        try {
-            cursor = mResolver.query(DummyProvider.CONTENT_URI, PROJECTIONS, null, null, ORDER_BY);
-            assertEquals(ORIGINAL_ROW_COUNT, cursor.getCount());
-            cursor.moveToFirst();
-            assertEquals(NAME3, cursor.getString(NAME_COLUMN_INDEX));
-
-            cursor.moveToNext();
-            assertEquals(NAME1, cursor.getString(NAME_COLUMN_INDEX));
-
-            cursor.moveToNext();
-            assertEquals(NAME2, cursor.getString(NAME_COLUMN_INDEX));
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
-        }
-    }
-
-    public void testStartDelete() throws InterruptedException {
-        mAsyncHandler = createAsyncQueryHandlerSync();
-        assertFalse(mAsyncHandler.hadDeleted(0));
-
-        // delete without cancelling.
-        startDelete(DELETE_TOKEN_1, DELETE_COOKIE, DummyProvider.CONTENT_URI,
-                DummyProvider.NAME + "=?", new String[] { NAME0 }, NO_CANCEL);
-
-        assertTrue(mAsyncHandler.hadDeleted(TEST_TIME_OUT));
-        assertEquals(DELETE_TOKEN_1, mAsyncHandler.getToken());
-        assertEquals(DELETE_COOKIE, mAsyncHandler.getCookie());
-        assertEquals(1, ((Integer) mAsyncHandler.getResult()).intValue());
-
-        mAsyncHandler.reset();
-        // delete will be cancelled
-        startDelete(DELETE_TOKEN_2, DELETE_COOKIE, DummyProvider.CONTENT_URI,
-                DummyProvider.NAME + "=?", new String[] { NAME1 }, CANCELABLE);
-        mAsyncHandler.cancelOperation(DELETE_TOKEN_2);
-        assertFalse(mAsyncHandler.hadDeleted(TEST_TIME_OUT));
-
-        // only NAME0 has been deleted.
-        Cursor cursor = null;
-        try {
-            cursor = mResolver.query(DummyProvider.CONTENT_URI, PROJECTIONS, null, null, ORDER_BY);
-            assertEquals(ORIGINAL_ROW_COUNT - 1, cursor.getCount());
-            cursor.moveToFirst();
-            assertEquals(NAME1, cursor.getString(NAME_COLUMN_INDEX));
-
-            cursor.moveToNext();
-            assertEquals(NAME2, cursor.getString(NAME_COLUMN_INDEX));
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
-        }
-    }
-
-    public void testCreateHandler() {
-        MockAsyncQueryHandler wrapper = new MockAsyncQueryHandler(mResolver);
-        Handler result = wrapper.createHandler(Looper.myLooper());
-        assertNotNull(result);
-        assertSame(Looper.myLooper(), result.getLooper());
-
-        try {
-            wrapper.createHandler(null);
-            fail("Should throw NullPointerException if param looper is null");
-        } catch (NullPointerException e) {
-        }
-    }
-
-    private void startQuery(int token, Object cookie, Uri uri, String[] projection,
-            String selection, String[] selectionArgs, String orderBy, boolean cancelable) {
-        if (cancelable) {
-            mAsyncHandler.injectMockQuery();
-        }
-        mAsyncHandler.startQuery(token, cookie, uri, projection,
-                selection, selectionArgs, orderBy);
-    }
-
-    private void startInsert(int token, Object cookie, Uri uri,
-            ContentValues initialValues, boolean cancelable) {
-        if (cancelable) {
-            mAsyncHandler.injectMockQuery();
-        }
-        mAsyncHandler.startInsert(token, cookie, uri, initialValues);
-    }
-
-    private void startUpdate(int token, Object cookie, Uri uri, ContentValues values,
-            String selection, String[] selectionArgs, boolean cancelable) {
-        if (cancelable) {
-            mAsyncHandler.injectMockQuery();
-        }
-        mAsyncHandler.startUpdate(token, cookie, uri, values, selection, selectionArgs);
-    }
-
-    private void startDelete(int token, Object cookie, Uri uri, String selection,
-            String[] selectionArgs, boolean cancelable) {
-        if (cancelable) {
-            mAsyncHandler.injectMockQuery();
-        }
-        mAsyncHandler.startDelete(token, cookie, uri, selection, selectionArgs);
-    }
-
-    private static class MockAsyncQueryHandler extends AsyncQueryHandler {
-        private boolean mHadInserted;
-        private boolean mHadDeleted;
-        private boolean mHadQueried;
-        private boolean mHadUpdated;
-
-        private int mToken;
-        private Object mCookie;
-        private Object mResult;
-
-        public MockAsyncQueryHandler(ContentResolver cr) {
-            super(cr);
-        }
-
-        @Override
-        protected Handler createHandler(Looper looper) {
-            return super.createHandler(looper);
-        }
-
-        /**
-         * Injects a mock query operation which does nothing except make queue busy so that
-         * following operations should be cancelled successfully.
-         */
-        private void injectMockQuery() {
-            // we have to call super.startQuery here.
-            super.startQuery(MOCK_QUERY_TOKEN, QUERY_COOKIE,
-                    DummyProvider.CONTENT_URI_MOCK_OPERATION, PROJECTIONS, null, null, ORDER_BY);
-        }
-
-        @Override
-        protected void onDeleteComplete(int token, Object cookie, int result) {
-            super.onDeleteComplete(token, cookie, result);
-            mToken = token;
-            mCookie = cookie;
-            mResult = Integer.valueOf(result);
-            synchronized (this) {
-                mHadDeleted = true;
-                notify();
-            }
-        }
-
-        @Override
-        protected void onInsertComplete(int token, Object cookie, Uri uri) {
-            super.onInsertComplete(token, cookie, uri);
-            mToken = token;
-            mCookie = cookie;
-            mResult = uri;
-            synchronized (this) {
-                mHadInserted = true;
-                notify();
-            }
-        }
-
-        @Override
-        protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
-            super.onQueryComplete(token, cookie, cursor);
-            if (token == MOCK_QUERY_TOKEN) {
-                // ignore mock query operation
-                return;
-            }
-            mToken = token;
-            mCookie = cookie;
-            mResult = cursor;
-            synchronized (this) {
-                mHadQueried = true;
-                notify();
-            }
-        }
-
-        @Override
-        protected void onUpdateComplete(int token, Object cookie, int result) {
-            super.onUpdateComplete(token, cookie, result);
-            mToken = token;
-            mCookie = cookie;
-            mResult = Integer.valueOf(result);
-            synchronized (this) {
-                mHadUpdated = true;
-                notify();
-            }
-        }
-
-        public synchronized boolean hadInserted(long timeout) throws InterruptedException {
-            synchronized (this) {
-                // do not wait if timeout is 0
-                if (timeout > 0 && !mHadInserted) {
-                    wait(timeout);
-                }
-            }
-            return mHadInserted;
-        }
-
-        public synchronized boolean hadUpdated(long timeout) throws InterruptedException {
-            // do not wait if timeout is 0
-            if (timeout > 0 && !mHadUpdated) {
-                wait(timeout);
-            }
-            return mHadUpdated;
-        }
-
-        public synchronized boolean hadDeleted(long timeout) throws InterruptedException {
-            // do not wait if timeout is 0
-            if (timeout > 0 && !mHadDeleted) {
-                wait(timeout);
-            }
-            return mHadDeleted;
-        }
-
-        public synchronized boolean hadQueried(long timeout) throws InterruptedException {
-            // do not wait if timeout is 0
-            if (timeout > 0 && !mHadQueried) {
-                wait(timeout);
-            }
-            return mHadQueried;
-        }
-
-        public int getToken() {
-            return mToken;
-        }
-
-        public Object getCookie() {
-            return mCookie;
-        }
-
-        public Object getResult() {
-            return mResult;
-        }
-
-        public void reset() {
-            mHadInserted = false;
-            mHadDeleted = false;
-            mHadQueried = false;
-            mHadUpdated = false;
-            mToken = 0;
-            mCookie = null;
-            mResult = null;
-        }
-    }
-
-    private MockAsyncQueryHandler createAsyncQueryHandlerSync() throws InterruptedException {
-        SyncRunnable sr = new SyncRunnable(new Runnable() {
-            public void run() {
-                mAsyncHandler = new MockAsyncQueryHandler(mResolver);
-            }
-        });
-        TestHandlerThread t = new TestHandlerThread(sr);
-        t.start();
-        sr.waitForComplete();
-        return mAsyncHandler;
-    }
-
-    /**
-     * The Class TestHandlerThread. Convenience for created AsyncQueryHandler
-     * object on the handler thread.
-     */
-    private static class TestHandlerThread extends HandlerThread {
-        private Runnable mTarget;
-
-        public TestHandlerThread(Runnable target) {
-            super("AsyncQueryHandlerTestHandlerThread");
-            mTarget = target;
-        }
-
-        @Override
-        protected void onLooperPrepared() {
-            super.onLooperPrepared();
-            if (mTarget != null) {
-                mTarget.run();
-            }
-        }
-    }
-
-    /**
-     * The Class SyncRunnable. The object of this class make the thread wait
-     * until the target finished
-     */
-    private static final class SyncRunnable implements Runnable {
-        /** The target. */
-        private final Runnable mTarget;
-
-        /** true if the target is completed. */
-        private boolean mHadCompleted;
-
-        public SyncRunnable(Runnable target) {
-            mTarget = target;
-        }
-
-        public void run() {
-            if (mTarget != null) {
-                mTarget.run();
-            }
-
-            synchronized (this) {
-                mHadCompleted = true;
-                notifyAll();
-            }
-        }
-
-        public synchronized void waitForComplete() throws InterruptedException {
-            if (!mHadCompleted) {
-                wait(TEST_TIME_OUT);
-            }
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/ContentProviderTest.java b/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/ContentProviderTest.java
deleted file mode 100755
index 5ced37ca255582cc5cb9027ca06456d5ee6fa398..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/ContentProviderTest.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package android.content.cts;
-
-import android.content.ContentProvider;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.pm.ProviderInfo;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.net.Uri;
-import android.os.ParcelFileDescriptor;
-import android.test.AndroidTestCase;
-
-import com.android.cts.stub.R;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-/**
- * Test {@link ContentProvider}.
- */
-public class ContentProviderTest extends AndroidTestCase {
-    private static final String TEST_PACKAGE_NAME = "com.android.cts.stub";
-    private static final String TEST_FILE_NAME = "testFile.tmp";
-    private static final String TEST_DB_NAME = "test.db";
-
-    @Override
-    protected void tearDown() throws Exception {
-        mContext.deleteDatabase(TEST_DB_NAME);
-        mContext.deleteFile(TEST_FILE_NAME);
-        super.tearDown();
-    }
-
-    public void testOpenAssetFile() throws IOException {
-        MockContentProvider mockContentProvider = new MockContentProvider();
-        Uri uri = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE +
-                "://" + TEST_PACKAGE_NAME + "/" + R.raw.testimage);
-
-        try {
-            mockContentProvider.openAssetFile(uri, "r");
-            fail("Should always throw out FileNotFoundException!");
-        } catch (FileNotFoundException e) {
-        }
-
-        try {
-            mockContentProvider.openFile(null, null);
-            fail("Should always throw out FileNotFoundException!");
-        } catch (FileNotFoundException e) {
-        }
-    }
-
-    public void testAttachInfo() {
-        MockContentProvider mockContentProvider = new MockContentProvider();
-
-        ProviderInfo info1 = new ProviderInfo();
-        info1.readPermission = "android.permission.READ_SMS";
-        info1.writePermission = "android.permission.WRITE_SMS";
-        mockContentProvider.attachInfo(getContext(), info1);
-        assertSame(getContext(), mockContentProvider.getContext());
-        assertEquals(info1.readPermission, mockContentProvider.getReadPermission());
-        assertEquals(info1.writePermission, mockContentProvider.getWritePermission());
-
-        ProviderInfo info2 = new ProviderInfo();
-        info2.readPermission = "android.permission.READ_CONTACTS";
-        info2.writePermission = "android.permission.WRITE_CONTACTS";
-        mockContentProvider.attachInfo(null, info2);
-        assertSame(getContext(), mockContentProvider.getContext());
-        assertEquals(info1.readPermission, mockContentProvider.getReadPermission());
-        assertEquals(info1.writePermission, mockContentProvider.getWritePermission());
-
-        mockContentProvider = new MockContentProvider();
-        mockContentProvider.attachInfo(null, null);
-        assertNull(mockContentProvider.getContext());
-        assertNull(mockContentProvider.getReadPermission());
-        assertNull(mockContentProvider.getWritePermission());
-
-        mockContentProvider.attachInfo(null, info2);
-        assertNull(mockContentProvider.getContext());
-        assertEquals(info2.readPermission, mockContentProvider.getReadPermission());
-        assertEquals(info2.writePermission, mockContentProvider.getWritePermission());
-
-        mockContentProvider.attachInfo(getContext(), info1);
-        assertSame(getContext(), mockContentProvider.getContext());
-        assertEquals(info1.readPermission, mockContentProvider.getReadPermission());
-        assertEquals(info1.writePermission, mockContentProvider.getWritePermission());
-    }
-
-    public void testBulkInsert() {
-        MockContentProvider mockContentProvider = new MockContentProvider();
-
-        int count = 2;
-        ContentValues[] values = new ContentValues[count];
-        for (int i = 0; i < count; i++) {
-            values[i] = new ContentValues();
-        }
-        Uri uri = Uri.parse("content://browser/bookmarks");
-        assertEquals(count, mockContentProvider.bulkInsert(uri, values));
-        assertEquals(count, mockContentProvider.getInsertCount());
-
-        mockContentProvider = new MockContentProvider();
-        try {
-            assertEquals(count, mockContentProvider.bulkInsert(null, values));
-        } finally {
-            assertEquals(count, mockContentProvider.getInsertCount());
-        }
-    }
-
-    public void testGetContext() {
-        MockContentProvider mockContentProvider = new MockContentProvider();
-        assertNull(mockContentProvider.getContext());
-
-        mockContentProvider.attachInfo(getContext(), null);
-        assertSame(getContext(), mockContentProvider.getContext());
-        mockContentProvider.attachInfo(null, null);
-        assertSame(getContext(), mockContentProvider.getContext());
-    }
-
-    public void testAccessReadPermission() {
-        MockContentProvider mockContentProvider = new MockContentProvider();
-        assertNull(mockContentProvider.getReadPermission());
-
-        String expected = "android.permission.READ_CONTACTS";
-        mockContentProvider.setReadPermissionWrapper(expected);
-        assertEquals(expected, mockContentProvider.getReadPermission());
-
-        expected = "android.permission.READ_SMS";
-        mockContentProvider.setReadPermissionWrapper(expected);
-        assertEquals(expected, mockContentProvider.getReadPermission());
-
-        mockContentProvider.setReadPermissionWrapper(null);
-        assertNull(mockContentProvider.getReadPermission());
-    }
-
-    public void testAccessWritePermission() {
-        MockContentProvider mockContentProvider = new MockContentProvider();
-        assertNull(mockContentProvider.getWritePermission());
-
-        String expected = "android.permission.WRITE_CONTACTS";
-        mockContentProvider.setWritePermissionWrapper(expected);
-        assertEquals(expected, mockContentProvider.getWritePermission());
-
-        expected = "android.permission.WRITE_SMS";
-        mockContentProvider.setWritePermissionWrapper(expected);
-        assertEquals(expected, mockContentProvider.getWritePermission());
-
-        mockContentProvider.setWritePermissionWrapper(null);
-        assertNull(mockContentProvider.getWritePermission());
-    }
-
-    public void testIsTemporary() {
-        MockContentProvider mockContentProvider = new MockContentProvider();
-        assertFalse(mockContentProvider.isTemporary());
-    }
-
-    public void testOpenFile() {
-        MockContentProvider mockContentProvider = new MockContentProvider();
-
-        try {
-            Uri uri = Uri.parse("content://test");
-            mockContentProvider.openFile(uri, "r");
-            fail("Should always throw out FileNotFoundException!");
-        } catch (FileNotFoundException e) {
-        }
-
-        try {
-            mockContentProvider.openFile(null, null);
-            fail("Should always throw out FileNotFoundException!");
-        } catch (FileNotFoundException e) {
-        }
-    }
-
-    public void testOpenFileHelper() throws IOException {
-
-        // create a temporary File
-        mContext.openFileOutput(TEST_FILE_NAME, Context.MODE_PRIVATE).close();
-        File file = mContext.getFileStreamPath(TEST_FILE_NAME);
-        assertTrue(file.exists());
-
-        ContentProvider cp = new OpenFileContentProvider(file.getAbsolutePath(), TEST_DB_NAME);
-
-        Uri uri = Uri.parse("content://test");
-        assertNotNull(cp.openFile(uri, "r"));
-
-        try {
-            uri = Uri.parse("content://test");
-            cp.openFile(uri, "wrong");
-            fail("Should throw IllegalArgumentException for bad mode!");
-        } catch (IllegalArgumentException e) {
-        }
-
-        // delete the temporary file
-        file.delete();
-
-        try {
-            uri = Uri.parse("content://test");
-            cp.openFile(uri, "r");
-            fail("Should throw FileNotFoundException!");
-        } catch (FileNotFoundException e) {
-        }
-
-        try {
-            cp.openFile((Uri) null, "r");
-            fail("Should always throw FileNotFoundException!");
-        } catch (FileNotFoundException e) {
-        }
-    }
-
-    public void testOnConfigurationChanged() {
-        // cannot trigger this callback reliably
-    }
-
-    public void testOnLowMemory() {
-        // cannot trigger this callback reliably
-    }
-
-    public void testGetIContentProvider() {
-        MockContentProvider mockContentProvider = new MockContentProvider();
-
-        assertNotNull(mockContentProvider.getIContentProvider());
-    }
-
-    private class MockContentProvider extends ContentProvider {
-        private int mInsertCount = 0;
-
-        @Override
-        public int delete(Uri uri, String selection, String[] selectionArgs) {
-            return 0;
-        }
-
-        @Override
-        public String getType(Uri uri) {
-            return null;
-        }
-
-        @Override
-        public Uri insert(Uri uri, ContentValues values) {
-            mInsertCount++;
-            return null;
-        }
-
-        public int getInsertCount() {
-            return mInsertCount;
-        }
-
-        @Override
-        public Cursor query(Uri uri, String[] projection, String selection,
-                String[] selectionArgs, String sortOrder) {
-            return null;
-        }
-
-        @Override
-        public int update(Uri uri, ContentValues values, String selection,
-                String[] selectionArgs) {
-            return 0;
-        }
-
-        @Override
-        public boolean onCreate() {
-            return false;
-        }
-
-        // wrapper or override for the protected methods
-        public void setReadPermissionWrapper(String permission) {
-            super.setReadPermission(permission);
-        }
-
-        public void setWritePermissionWrapper(String permission) {
-            super.setWritePermission(permission);
-        }
-
-        @Override
-        protected boolean isTemporary() {
-            return super.isTemporary();
-        }
-
-        public ParcelFileDescriptor openFileHelperWrapper(Uri uri, String mode)
-                throws FileNotFoundException {
-            return super.openFileHelper(uri, mode);
-        }
-    }
-
-    /**
-     * This provider implements openFile() using ContentProvider.openFileHelper().
-     */
-    private class OpenFileContentProvider extends ContentProvider {
-        private SQLiteDatabase mDb;
-
-        OpenFileContentProvider(String fileName, String dbName) {
-            // delete the database if it already exists
-            mContext.deleteDatabase(dbName);
-            mDb = mContext.openOrCreateDatabase(dbName, Context.MODE_PRIVATE, null);
-            mDb.execSQL("CREATE TABLE files ( _data TEXT );");
-            mDb.execSQL("INSERT INTO files VALUES ( \"" + fileName + "\");");
-        }
-
-        @Override
-        public int delete(Uri uri, String selection, String[] selectionArgs) {
-            throw new RuntimeException("not implemented");
-        }
-
-        @Override
-        public String getType(Uri uri) {
-            throw new RuntimeException("not implemented");
-        }
-
-        @Override
-        public Uri insert(Uri uri, ContentValues values) {
-            throw new RuntimeException("not implemented");
-        }
-
-        @Override
-        public boolean onCreate() {
-            return true;
-        }
-
-        @Override
-        public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
-                String sortOrder) {
-            return mDb.query("files", projection, selection, selectionArgs, null, null, null);
-        }
-
-        @Override
-        public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-            throw new RuntimeException("not implemented");
-        }
-
-        @Override
-        public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException {
-            return openFileHelper(uri, mode);
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/ContentQueryMapTest.java b/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/ContentQueryMapTest.java
deleted file mode 100755
index 34ecd607cceac4b6c99e653266653839b3773dc3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/ContentQueryMapTest.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package android.content.cts;
-
-
-import android.content.ContentQueryMap;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Looper;
-import android.test.AndroidTestCase;
-
-import java.util.Map;
-import java.util.Observable;
-import java.util.Observer;
-
-/**
- * Test {@link ContentQueryMap}.
- */
-public class ContentQueryMapTest extends AndroidTestCase {
-    private static final int TEST_TIME_OUT = 5000;
-
-    private static final String NAME0  = "name0";
-    private static final String VALUE0 = "value0";
-    private static final String NAME1  = "name1";
-    private static final String VALUE1 = "value1";
-    private static final String NAME2  = "name2";
-    private static final String VALUE2 = "value2";
-    private static final String NAME3  = "name3";
-    private static final String VALUE3 = "value3";
-
-    private static final String[] PROJECTIONS = new String[] {
-        DummyProvider.NAME, DummyProvider.VALUE};
-
-    private static final int ORIGINAL_ROW_COUNT = 2;
-    private ContentResolver mResolver;
-    private Cursor mCursor;
-    private ContentQueryMap mContentQueryMap;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResolver = mContext.getContentResolver();
-
-        ContentValues values0 = new ContentValues();
-        values0.put(DummyProvider.NAME, NAME0);
-        values0.put(DummyProvider.VALUE, VALUE0);
-        mResolver.insert(DummyProvider.CONTENT_URI, values0);
-
-        ContentValues values1 = new ContentValues();
-        values1.put(DummyProvider.NAME, NAME1);
-        values1.put(DummyProvider.VALUE, VALUE1);
-        mResolver.insert(DummyProvider.CONTENT_URI, values1);
-
-        mCursor = mResolver.query(DummyProvider.CONTENT_URI, PROJECTIONS, null, null, null);
-        assertNotNull(mCursor);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        if (mContentQueryMap != null) {
-            mContentQueryMap.close();
-            mContentQueryMap = null;
-        }
-        if (mCursor != null) {
-            mCursor.close();
-            mCursor = null;
-        }
-
-        mResolver.delete(DummyProvider.CONTENT_URI, null, null);
-
-        super.tearDown();
-    }
-
-    public void testConstructor() {
-        new ContentQueryMap(mCursor, DummyProvider.NAME, true, null);
-
-        new ContentQueryMap(mCursor, DummyProvider.VALUE, false, new Handler());
-
-        try {
-            new ContentQueryMap(mCursor, null, false, new Handler());
-            fail("Should throw NullPointerException if param columnNameOfKey is null");
-        } catch (NullPointerException e) {
-        }
-
-        try {
-            new ContentQueryMap(null, DummyProvider.NAME, false, new Handler());
-            fail("Should throw NullPointerException if param cursor is null");
-        } catch (NullPointerException e) {
-        }
-    }
-
-    public void testGetRows() {
-        // handler can be null
-        mContentQueryMap = new ContentQueryMap(mCursor, DummyProvider.NAME, true, null);
-        Map<String, ContentValues> rows = mContentQueryMap.getRows();
-        assertEquals(ORIGINAL_ROW_COUNT, rows.size());
-        assertTrue(rows.containsKey(NAME0));
-        assertEquals(VALUE0, rows.get(NAME0).getAsString(DummyProvider.VALUE));
-        assertTrue(rows.containsKey(NAME1));
-        assertEquals(VALUE1, rows.get(NAME1).getAsString(DummyProvider.VALUE));
-        mContentQueryMap.close();
-
-        // the mCursor has been close
-        mContentQueryMap = new ContentQueryMap(mCursor, DummyProvider.NAME, false, new Handler());
-        rows = mContentQueryMap.getRows();
-        assertFalse(rows.containsKey(NAME0));
-        mContentQueryMap.requery();
-        rows = mContentQueryMap.getRows();
-        assertFalse(rows.containsKey(NAME0));
-    }
-
-    public void testRequery() {
-        // Disable the keepUpdated to make sure requery() will not be called
-        // from somewhere else
-        mContentQueryMap = new ContentQueryMap(mCursor, DummyProvider.NAME, false, null);
-        ContentValues contentValues = mContentQueryMap.getValues(NAME0);
-        assertNotNull(contentValues);
-        assertEquals(VALUE0, contentValues.getAsString(DummyProvider.VALUE));
-
-        contentValues = mContentQueryMap.getValues(NAME1);
-        assertNotNull(contentValues);
-        assertEquals(VALUE1, contentValues.getAsString(DummyProvider.VALUE));
-
-        contentValues = mContentQueryMap.getValues(NAME2);
-        assertNull(contentValues);
-
-        // update NAME0 and VALUE0
-        ContentValues values = new ContentValues();
-        values.put(DummyProvider.NAME, NAME2);
-        values.put(DummyProvider.VALUE, VALUE2);
-        mResolver.update(DummyProvider.CONTENT_URI, values,
-                DummyProvider.NAME + " = '" + NAME0 + "'", null);
-        mContentQueryMap.requery();
-
-        contentValues = mContentQueryMap.getValues(NAME0);
-        assertNull(contentValues);
-
-        contentValues = mContentQueryMap.getValues(NAME1);
-        assertNotNull(contentValues);
-        assertEquals(VALUE1, contentValues.getAsString(DummyProvider.VALUE));
-
-        contentValues = mContentQueryMap.getValues(NAME2);
-        assertNotNull(contentValues);
-        assertEquals(VALUE2, contentValues.getAsString(DummyProvider.VALUE));
-    }
-
-    public void testSetKeepUpdated() throws InterruptedException {
-        MockObserver observer = new MockObserver();
-
-        // keepUpdated is false
-        mContentQueryMap = new ContentQueryMap(mCursor, DummyProvider.NAME, false, null);
-        mContentQueryMap.addObserver(observer);
-        assertFalse(observer.hadUpdated(0));
-
-        ContentValues contentValues = mContentQueryMap.getValues(NAME0);
-        assertNotNull(contentValues);
-        assertEquals(VALUE0, contentValues.getAsString(DummyProvider.VALUE));
-        contentValues = mContentQueryMap.getValues(NAME2);
-        assertNull(contentValues);
-
-        // update NAME0 and VALUE0
-        ContentValues values = new ContentValues();
-        values.put(DummyProvider.NAME, NAME2);
-        values.put(DummyProvider.VALUE, VALUE2);
-        mResolver.update(DummyProvider.CONTENT_URI, values,
-                DummyProvider.NAME + " = '" + NAME0 + "'", null);
-
-        // values have not been updated
-        assertFalse(observer.hadUpdated(0));
-        contentValues = mContentQueryMap.getValues(NAME0);
-        assertNotNull(contentValues);
-        assertEquals(VALUE0, contentValues.getAsString(DummyProvider.VALUE));
-        contentValues = mContentQueryMap.getValues(NAME2);
-        assertNull(contentValues);
-
-        // have to update manually
-        mContentQueryMap.requery();
-        assertTrue(observer.hadUpdated(0));
-        assertSame(mContentQueryMap, observer.getObservable());
-
-        contentValues = mContentQueryMap.getValues(NAME0);
-        assertNull(contentValues);
-        contentValues = mContentQueryMap.getValues(NAME2);
-        assertNotNull(contentValues);
-        assertEquals(VALUE2, contentValues.getAsString(DummyProvider.VALUE));
-
-        observer.reset();
-        contentValues = mContentQueryMap.getValues(NAME3);
-        assertNull(contentValues);
-        new Thread(new Runnable() {
-            public void run() {
-                Looper.prepare();
-                mContentQueryMap.setKeepUpdated(true);
-                synchronized (ContentQueryMapTest.this) {
-                    //listener is ready, release the sender thread
-                    ContentQueryMapTest.this.notify();
-                }
-                Looper.loop();
-            }
-        }).start();
-        synchronized (this) {
-            wait(TEST_TIME_OUT);
-        } //wait the listener to be ready before launching onChange event
-
-        // insert NAME3 and VALUE3
-        values = new ContentValues();
-        values.put(DummyProvider.NAME, NAME3);
-        values.put(DummyProvider.VALUE, VALUE3);
-        mResolver.insert(DummyProvider.CONTENT_URI, values);
-
-        // should be updated automatically
-        assertTrue(observer.hadUpdated(TEST_TIME_OUT));
-        assertSame(mContentQueryMap, observer.getObservable());
-        contentValues = mContentQueryMap.getValues(NAME3);
-        assertNotNull(contentValues);
-        assertEquals(VALUE3, contentValues.getAsString(DummyProvider.VALUE));
-
-        observer.reset();
-        new Thread(new Runnable() {
-            public void run() {
-                Looper.prepare();
-                mContentQueryMap.setKeepUpdated(false);
-                synchronized (ContentQueryMapTest.this) {
-                    //listener is ready, release the sender thread
-                    ContentQueryMapTest.this.notify();
-                }
-                Looper.loop();
-            }
-        }).start();
-        synchronized (this) {
-            wait(TEST_TIME_OUT);
-        } //wait the listener to be ready before launching onChange event
-        // update NAME3 and VALUE3
-        values = new ContentValues();
-        values.put(DummyProvider.NAME, NAME0);
-        values.put(DummyProvider.VALUE, VALUE0);
-        mResolver.update(DummyProvider.CONTENT_URI, values,
-                DummyProvider.NAME + " = '" + NAME3 + "'", null);
-
-        // values have not been updated
-        assertFalse(observer.hadUpdated(TEST_TIME_OUT));
-        contentValues = mContentQueryMap.getValues(NAME3);
-        assertNotNull(contentValues);
-        assertEquals(VALUE3, contentValues.getAsString(DummyProvider.VALUE));
-    }
-
-    public void testSetKeepUpdatedWithHandler() throws InterruptedException {
-        MockObserver observer = new MockObserver();
-        HandlerThread thread = new HandlerThread("testSetKeepUpdatedWithHandler");
-        thread.start();
-        Handler handler = new Handler(thread.getLooper());
-        // keepUpdated is false
-        mContentQueryMap = new ContentQueryMap(mCursor, DummyProvider.NAME, false, handler);
-        mContentQueryMap.addObserver(observer);
-        assertFalse(observer.hadUpdated(0));
-
-        ContentValues contentValues = mContentQueryMap.getValues(NAME0);
-        assertNotNull(contentValues);
-        assertEquals(VALUE0, contentValues.getAsString(DummyProvider.VALUE));
-        contentValues = mContentQueryMap.getValues(NAME2);
-        assertNull(contentValues);
-
-        // update NAME0 and VALUE0
-        ContentValues values = new ContentValues();
-        values.put(DummyProvider.NAME, NAME2);
-        values.put(DummyProvider.VALUE, VALUE2);
-        mResolver.update(DummyProvider.CONTENT_URI, values,
-                DummyProvider.NAME + " = '" + NAME0 + "'", null);
-
-        // values have not been updated
-        assertFalse(observer.hadUpdated(TEST_TIME_OUT));
-        contentValues = mContentQueryMap.getValues(NAME0);
-        assertNotNull(contentValues);
-        assertEquals(VALUE0, contentValues.getAsString(DummyProvider.VALUE));
-        contentValues = mContentQueryMap.getValues(NAME2);
-        assertNull(contentValues);
-
-        // have to update manually
-        mContentQueryMap.requery();
-        assertTrue(observer.hadUpdated(0));
-        assertSame(mContentQueryMap, observer.getObservable());
-
-        contentValues = mContentQueryMap.getValues(NAME0);
-        assertNull(contentValues);
-        contentValues = mContentQueryMap.getValues(NAME2);
-        assertNotNull(contentValues);
-        assertEquals(VALUE2, contentValues.getAsString(DummyProvider.VALUE));
-
-        observer.reset();
-        contentValues = mContentQueryMap.getValues(NAME3);
-        assertNull(contentValues);
-        mContentQueryMap.setKeepUpdated(true);
-
-        // insert NAME3 and VALUE3
-        values = new ContentValues();
-        values.put(DummyProvider.NAME, NAME3);
-        values.put(DummyProvider.VALUE, VALUE3);
-        mResolver.insert(DummyProvider.CONTENT_URI, values);
-
-        // should be updated automatically
-        assertTrue(observer.hadUpdated(TEST_TIME_OUT));
-        assertSame(mContentQueryMap, observer.getObservable());
-        contentValues = mContentQueryMap.getValues(NAME3);
-        assertNotNull(contentValues);
-        assertEquals(VALUE3, contentValues.getAsString(DummyProvider.VALUE));
-
-        observer.reset();
-        mContentQueryMap.setKeepUpdated(false);
-        // update NAME3 and VALUE3
-        values = new ContentValues();
-        values.put(DummyProvider.NAME, NAME0);
-        values.put(DummyProvider.VALUE, VALUE0);
-        mResolver.update(DummyProvider.CONTENT_URI, values,
-                DummyProvider.NAME + " = '" + NAME3 + "'", null);
-
-        // values have not been updated
-        assertFalse(observer.hadUpdated(TEST_TIME_OUT));
-        contentValues = mContentQueryMap.getValues(NAME3);
-        assertNotNull(contentValues);
-        assertEquals(VALUE3, contentValues.getAsString(DummyProvider.VALUE));
-    }
-
-    public void testGetValuesBoundary() {
-        mContentQueryMap = new ContentQueryMap(mCursor, DummyProvider.NAME, false, null);
-        assertNull(mContentQueryMap.getValues(null));
-        assertNull(mContentQueryMap.getValues(""));
-    }
-
-    private static final class MockObserver implements Observer {
-        private boolean mHadUpdated = false;
-        private Observable mObservable;
-
-        public void reset() {
-            mHadUpdated = false;
-            mObservable = null;
-        }
-
-        public synchronized void update(Observable observable, Object data) {
-            mObservable = observable;
-            mHadUpdated = true;
-            notify();
-        }
-
-        public Observable getObservable() {
-            return mObservable;
-        }
-
-        public synchronized boolean hadUpdated(long timeout) throws InterruptedException {
-            // do not wait if timeout is 0
-            if (timeout > 0 && !mHadUpdated) {
-                wait(timeout);
-            }
-            return mHadUpdated;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/ContentResolverTest.java b/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/ContentResolverTest.java
deleted file mode 100755
index 2f6d996eaed02e68a296a391de856f7a3eeaa4bd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/ContentResolverTest.java
+++ /dev/null
@@ -1,1061 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import com.android.cts.stub.R;
-
-
-import android.accounts.Account;
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.res.AssetFileDescriptor;
-import android.cts.util.PollingCheck;
-import android.database.ContentObserver;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.CancellationSignal;
-import android.os.OperationCanceledException;
-import android.os.ParcelFileDescriptor;
-import android.os.RemoteException;
-import android.test.AndroidTestCase;
-import android.util.Log;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-
-public class ContentResolverTest extends AndroidTestCase {
-    private final static String COLUMN_ID_NAME = "_id";
-    private final static String COLUMN_KEY_NAME = "key";
-    private final static String COLUMN_VALUE_NAME = "value";
-
-    private static final String AUTHORITY = "ctstest";
-    private static final Uri TABLE1_URI = Uri.parse("content://" + AUTHORITY + "/testtable1/");
-    private static final Uri TABLE1_CROSS_URI =
-            Uri.parse("content://" + AUTHORITY + "/testtable1/cross");
-    private static final Uri TABLE2_URI = Uri.parse("content://" + AUTHORITY + "/testtable2/");
-    private static final Uri SELF_URI = Uri.parse("content://" + AUTHORITY + "/self/");
-    private static final Uri CRASH_URI = Uri.parse("content://" + AUTHORITY + "/crash/");
-
-    private static final String REMOTE_AUTHORITY = "remotectstest";
-    private static final Uri REMOTE_TABLE1_URI = Uri.parse("content://"
-                + REMOTE_AUTHORITY + "/testtable1/");
-    private static final Uri REMOTE_SELF_URI = Uri.parse("content://"
-                + REMOTE_AUTHORITY + "/self/");
-    private static final Uri REMOTE_CRASH_URI = Uri.parse("content://"
-            + REMOTE_AUTHORITY + "/crash/");
-
-    private static final Account ACCOUNT = new Account("cts", "cts");
-
-    private static final String KEY1 = "key1";
-    private static final String KEY2 = "key2";
-    private static final String KEY3 = "key3";
-    private static final int VALUE1 = 1;
-    private static final int VALUE2 = 2;
-    private static final int VALUE3 = 3;
-
-    private static final String TEST_PACKAGE_NAME = "com.android.cts.stub";
-
-    private Context mContext;
-    private ContentResolver mContentResolver;
-    private Cursor mCursor;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mContext = getContext();
-        mContentResolver = mContext.getContentResolver();
-
-        android.provider.Settings.System.putInt(mContentResolver, "__cts_crash_on_launch", 0);
-
-        // add three rows to database when every test case start.
-        ContentValues values = new ContentValues();
-
-        values.put(COLUMN_KEY_NAME, KEY1);
-        values.put(COLUMN_VALUE_NAME, VALUE1);
-        mContentResolver.insert(TABLE1_URI, values);
-        mContentResolver.insert(REMOTE_TABLE1_URI, values);
-
-        values.put(COLUMN_KEY_NAME, KEY2);
-        values.put(COLUMN_VALUE_NAME, VALUE2);
-        mContentResolver.insert(TABLE1_URI, values);
-        mContentResolver.insert(REMOTE_TABLE1_URI, values);
-
-        values.put(COLUMN_KEY_NAME, KEY3);
-        values.put(COLUMN_VALUE_NAME, VALUE3);
-        mContentResolver.insert(TABLE1_URI, values);
-        mContentResolver.insert(REMOTE_TABLE1_URI, values);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mContentResolver.delete(TABLE1_URI, null, null);
-        if (null != mCursor && !mCursor.isClosed()) {
-            mCursor.close();
-        }
-        mContentResolver.delete(REMOTE_TABLE1_URI, null, null);
-        if (null != mCursor && !mCursor.isClosed()) {
-            mCursor.close();
-        }
-        super.tearDown();
-    }
-
-    public void testConstructor() {
-        assertNotNull(mContentResolver);
-    }
-
-    public void testCrashOnLaunch() {
-        // This test is going to make sure that the platform deals correctly
-        // with a content provider process going away while a client is waiting
-        // for it to come up.
-        // First, we need to make sure our provider process is gone.  Goodbye!
-        ContentProviderClient client = mContentResolver.acquireContentProviderClient(
-                REMOTE_AUTHORITY);
-        // We are going to do something wrong here...  release the client first,
-        // so the act of killing it doesn't kill our own process.
-        client.release();
-        try {
-            client.delete(REMOTE_SELF_URI, null, null);
-        } catch (RemoteException e) {
-        }
-        // Now make sure the thing is actually gone.
-        boolean gone = true;
-        try {
-            client.getType(REMOTE_TABLE1_URI);
-            gone = false;
-        } catch (RemoteException e) {
-        }
-        if (!gone) {
-            fail("Content provider process is not gone!");
-        }
-        try {
-            android.provider.Settings.System.putInt(mContentResolver, "__cts_crash_on_launch", 1);
-            String type1 = mContentResolver.getType(REMOTE_TABLE1_URI);
-            assertEquals(android.provider.Settings.System.getInt(mContentResolver,
-                "__cts_crash_on_launch", 0), 0);
-            assertTrue(type1.startsWith(ContentResolver.CURSOR_DIR_BASE_TYPE, 0));
-        } finally {
-            android.provider.Settings.System.putInt(mContentResolver, "__cts_crash_on_launch", 0);
-        }
-    }
-
-    public void testUnstableToStableRefs() {
-        // Get an unstable refrence on the remote content provider.
-        ContentProviderClient uClient = mContentResolver.acquireUnstableContentProviderClient(
-                REMOTE_AUTHORITY);
-        // Verify we can access it.
-        String type1 = mContentResolver.getType(REMOTE_TABLE1_URI);
-        assertTrue(type1.startsWith(ContentResolver.CURSOR_DIR_BASE_TYPE, 0));
-
-        // Get a stable reference on the remote content provider.
-        ContentProviderClient sClient = mContentResolver.acquireContentProviderClient(
-                REMOTE_AUTHORITY);
-        // Verify we can still access it.
-        type1 = mContentResolver.getType(REMOTE_TABLE1_URI);
-        assertTrue(type1.startsWith(ContentResolver.CURSOR_DIR_BASE_TYPE, 0));
-
-        // Release unstable reference.
-        uClient.release();
-        // Verify we can still access it.
-        type1 = mContentResolver.getType(REMOTE_TABLE1_URI);
-        assertTrue(type1.startsWith(ContentResolver.CURSOR_DIR_BASE_TYPE, 0));
-
-        // Release stable reference, removing last ref.
-        sClient.release();
-        // Kill it.  Note that a bug at this point where it causes our own
-        // process to be killed will result in the entire test failing.
-        try {
-            Log.i("ContentResolverTest",
-                    "Killing remote client -- if test process goes away, that is why!");
-            uClient.delete(REMOTE_SELF_URI, null, null);
-        } catch (RemoteException e) {
-        }
-        // Make sure the remote client is actually gone.
-        boolean gone = true;
-        try {
-            sClient.getType(REMOTE_TABLE1_URI);
-            gone = false;
-        } catch (RemoteException e) {
-        }
-        if (!gone) {
-            fail("Content provider process is not gone!");
-        }
-    }
-
-    public void testStableToUnstableRefs() {
-        // Get a stable reference on the remote content provider.
-        ContentProviderClient sClient = mContentResolver.acquireContentProviderClient(
-                REMOTE_AUTHORITY);
-        // Verify we can still access it.
-        String type1 = mContentResolver.getType(REMOTE_TABLE1_URI);
-        assertTrue(type1.startsWith(ContentResolver.CURSOR_DIR_BASE_TYPE, 0));
-
-        // Get an unstable refrence on the remote content provider.
-        ContentProviderClient uClient = mContentResolver.acquireUnstableContentProviderClient(
-                REMOTE_AUTHORITY);
-        // Verify we can access it.
-        type1 = mContentResolver.getType(REMOTE_TABLE1_URI);
-        assertTrue(type1.startsWith(ContentResolver.CURSOR_DIR_BASE_TYPE, 0));
-
-        // Release stable reference, leaving only an unstable ref.
-        sClient.release();
-
-        // Kill it.  Note that a bug at this point where it causes our own
-        // process to be killed will result in the entire test failing.
-        try {
-            Log.i("ContentResolverTest",
-                    "Killing remote client -- if test process goes away, that is why!");
-            uClient.delete(REMOTE_SELF_URI, null, null);
-        } catch (RemoteException e) {
-        }
-        // Make sure the remote client is actually gone.
-        boolean gone = true;
-        try {
-            uClient.getType(REMOTE_TABLE1_URI);
-            gone = false;
-        } catch (RemoteException e) {
-        }
-        if (!gone) {
-            fail("Content provider process is not gone!");
-        }
-
-        // Release unstable reference.
-        uClient.release();
-    }
-
-    public void testGetType() {
-        String type1 = mContentResolver.getType(TABLE1_URI);
-        assertTrue(type1.startsWith(ContentResolver.CURSOR_DIR_BASE_TYPE, 0));
-
-        String type2 = mContentResolver.getType(TABLE2_URI);
-        assertTrue(type2.startsWith(ContentResolver.CURSOR_DIR_BASE_TYPE, 0));
-
-        Uri invalidUri = Uri.parse("abc");
-        assertNull(mContentResolver.getType(invalidUri));
-
-        try {
-            mContentResolver.getType(null);
-            fail("did not throw NullPointerException when Uri is null.");
-        } catch (NullPointerException e) {
-            //expected.
-        }
-    }
-
-    public void testUnstableGetType() {
-        // Get an unstable refrence on the remote content provider.
-        ContentProviderClient client = mContentResolver.acquireUnstableContentProviderClient(
-                REMOTE_AUTHORITY);
-        // Verify we can access it.
-        String type1 = mContentResolver.getType(REMOTE_TABLE1_URI);
-        assertTrue(type1.startsWith(ContentResolver.CURSOR_DIR_BASE_TYPE, 0));
-
-        // Kill it.  Note that a bug at this point where it causes our own
-        // process to be killed will result in the entire test failing.
-        try {
-            Log.i("ContentResolverTest",
-                    "Killing remote client -- if test process goes away, that is why!");
-            client.delete(REMOTE_SELF_URI, null, null);
-        } catch (RemoteException e) {
-        }
-        // Make sure the remote client is actually gone.
-        boolean gone = true;
-        try {
-            client.getType(REMOTE_TABLE1_URI);
-            gone = false;
-        } catch (RemoteException e) {
-        }
-        if (!gone) {
-            fail("Content provider process is not gone!");
-        }
-
-        // Now the remote client is gone, can we recover?
-        // Release our old reference.
-        client.release();
-        // Get a new reference.
-        client = mContentResolver.acquireUnstableContentProviderClient(REMOTE_AUTHORITY);
-        // Verify we can access it.
-        type1 = mContentResolver.getType(REMOTE_TABLE1_URI);
-        assertTrue(type1.startsWith(ContentResolver.CURSOR_DIR_BASE_TYPE, 0));
-    }
-
-    public void testQuery() {
-        mCursor = mContentResolver.query(TABLE1_URI, null, null, null, null);
-
-        assertNotNull(mCursor);
-        assertEquals(3, mCursor.getCount());
-        assertEquals(3, mCursor.getColumnCount());
-
-        mCursor.moveToLast();
-        assertEquals(3, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_ID_NAME)));
-        assertEquals(KEY3, mCursor.getString(mCursor.getColumnIndexOrThrow(COLUMN_KEY_NAME)));
-        assertEquals(VALUE3, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME)));
-
-        mCursor.moveToPrevious();
-        assertEquals(2, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_ID_NAME)));
-        assertEquals(KEY2, mCursor.getString(mCursor.getColumnIndexOrThrow(COLUMN_KEY_NAME)));
-        assertEquals(VALUE2, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME)));
-        mCursor.close();
-
-        String selection = COLUMN_ID_NAME + "=1";
-        mCursor = mContentResolver.query(TABLE1_URI, null, selection, null, null);
-        assertNotNull(mCursor);
-        assertEquals(1, mCursor.getCount());
-        assertEquals(3, mCursor.getColumnCount());
-
-        mCursor.moveToFirst();
-        assertEquals(1, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_ID_NAME)));
-        assertEquals(KEY1, mCursor.getString(mCursor.getColumnIndexOrThrow(COLUMN_KEY_NAME)));
-        assertEquals(VALUE1, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME)));
-        mCursor.close();
-
-        selection = COLUMN_KEY_NAME + "=\"" + KEY3 + "\"";
-        mCursor = mContentResolver.query(TABLE1_URI, null, selection, null, null);
-        assertNotNull(mCursor);
-        assertEquals(1, mCursor.getCount());
-        assertEquals(3, mCursor.getColumnCount());
-
-        mCursor.moveToFirst();
-        assertEquals(3, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_ID_NAME)));
-        assertEquals(KEY3, mCursor.getString(mCursor.getColumnIndexOrThrow(COLUMN_KEY_NAME)));
-        assertEquals(VALUE3, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME)));
-        mCursor.close();
-
-        try {
-            mContentResolver.query(null, null, null, null, null);
-            fail("did not throw NullPointerException when uri is null.");
-        } catch (NullPointerException e) {
-            //expected.
-        }
-    }
-
-    public void testCrashingQuery() {
-        try {
-            android.provider.Settings.System.putInt(mContentResolver, "__cts_crash_on_launch", 1);
-            mCursor = mContentResolver.query(REMOTE_CRASH_URI, null, null, null, null);
-            assertEquals(android.provider.Settings.System.getInt(mContentResolver,
-                "__cts_crash_on_launch", 0), 0);
-        } finally {
-            android.provider.Settings.System.putInt(mContentResolver, "__cts_crash_on_launch", 0);
-        }
-
-        assertNotNull(mCursor);
-        assertEquals(3, mCursor.getCount());
-        assertEquals(3, mCursor.getColumnCount());
-
-        mCursor.moveToLast();
-        assertEquals(3, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_ID_NAME)));
-        assertEquals(KEY3, mCursor.getString(mCursor.getColumnIndexOrThrow(COLUMN_KEY_NAME)));
-        assertEquals(VALUE3, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME)));
-
-        mCursor.moveToPrevious();
-        assertEquals(2, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_ID_NAME)));
-        assertEquals(KEY2, mCursor.getString(mCursor.getColumnIndexOrThrow(COLUMN_KEY_NAME)));
-        assertEquals(VALUE2, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME)));
-        mCursor.close();
-    }
-
-    public void testCancelableQuery_WhenNotCanceled_ReturnsResultSet() {
-        CancellationSignal cancellationSignal = new CancellationSignal();
-
-        Cursor cursor = mContentResolver.query(TABLE1_URI, null, null, null, null,
-                cancellationSignal);
-        assertEquals(3, cursor.getCount());
-        cursor.close();
-    }
-
-    public void testCancelableQuery_WhenCanceledBeforeQuery_ThrowsImmediately() {
-        CancellationSignal cancellationSignal = new CancellationSignal();
-        cancellationSignal.cancel();
-
-        try {
-            mContentResolver.query(TABLE1_URI, null, null, null, null, cancellationSignal);
-            fail("Expected OperationCanceledException");
-        } catch (OperationCanceledException ex) {
-            // expected
-        }
-    }
-
-    public void testCancelableQuery_WhenCanceledDuringLongRunningQuery_CancelsQueryAndThrows() {
-        // Populate a table with a bunch of integers.
-        mContentResolver.delete(TABLE1_URI, null, null);
-        ContentValues values = new ContentValues();
-        for (int i = 0; i < 100; i++) {
-            values.put(COLUMN_KEY_NAME, i);
-            values.put(COLUMN_VALUE_NAME, i);
-            mContentResolver.insert(TABLE1_URI, values);
-        }
-
-        for (int i = 0; i < 5; i++) {
-            final CancellationSignal cancellationSignal = new CancellationSignal();
-            Thread cancellationThread = new Thread() {
-                @Override
-                public void run() {
-                    try {
-                        Thread.sleep(300);
-                    } catch (InterruptedException ex) {
-                    }
-                    cancellationSignal.cancel();
-                }
-            };
-            try {
-                // Build an unsatisfiable 5-way cross-product query over 100 values but
-                // produces no output.  This should force SQLite to loop for a long time
-                // as it tests 10^10 combinations.
-                cancellationThread.start();
-
-                final long startTime = System.nanoTime();
-                try {
-                    mContentResolver.query(TABLE1_CROSS_URI, null,
-                            "a.value + b.value + c.value + d.value + e.value > 1000000",
-                            null, null, cancellationSignal);
-                    fail("Expected OperationCanceledException");
-                } catch (OperationCanceledException ex) {
-                    // expected
-                }
-
-                // We want to confirm that the query really was running and then got
-                // canceled midway.
-                final long waitTime = System.nanoTime() - startTime;
-                if (waitTime > 150 * 1000000L && waitTime < 600 * 1000000L) {
-                    return; // success!
-                }
-            } finally {
-                try {
-                    cancellationThread.join();
-                } catch (InterruptedException e) {
-                }
-            }
-        }
-
-        // Occasionally we might miss the timing deadline due to factors in the
-        // environment, but if after several trials we still couldn't demonstrate
-        // that the query was canceled, then the test must be broken.
-        fail("Could not prove that the query actually canceled midway during execution.");
-    }
-
-    public void testOpenInputStream() throws IOException {
-        final Uri uri = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE +
-                "://" + TEST_PACKAGE_NAME + "/" + R.drawable.pass);
-
-        InputStream is = mContentResolver.openInputStream(uri);
-        assertNotNull(is);
-        is.close();
-
-        final Uri invalidUri = Uri.parse("abc");
-        try {
-            mContentResolver.openInputStream(invalidUri);
-            fail("did not throw FileNotFoundException when uri is invalid.");
-        } catch (FileNotFoundException e) {
-            //expected.
-        }
-    }
-
-    public void testOpenOutputStream() throws IOException {
-        Uri uri = Uri.parse(ContentResolver.SCHEME_FILE + "://" +
-                getContext().getCacheDir().getAbsolutePath() +
-                "/temp.jpg");
-        OutputStream os = mContentResolver.openOutputStream(uri);
-        assertNotNull(os);
-        os.close();
-
-        os = mContentResolver.openOutputStream(uri, "wa");
-        assertNotNull(os);
-        os.close();
-
-        uri = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE +
-                "://" + TEST_PACKAGE_NAME + "/" + R.raw.testimage);
-        try {
-            mContentResolver.openOutputStream(uri);
-            fail("did not throw FileNotFoundException when scheme is not accepted.");
-        } catch (FileNotFoundException e) {
-            //expected.
-        }
-
-        try {
-            mContentResolver.openOutputStream(uri, "w");
-            fail("did not throw FileNotFoundException when scheme is not accepted.");
-        } catch (FileNotFoundException e) {
-            //expected.
-        }
-
-        Uri invalidUri = Uri.parse("abc");
-        try {
-            mContentResolver.openOutputStream(invalidUri);
-            fail("did not throw FileNotFoundException when uri is invalid.");
-        } catch (FileNotFoundException e) {
-            //expected.
-        }
-
-        try {
-            mContentResolver.openOutputStream(invalidUri, "w");
-            fail("did not throw FileNotFoundException when uri is invalid.");
-        } catch (FileNotFoundException e) {
-            //expected.
-        }
-    }
-
-    public void testOpenAssetFileDescriptor() throws IOException {
-        Uri uri = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE +
-                "://" + TEST_PACKAGE_NAME + "/" + R.raw.testimage);
-
-        AssetFileDescriptor afd = mContentResolver.openAssetFileDescriptor(uri, "r");
-        assertNotNull(afd);
-        afd.close();
-
-        try {
-            mContentResolver.openAssetFileDescriptor(uri, "d");
-            fail("did not throw FileNotFoundException when mode is unknown.");
-        } catch (FileNotFoundException e) {
-            //expected.
-        }
-
-        Uri invalidUri = Uri.parse("abc");
-        try {
-            mContentResolver.openAssetFileDescriptor(invalidUri, "r");
-            fail("did not throw FileNotFoundException when uri is invalid.");
-        } catch (FileNotFoundException e) {
-            //expected.
-        }
-    }
-
-    private String consumeAssetFileDescriptor(AssetFileDescriptor afd)
-            throws IOException {
-        FileInputStream stream = null;
-        try {
-            stream = afd.createInputStream();
-            InputStreamReader reader = new InputStreamReader(stream, "UTF-8");
-
-            // Got it...  copy the stream into a local string and return it.
-            StringBuilder builder = new StringBuilder(128);
-            char[] buffer = new char[8192];
-            int len;
-            while ((len = reader.read(buffer)) > 0) {
-                builder.append(buffer, 0, len);
-            }
-            return builder.toString();
-
-        } finally {
-            if (stream != null) {
-                try {
-                    stream.close();
-                } catch (IOException e) {
-                }
-            }
-        }
-
-    }
-
-    public void testCrashingOpenAssetFileDescriptor() throws IOException {
-        AssetFileDescriptor afd = null;
-        try {
-            android.provider.Settings.System.putInt(mContentResolver, "__cts_crash_on_launch", 1);
-            afd = mContentResolver.openAssetFileDescriptor(REMOTE_CRASH_URI, "rw");
-            assertEquals(android.provider.Settings.System.getInt(mContentResolver,
-                    "__cts_crash_on_launch", 0), 0);
-            assertNotNull(afd);
-            String str = consumeAssetFileDescriptor(afd);
-            afd = null;
-            assertEquals(str, "This is the openAssetFile test data!");
-        } finally {
-            android.provider.Settings.System.putInt(mContentResolver, "__cts_crash_on_launch", 0);
-            if (afd != null) {
-                afd.close();
-            }
-        }
-
-        // Make sure a content provider crash at this point won't hurt us.
-        ContentProviderClient uClient = mContentResolver.acquireUnstableContentProviderClient(
-                REMOTE_AUTHORITY);
-        // Kill it.  Note that a bug at this point where it causes our own
-        // process to be killed will result in the entire test failing.
-        try {
-            Log.i("ContentResolverTest",
-                    "Killing remote client -- if test process goes away, that is why!");
-            uClient.delete(REMOTE_SELF_URI, null, null);
-        } catch (RemoteException e) {
-        }
-        uClient.release();
-    }
-
-    public void testCrashingOpenTypedAssetFileDescriptor() throws IOException {
-        AssetFileDescriptor afd = null;
-        try {
-            android.provider.Settings.System.putInt(mContentResolver, "__cts_crash_on_launch", 1);
-            afd = mContentResolver.openTypedAssetFileDescriptor(
-                    REMOTE_CRASH_URI, "text/plain", null);
-            assertEquals(android.provider.Settings.System.getInt(mContentResolver,
-                    "__cts_crash_on_launch", 0), 0);
-            assertNotNull(afd);
-            String str = consumeAssetFileDescriptor(afd);
-            afd = null;
-            assertEquals(str, "This is the openTypedAssetFile test data!");
-        } finally {
-            android.provider.Settings.System.putInt(mContentResolver, "__cts_crash_on_launch", 0);
-            if (afd != null) {
-                afd.close();
-            }
-        }
-
-        // Make sure a content provider crash at this point won't hurt us.
-        ContentProviderClient uClient = mContentResolver.acquireUnstableContentProviderClient(
-                REMOTE_AUTHORITY);
-        // Kill it.  Note that a bug at this point where it causes our own
-        // process to be killed will result in the entire test failing.
-        try {
-            Log.i("ContentResolverTest",
-                    "Killing remote client -- if test process goes away, that is why!");
-            uClient.delete(REMOTE_SELF_URI, null, null);
-        } catch (RemoteException e) {
-        }
-        uClient.release();
-    }
-
-    public void testOpenFileDescriptor() throws IOException {
-        Uri uri = Uri.parse(ContentResolver.SCHEME_FILE + "://" +
-                getContext().getCacheDir().getAbsolutePath() +
-                "/temp.jpg");
-        ParcelFileDescriptor pfd = mContentResolver.openFileDescriptor(uri, "w");
-        assertNotNull(pfd);
-        pfd.close();
-
-        try {
-            mContentResolver.openFileDescriptor(uri, "d");
-            fail("did not throw IllegalArgumentException when mode is unknown.");
-        } catch (IllegalArgumentException e) {
-            //expected.
-        }
-
-        Uri invalidUri = Uri.parse("abc");
-        try {
-            mContentResolver.openFileDescriptor(invalidUri, "w");
-            fail("did not throw FileNotFoundException when uri is invalid.");
-        } catch (FileNotFoundException e) {
-            //expected.
-        }
-
-        uri = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE +
-                "://" + TEST_PACKAGE_NAME + "/" + R.raw.testimage);
-        try {
-            mContentResolver.openFileDescriptor(uri, "w");
-            fail("did not throw FileNotFoundException when scheme is not accepted.");
-        } catch (FileNotFoundException e) {
-            //expected.
-        }
-    }
-
-    public void testInsert() {
-        String key4 = "key4";
-        String key5 = "key5";
-        int value4 = 4;
-        int value5 = 5;
-        String key4Selection = COLUMN_KEY_NAME + "=\"" + key4 + "\"";
-
-        mCursor = mContentResolver.query(TABLE1_URI, null, key4Selection, null, null);
-        assertEquals(0, mCursor.getCount());
-        mCursor.close();
-
-        ContentValues values = new ContentValues();
-        values.put(COLUMN_KEY_NAME, key4);
-        values.put(COLUMN_VALUE_NAME, value4);
-        Uri uri = mContentResolver.insert(TABLE1_URI, values);
-        assertNotNull(uri);
-
-        mCursor = mContentResolver.query(TABLE1_URI, null, key4Selection, null, null);
-        assertNotNull(mCursor);
-        assertEquals(1, mCursor.getCount());
-
-        mCursor.moveToFirst();
-        assertEquals(4, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_ID_NAME)));
-        assertEquals(key4, mCursor.getString(mCursor.getColumnIndexOrThrow(COLUMN_KEY_NAME)));
-        assertEquals(value4, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME)));
-        mCursor.close();
-
-        values.put(COLUMN_KEY_NAME, key5);
-        values.put(COLUMN_VALUE_NAME, value5);
-        uri = mContentResolver.insert(TABLE1_URI, values);
-        assertNotNull(uri);
-
-        // check returned uri
-        mCursor = mContentResolver.query(uri, null, null, null, null);
-        assertNotNull(mCursor);
-        assertEquals(1, mCursor.getCount());
-
-        mCursor.moveToLast();
-        assertEquals(5, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_ID_NAME)));
-        assertEquals(key5, mCursor.getString(mCursor.getColumnIndexOrThrow(COLUMN_KEY_NAME)));
-        assertEquals(value5, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME)));
-        mCursor.close();
-
-        try {
-            mContentResolver.insert(null, values);
-            fail("did not throw NullPointerException when uri is null.");
-        } catch (NullPointerException e) {
-            //expected.
-        }
-    }
-
-    public void testBulkInsert() {
-        String key4 = "key4";
-        String key5 = "key5";
-        int value4 = 4;
-        int value5 = 5;
-
-        mCursor = mContentResolver.query(TABLE1_URI, null, null, null, null);
-        assertNotNull(mCursor);
-        assertEquals(3, mCursor.getCount());
-        mCursor.close();
-
-        ContentValues[] cvs = new ContentValues[2];
-        cvs[0] = new ContentValues();
-        cvs[0].put(COLUMN_KEY_NAME, key4);
-        cvs[0].put(COLUMN_VALUE_NAME, value4);
-
-        cvs[1] = new ContentValues();
-        cvs[1].put(COLUMN_KEY_NAME, key5);
-        cvs[1].put(COLUMN_VALUE_NAME, value5);
-
-        assertEquals(2, mContentResolver.bulkInsert(TABLE1_URI, cvs));
-        mCursor = mContentResolver.query(TABLE1_URI, null, null, null, null);
-        assertNotNull(mCursor);
-        assertEquals(5, mCursor.getCount());
-
-        mCursor.moveToLast();
-        assertEquals(5, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_ID_NAME)));
-        assertEquals(key5, mCursor.getString(mCursor.getColumnIndexOrThrow(COLUMN_KEY_NAME)));
-        assertEquals(value5, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME)));
-
-        mCursor.moveToPrevious();
-        assertEquals(4, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_ID_NAME)));
-        assertEquals(key4, mCursor.getString(mCursor.getColumnIndexOrThrow(COLUMN_KEY_NAME)));
-        assertEquals(value4, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME)));
-        mCursor.close();
-
-        try {
-            mContentResolver.bulkInsert(null, cvs);
-            fail("did not throw NullPointerException when uri is null.");
-        } catch (NullPointerException e) {
-            //expected.
-        }
-    }
-
-    public void testDelete() {
-        mCursor = mContentResolver.query(TABLE1_URI, null, null, null, null);
-        assertNotNull(mCursor);
-        assertEquals(3, mCursor.getCount());
-        mCursor.close();
-
-        assertEquals(3, mContentResolver.delete(TABLE1_URI, null, null));
-        mCursor = mContentResolver.query(TABLE1_URI, null, null, null, null);
-        assertNotNull(mCursor);
-        assertEquals(0, mCursor.getCount());
-        mCursor.close();
-
-        // add three rows to database.
-        ContentValues values = new ContentValues();
-        values.put(COLUMN_KEY_NAME, KEY1);
-        values.put(COLUMN_VALUE_NAME, VALUE1);
-        mContentResolver.insert(TABLE1_URI, values);
-
-        values.put(COLUMN_KEY_NAME, KEY2);
-        values.put(COLUMN_VALUE_NAME, VALUE2);
-        mContentResolver.insert(TABLE1_URI, values);
-
-        values.put(COLUMN_KEY_NAME, KEY3);
-        values.put(COLUMN_VALUE_NAME, VALUE3);
-        mContentResolver.insert(TABLE1_URI, values);
-
-        // test delete row using selection
-        String selection = COLUMN_ID_NAME + "=2";
-        assertEquals(1, mContentResolver.delete(TABLE1_URI, selection, null));
-
-        mCursor = mContentResolver.query(TABLE1_URI, null, null, null, null);
-        assertNotNull(mCursor);
-        assertEquals(2, mCursor.getCount());
-
-        mCursor.moveToFirst();
-        assertEquals(1, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_ID_NAME)));
-        assertEquals(KEY1, mCursor.getString(mCursor.getColumnIndexOrThrow(COLUMN_KEY_NAME)));
-        assertEquals(VALUE1, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME)));
-
-        mCursor.moveToNext();
-        assertEquals(3, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_ID_NAME)));
-        assertEquals(KEY3, mCursor.getString(mCursor.getColumnIndexOrThrow(COLUMN_KEY_NAME)));
-        assertEquals(VALUE3, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME)));
-        mCursor.close();
-
-        selection = COLUMN_VALUE_NAME + "=3";
-        assertEquals(1, mContentResolver.delete(TABLE1_URI, selection, null));
-
-        mCursor = mContentResolver.query(TABLE1_URI, null, null, null, null);
-        assertNotNull(mCursor);
-        assertEquals(1, mCursor.getCount());
-
-        mCursor.moveToFirst();
-        assertEquals(1, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_ID_NAME)));
-        assertEquals(KEY1, mCursor.getString(mCursor.getColumnIndexOrThrow(COLUMN_KEY_NAME)));
-        assertEquals(VALUE1, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME)));
-        mCursor.close();
-
-        selection = COLUMN_KEY_NAME + "=\"" + KEY1 + "\"";
-        assertEquals(1, mContentResolver.delete(TABLE1_URI, selection, null));
-
-        mCursor = mContentResolver.query(TABLE1_URI, null, null, null, null);
-        assertNotNull(mCursor);
-        assertEquals(0, mCursor.getCount());
-        mCursor.close();
-
-        try {
-            mContentResolver.delete(null, null, null);
-            fail("did not throw NullPointerException when uri is null.");
-        } catch (NullPointerException e) {
-            //expected.
-        }
-    }
-
-    public void testUpdate() {
-        ContentValues values = new ContentValues();
-        String key10 = "key10";
-        String key20 = "key20";
-        int value10 = 10;
-        int value20 = 20;
-
-        values.put(COLUMN_KEY_NAME, key10);
-        values.put(COLUMN_VALUE_NAME, value10);
-
-        // test update all the rows.
-        assertEquals(3, mContentResolver.update(TABLE1_URI, values, null, null));
-        mCursor = mContentResolver.query(TABLE1_URI, null, null, null, null);
-        assertNotNull(mCursor);
-        assertEquals(3, mCursor.getCount());
-
-        mCursor.moveToFirst();
-        assertEquals(1, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_ID_NAME)));
-        assertEquals(key10, mCursor.getString(mCursor.getColumnIndexOrThrow(COLUMN_KEY_NAME)));
-        assertEquals(value10, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME)));
-
-        mCursor.moveToNext();
-        assertEquals(2, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_ID_NAME)));
-        assertEquals(key10, mCursor.getString(mCursor.getColumnIndexOrThrow(COLUMN_KEY_NAME)));
-        assertEquals(value10, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME)));
-
-        mCursor.moveToLast();
-        assertEquals(3, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_ID_NAME)));
-        assertEquals(key10, mCursor.getString(mCursor.getColumnIndexOrThrow(COLUMN_KEY_NAME)));
-        assertEquals(value10, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME)));
-        mCursor.close();
-
-        // test update one row using selection.
-        String selection = COLUMN_ID_NAME + "=1";
-        values.put(COLUMN_KEY_NAME, key20);
-        values.put(COLUMN_VALUE_NAME, value20);
-
-        assertEquals(1, mContentResolver.update(TABLE1_URI, values, selection, null));
-        mCursor = mContentResolver.query(TABLE1_URI, null, null, null, null);
-        assertNotNull(mCursor);
-        assertEquals(3, mCursor.getCount());
-
-        mCursor.moveToFirst();
-        assertEquals(1, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_ID_NAME)));
-        assertEquals(key20, mCursor.getString(mCursor.getColumnIndexOrThrow(COLUMN_KEY_NAME)));
-        assertEquals(value20, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME)));
-
-        mCursor.moveToNext();
-        assertEquals(2, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_ID_NAME)));
-        assertEquals(key10, mCursor.getString(mCursor.getColumnIndexOrThrow(COLUMN_KEY_NAME)));
-        assertEquals(value10, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME)));
-
-        mCursor.moveToLast();
-        assertEquals(3, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_ID_NAME)));
-        assertEquals(key10, mCursor.getString(mCursor.getColumnIndexOrThrow(COLUMN_KEY_NAME)));
-        assertEquals(value10, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME)));
-        mCursor.close();
-
-        try {
-            mContentResolver.update(null, values, null, null);
-            fail("did not throw NullPointerException when uri is null.");
-        } catch (NullPointerException e) {
-            //expected.
-        }
-
-        // javadoc says it will throw NullPointerException when values are null,
-        // but actually, it throws IllegalArgumentException here.
-        try {
-            mContentResolver.update(TABLE1_URI, null, null, null);
-            fail("did not throw IllegalArgumentException when values are null.");
-        } catch (IllegalArgumentException e) {
-            //expected.
-        }
-    }
-
-    public void testRegisterContentObserver() {
-        final MockContentObserver mco = new MockContentObserver();
-
-        mContentResolver.registerContentObserver(TABLE1_URI, true, mco);
-        assertFalse(mco.hadOnChanged());
-
-        ContentValues values = new ContentValues();
-        values.put(COLUMN_KEY_NAME, "key10");
-        values.put(COLUMN_VALUE_NAME, 10);
-        mContentResolver.update(TABLE1_URI, values, null, null);
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return mco.hadOnChanged();
-            }
-        } .run();
-
-        mco.reset();
-        mContentResolver.unregisterContentObserver(mco);
-        assertFalse(mco.hadOnChanged());
-        mContentResolver.update(TABLE1_URI, values, null, null);
-
-        assertFalse(mco.hadOnChanged());
-
-        try {
-            mContentResolver.registerContentObserver(null, false, mco);
-            fail("did not throw NullPointerException or IllegalArgumentException when uri is null.");
-        } catch (NullPointerException e) {
-            //expected.
-        } catch (IllegalArgumentException e) {
-            // also expected
-        }
-
-        try {
-            mContentResolver.registerContentObserver(TABLE1_URI, false, null);
-            fail("did not throw NullPointerException when register null content observer.");
-        } catch (NullPointerException e) {
-            //expected.
-        }
-
-        try {
-            mContentResolver.unregisterContentObserver(null);
-            fail("did not throw NullPointerException when unregister null content observer.");
-        } catch (NullPointerException e) {
-            //expected.
-        }
-    }
-
-    public void testNotifyChange1() {
-        final MockContentObserver mco = new MockContentObserver();
-
-        mContentResolver.registerContentObserver(TABLE1_URI, true, mco);
-        assertFalse(mco.hadOnChanged());
-
-        mContentResolver.notifyChange(TABLE1_URI, mco);
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return mco.hadOnChanged();
-            }
-        } .run();
-
-        mContentResolver.unregisterContentObserver(mco);
-    }
-
-    public void testNotifyChange2() {
-        final MockContentObserver mco = new MockContentObserver();
-
-        mContentResolver.registerContentObserver(TABLE1_URI, true, mco);
-        assertFalse(mco.hadOnChanged());
-
-        mContentResolver.notifyChange(TABLE1_URI, mco, false);
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return mco.hadOnChanged();
-            }
-        } .run();
-
-        mContentResolver.unregisterContentObserver(mco);
-    }
-
-    public void testStartCancelSync() {
-        Bundle extras = new Bundle();
-
-        extras.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
-
-        ContentResolver.requestSync(ACCOUNT, AUTHORITY, extras);
-        //FIXME: how to get the result to assert.
-
-        ContentResolver.cancelSync(ACCOUNT, AUTHORITY);
-        //FIXME: how to assert.
-    }
-
-    public void testStartSyncFailure() {
-        try {
-            ContentResolver.requestSync(null, null, null);
-            fail("did not throw IllegalArgumentException when extras is null.");
-        } catch (IllegalArgumentException e) {
-            //expected.
-        }
-    }
-
-    public void testValidateSyncExtrasBundle() {
-        Bundle extras = new Bundle();
-        extras.putInt("Integer", 20);
-        extras.putLong("Long", 10L);
-        extras.putBoolean("Boolean", true);
-        extras.putFloat("Float", 5.5f);
-        extras.putDouble("Double", 2.5);
-        extras.putString("String", "cts");
-        extras.putCharSequence("CharSequence", null);
-
-        ContentResolver.validateSyncExtrasBundle(extras);
-
-        extras.putChar("Char", 'a'); // type Char is invalid
-        try {
-            ContentResolver.validateSyncExtrasBundle(extras);
-            fail("did not throw IllegalArgumentException when extras is invalide.");
-        } catch (IllegalArgumentException e) {
-            //expected.
-        }
-    }
-
-    private class MockContentObserver extends ContentObserver {
-        private boolean mHadOnChanged = false;
-
-        public MockContentObserver() {
-            super(null);
-        }
-
-        @Override
-        public boolean deliverSelfNotifications() {
-            return true;
-        }
-
-        @Override
-        public synchronized void onChange(boolean selfChange) {
-            super.onChange(selfChange);
-            mHadOnChanged = true;
-        }
-
-        public synchronized boolean hadOnChanged() {
-            return mHadOnChanged;
-        }
-
-        public synchronized void reset() {
-            mHadOnChanged = false;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/ContentUrisTest.java b/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/ContentUrisTest.java
deleted file mode 100755
index 7bd0084d384a31c7dffce383a321c076352b13d6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/ContentUrisTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import android.content.ContentUris;
-import android.net.Uri;
-import android.net.Uri.Builder;
-import android.test.AndroidTestCase;
-
-public class ContentUrisTest extends AndroidTestCase {
-    private static final String AUTHORITY = "ctstest";
-    private static final String PATH1 = "testPath1";
-    private static final String PATH2 = "testPath2";
-
-    private static final int CODE1 = 1;
-    private static final int CODE2 = 2;
-
-    private Uri uri1 = Uri.parse("content://" + AUTHORITY + "/" + PATH1);
-    private Uri uri2 = Uri.parse("content://" + AUTHORITY + "/" + PATH2);
-
-    public void testConstructor() {
-        new ContentUris();
-    }
-
-    public void testParseId() {
-        Uri result = ContentUris.withAppendedId(uri1, CODE1);
-        assertEquals(CODE1, ContentUris.parseId(result));
-
-        result = ContentUris.withAppendedId(uri2, CODE2);
-        assertEquals(CODE2, ContentUris.parseId(result));
-
-        // no code in Uri
-        assertEquals(-1, ContentUris.parseId(Uri.parse("")));
-    }
-
-    public void testParseIdFailure() {
-        try {
-            ContentUris.parseId(uri1);
-            fail("There should be a NumberFormatException thrown out.");
-        } catch (NumberFormatException e) {
-            //expected, test success.
-        }
-
-        Uri uri = Uri.fromParts("abc", "123", null);
-        ContentUris.parseId(uri);
-
-        try {
-            ContentUris.parseId(null);
-            fail("There should be a NullPointerException thrown out.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
-    }
-
-    public void testWithAppendedId() {
-        String expected = "content://" + AUTHORITY + "/" + PATH1 + "/" + CODE1;
-        Uri actually;
-
-        assertNotNull(actually = ContentUris.withAppendedId(uri1, CODE1));
-        assertEquals(expected, actually.toString());
-
-        expected = "content://" + AUTHORITY + "/" + PATH2 + "/" + CODE2;
-        assertNotNull(actually = ContentUris.withAppendedId(uri2, CODE2));
-        assertEquals(expected, actually.toString());
-    }
-
-    public void testWithAppendedIdFailure() {
-        try {
-            ContentUris.withAppendedId(null, -1);
-            fail("There should be a NullPointerException thrown out.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
-    }
-
-    public void testAppendId() {
-        String expected = "content://" + AUTHORITY + "/" + PATH1 + "/" + CODE1;
-        Builder actually;
-        Builder b = uri1.buildUpon();
-
-        assertNotNull(actually = ContentUris.appendId(b, CODE1));
-        assertEquals(expected, actually.toString());
-
-        expected = "content://" + AUTHORITY + "/" + PATH2 + "/" + CODE2;
-        b = uri2.buildUpon();
-
-        assertNotNull(actually = ContentUris.appendId(b, CODE2));
-        assertEquals(expected, actually.toString());
-    }
-
-    public void testAppendIdFailure() {
-        try {
-            ContentUris.appendId(null, -1);
-            fail("There should be a NullPointerException thrown out.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/ContentValuesTest.java b/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/ContentValuesTest.java
deleted file mode 100755
index 267ba5f5d3fd81a8a9b2495001b62f6d00058927..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/ContentValuesTest.java
+++ /dev/null
@@ -1,508 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import android.content.ContentValues;
-import android.os.Parcel;
-import android.test.AndroidTestCase;
-
-public class ContentValuesTest extends AndroidTestCase {
-    ContentValues mContentValues;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContentValues = new ContentValues();
-    }
-
-    public void testConstructor() {
-        new ContentValues();
-        new ContentValues(5);
-        new ContentValues(mContentValues);
-
-        try {
-            new ContentValues(-1);
-            fail("There should be a IllegalArgumentException thrown out.");
-        } catch (IllegalArgumentException e) {
-            // expected, test success.
-        }
-
-        try {
-            new ContentValues(null);
-            fail("There should be a NullPointerException thrown out.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
-    }
-
-    public void testValueSet() {
-        Set<Map.Entry<String, Object>> map;
-        assertNotNull(map = mContentValues.valueSet());
-        assertTrue(map.isEmpty());
-
-        mContentValues.put("Long", 10L);
-        mContentValues.put("Integer", 201);
-
-        assertNotNull(map = mContentValues.valueSet());
-        assertFalse(map.isEmpty());
-        assertEquals(2, map.size());
-    }
-
-    public void testPutNull() {
-        mContentValues.putNull("key");
-        assertNull(mContentValues.get("key"));
-
-        mContentValues.putNull("value");
-        assertNull(mContentValues.get("value"));
-
-        mContentValues.putNull("");
-        assertNull(mContentValues.get(""));
-
-        // input null as param
-        mContentValues.putNull(null);
-    }
-
-    public void testGetAsLong() {
-        Long expected = 10L;
-        mContentValues.put("Long", expected);
-        assertEquals(expected, mContentValues.getAsLong("Long"));
-
-        expected = -1000L;
-        mContentValues.put("Long", expected);
-        assertEquals(expected, mContentValues.getAsLong("Long"));
-
-        // input null as param
-        assertNull(mContentValues.getAsLong(null));
-    }
-
-    public void testGetAsByte() {
-        Byte expected = 'a';
-        mContentValues.put("Byte", expected);
-        assertEquals(expected, mContentValues.getAsByte("Byte"));
-
-        expected = 'z';
-        mContentValues.put("Byte", expected);
-        assertEquals(expected, mContentValues.getAsByte("Byte"));
-
-        // input null as param
-        assertNull(mContentValues.getAsByte(null));
-    }
-
-    public void testGetAsInteger() {
-        Integer expected = 20;
-        mContentValues.put("Integer", expected);
-        assertEquals(expected, mContentValues.getAsInteger("Integer"));
-
-        expected = -20000;
-        mContentValues.put("Integer", expected);
-        assertEquals(expected, mContentValues.getAsInteger("Integer"));
-
-        // input null as param
-        assertNull(mContentValues.getAsInteger(null));
-    }
-
-    public void testSize() {
-        assertEquals(0, mContentValues.size());
-
-        mContentValues.put("Integer", 10);
-        mContentValues.put("Long", 10L);
-        assertEquals(2, mContentValues.size());
-
-        mContentValues.put("String", "b");
-        mContentValues.put("Boolean", false);
-        assertEquals(4, mContentValues.size());
-
-        mContentValues.clear();
-        assertEquals(0, mContentValues.size());
-    }
-
-    public void testGetAsShort() {
-        Short expected = 20;
-        mContentValues.put("Short", expected);
-        assertEquals(expected, mContentValues.getAsShort("Short"));
-
-        expected = -200;
-        mContentValues.put("Short", expected);
-        assertEquals(expected, mContentValues.getAsShort("Short"));
-
-        // input null as param
-        assertNull(mContentValues.getAsShort(null));
-    }
-
-    public void testHashCode() {
-        assertEquals(0, mContentValues.hashCode());
-
-        mContentValues.put("Float", 2.2F);
-        mContentValues.put("Short", 12);
-        assertTrue(0 != mContentValues.hashCode());
-
-        int hashcode = mContentValues.hashCode();
-        mContentValues.remove("Short");
-        assertTrue(hashcode != mContentValues.hashCode());
-
-        mContentValues.put("Short", 12);
-        assertTrue(hashcode == mContentValues.hashCode());
-
-        mContentValues.clear();
-        assertEquals(0, mContentValues.hashCode());
-    }
-
-    public void testGetAsFloat() {
-        Float expected = 1.0F;
-        mContentValues.put("Float", expected);
-        assertEquals(expected, mContentValues.getAsFloat("Float"));
-
-        expected = -5.5F;
-        mContentValues.put("Float", expected);
-        assertEquals(expected, mContentValues.getAsFloat("Float"));
-
-        // input null as param
-        assertNull(mContentValues.getAsFloat(null));
-    }
-
-    public void testGetAsBoolean() {
-        mContentValues.put("Boolean", true);
-        assertTrue(mContentValues.getAsBoolean("Boolean"));
-
-        mContentValues.put("Boolean", false);
-        assertFalse(mContentValues.getAsBoolean("Boolean"));
-
-        // input null as param
-        assertNull(mContentValues.getAsBoolean(null));
-    }
-
-    public void testToString() {
-        assertNotNull(mContentValues.toString());
-
-        mContentValues.put("Float", 1.1F);
-        assertNotNull(mContentValues.toString());
-        assertTrue(mContentValues.toString().length() > 0);
-    }
-
-    public void testGet() {
-        Object expected = "android";
-        mContentValues.put("Object", "android");
-        assertSame(expected, mContentValues.get("Object"));
-
-        expected = 20;
-        mContentValues.put("Object", 20);
-        assertSame(expected, mContentValues.get("Object"));
-
-        // input null as params
-        assertNull(mContentValues.get(null));
-    }
-
-    public void testEquals() {
-        mContentValues.put("Boolean", false);
-        mContentValues.put("String", "string");
-
-        ContentValues cv = new ContentValues();
-        cv.put("Boolean", false);
-        cv.put("String", "string");
-
-        assertTrue(mContentValues.equals(cv));
-    }
-
-    public void testEqualsFailure() {
-        // the target object is not an instance of ContentValues.
-        assertFalse(mContentValues.equals(new String()));
-
-        // the two object is not equals
-        mContentValues.put("Boolean", false);
-        mContentValues.put("String", "string");
-
-        ContentValues cv = new ContentValues();
-        cv.put("Boolean", true);
-        cv.put("String", "111");
-
-        assertFalse(mContentValues.equals(cv));
-    }
-
-    public void testGetAsDouble() {
-        Double expected = 10.2;
-        mContentValues.put("Double", expected);
-        assertEquals(expected, mContentValues.getAsDouble("Double"));
-
-        expected = -15.4;
-        mContentValues.put("Double", expected);
-        assertEquals(expected, mContentValues.getAsDouble("Double"));
-
-        // input null as params
-        assertNull(mContentValues.getAsDouble(null));
-    }
-
-    public void testPutString() {
-        String expected = "cts";
-        mContentValues.put("String", expected);
-        assertSame(expected, mContentValues.getAsString("String"));
-
-        expected = "android";
-        mContentValues.put("String", expected);
-        assertSame(expected, mContentValues.getAsString("String"));
-
-        // input null as params
-        mContentValues.put(null, (String) null);
-    }
-
-    public void testPutByte() {
-        Byte expected = 'a';
-        mContentValues.put("Byte", expected);
-        assertSame(expected, mContentValues.getAsByte("Byte"));
-
-        expected = 'z';
-        mContentValues.put("Byte", expected);
-        assertSame(expected, mContentValues.getAsByte("Byte"));
-
-        // input null as params
-        mContentValues.put(null, (Byte) null);
-    }
-
-    public void testPutShort() {
-        Short expected = 20;
-        mContentValues.put("Short", expected);
-        assertEquals(expected, mContentValues.getAsShort("Short"));
-
-        expected = -200;
-        mContentValues.put("Short", expected);
-        assertEquals(expected, mContentValues.getAsShort("Short"));
-
-        // input null as params
-        mContentValues.put(null, (Short) null);
-    }
-
-    public void testPutInteger() {
-        Integer expected = 20;
-        mContentValues.put("Integer", expected);
-        assertEquals(expected, mContentValues.getAsInteger("Integer"));
-
-        expected = -20000;
-        mContentValues.put("Integer", expected);
-        assertEquals(expected, mContentValues.getAsInteger("Integer"));
-
-        // input null as params
-        mContentValues.put(null, (Integer) null);
-    }
-
-    public void testPutLong() {
-        Long expected = 10L;
-        mContentValues.put("Long", expected);
-        assertEquals(expected, mContentValues.getAsLong("Long"));
-
-        expected = -1000L;
-        mContentValues.put("Long", expected);
-        assertEquals(expected, mContentValues.getAsLong("Long"));
-
-        // input null as params
-        mContentValues.put(null, (Long) null);
-    }
-
-    public void testPutFloat() {
-        Float expected = 1.0F;
-        mContentValues.put("Float", expected);
-        assertEquals(expected, mContentValues.getAsFloat("Float"));
-
-        expected = -5.5F;
-        mContentValues.put("Float", expected);
-        assertEquals(expected, mContentValues.getAsFloat("Float"));
-
-        // input null as params
-        mContentValues.put(null, (Float) null);
-    }
-
-    public void testPutDouble() {
-        Double expected = 10.2;
-        mContentValues.put("Double", expected);
-        assertEquals(expected, mContentValues.getAsDouble("Double"));
-
-        expected = -15.4;
-        mContentValues.put("Double", expected);
-        assertEquals(expected, mContentValues.getAsDouble("Double"));
-
-        // input null as params
-        mContentValues.put(null, (Double) null);
-    }
-
-    public void testPutBoolean() {
-        // set the expected value
-        mContentValues.put("Boolean", true);
-        assertTrue(mContentValues.getAsBoolean("Boolean"));
-
-        mContentValues.put("Boolean", false);
-        assertFalse(mContentValues.getAsBoolean("Boolean"));
-
-        // input null as params
-        mContentValues.put(null, (Boolean) null);
-    }
-
-    public void testPutByteArray() {
-        byte[] expected = new byte[] {'1', '2', '3', '4'};
-        mContentValues.put("byte[]", expected);
-        assertSame(expected, mContentValues.getAsByteArray("byte[]"));
-
-        // input null as params
-        mContentValues.put(null, (byte[]) null);
-    }
-
-    public void testContainsKey() {
-        mContentValues.put("Double", 10.2);
-        mContentValues.put("Float", 1.0F);
-
-        assertTrue(mContentValues.containsKey("Double"));
-        assertTrue(mContentValues.containsKey("Float"));
-
-        assertFalse(mContentValues.containsKey("abc"));
-        assertFalse(mContentValues.containsKey("cts"));
-
-        // input null as param
-        assertFalse(mContentValues.containsKey(null));
-    }
-
-    public void testClear() {
-        assertEquals(0, mContentValues.size());
-
-        mContentValues.put("Double", 10.2);
-        mContentValues.put("Float", 1.0F);
-        assertEquals(2, mContentValues.size());
-
-        mContentValues.clear();
-        assertEquals(0, mContentValues.size());
-    }
-
-    @SuppressWarnings("deprecation")
-    public void testAccessStringArrayList() {
-        // set the expected value
-        ArrayList<String> expected = new ArrayList<String>();
-        expected.add(0, "cts");
-        expected.add(1, "android");
-
-        mContentValues.putStringArrayList("StringArrayList", expected);
-        assertSame(expected, mContentValues.getStringArrayList("StringArrayList"));
-
-        // input null as params
-        mContentValues.putStringArrayList(null, null);
-        assertNull(mContentValues.getStringArrayList(null));
-    }
-
-    public void testRemove() {
-        assertEquals(0, mContentValues.size());
-
-        mContentValues.put("Double", 10.2);
-        mContentValues.put("Float", 1.0F);
-        mContentValues.put("Integer", -11);
-        mContentValues.put("Boolean", false);
-        assertEquals(4, mContentValues.size());
-
-        mContentValues.remove("Integer");
-        assertEquals(3, mContentValues.size());
-
-        mContentValues.remove("Double");
-        assertEquals(2, mContentValues.size());
-
-        mContentValues.remove("Boolean");
-        assertEquals(1, mContentValues.size());
-
-        mContentValues.remove("Float");
-        assertEquals(0, mContentValues.size());
-
-        // remove null
-        mContentValues.remove(null);
-    }
-
-    public void testGetAsString() {
-        String expected = "cts";
-        mContentValues.put("String", expected);
-        assertSame(expected, mContentValues.getAsString("String"));
-
-        expected = "android";
-        mContentValues.put("String", expected);
-        assertSame(expected, mContentValues.getAsString("String"));
-
-        // input null as param
-        assertNull(mContentValues.getAsString(null));
-    }
-
-    public void testGetAsByteArray() {
-        byte[] expected = new byte[] {'1', '2', '3', '4'};
-        mContentValues.put("byte[]", expected);
-        assertSame(expected, mContentValues.getAsByteArray("byte[]"));
-
-        // input null as param
-        assertNull(mContentValues.getAsByteArray(null));
-    }
-
-    @SuppressWarnings({ "unchecked" })
-    public void testWriteToParcel() {
-        Parcel p = Parcel.obtain();
-
-        mContentValues.put("Integer", -110);
-        mContentValues.put("String", "cts");
-        mContentValues.put("Boolean", false);
-
-        mContentValues.writeToParcel(p, 0);
-
-        p.setDataPosition(0);
-        HashMap<String, Object> values = p.readHashMap(ClassLoader.getSystemClassLoader());
-        assertNotNull(values);
-        assertEquals(3, values.size());
-
-        assertEquals(-110, values.get("Integer"));
-        assertEquals("cts", values.get("String"));
-        assertEquals(false, values.get("Boolean"));
-    }
-
-    public void testWriteToParcelFailure() {
-        try {
-            mContentValues.writeToParcel(null, -1);
-            fail("There should be a NullPointerException thrown out.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
-    }
-
-    public void testDescribeContents() {
-        assertEquals(0, mContentValues.describeContents());
-    }
-
-    public void testPutAll() {
-        assertEquals(0, mContentValues.size());
-
-        mContentValues.put("Integer", -11);
-        assertEquals(1, mContentValues.size());
-
-        ContentValues cv = new ContentValues();
-        cv.put("String", "cts");
-        cv.put("Boolean", true);
-        assertEquals(2, cv.size());
-
-        mContentValues.putAll(cv);
-        assertEquals(3, mContentValues.size());
-    }
-
-    public void testPutAllFailure() {
-        try {
-            mContentValues.putAll(null);
-            fail("There should be a NullPointerException thrown out.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/SharedPreferencesTest.java b/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/SharedPreferencesTest.java
deleted file mode 100755
index 98f55d5bab459c7d20123d75b22f16ac501576d1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/SharedPreferencesTest.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-
-
-import android.app.QueuedWork;
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.content.SharedPreferences;
-import android.os.StrictMode;
-import android.preference.PreferenceManager;
-import android.test.AndroidTestCase;
-import android.util.Log;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-
-/**
- * Test {@link SharedPreferences}.
- */
-public class SharedPreferencesTest extends AndroidTestCase {
-    private static final String TAG = "SharedPreferencesTest";
-
-    private Context mContext;
-    private ContextWrapper mContextWrapper;
-
-    private File mPrefsFile;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getContext();
-        mContextWrapper = new ContextWrapper(mContext);
-
-        SharedPreferences prefs = getPrefs();
-        prefs.edit().clear().commit();
-
-        // Duplicated from ContextImpl.java.  Not ideal, but there wasn't a better
-        // way to reach into Context{Wrapper,Impl} to ask where this file lives.
-        mPrefsFile = new File("/data/data/com.android.cts.stub/shared_prefs",
-                              "com.android.cts.stub_preferences.xml");
-        mPrefsFile.delete();
-    }
-
-    private SharedPreferences getPrefs() {
-        return PreferenceManager.getDefaultSharedPreferences(mContext);
-    }
-
-    public void testNoFileInitially() {
-        assertFalse(mPrefsFile.exists());
-    }
-
-    public void testCommitCreatesFiles() {
-        SharedPreferences prefs = getPrefs();
-        assertFalse(mPrefsFile.exists());
-        prefs.edit().putString("foo", "bar").commit();
-        assertTrue(mPrefsFile.exists());
-    }
-
-    public void testDefaults() {
-        SharedPreferences prefs = getPrefs();
-        String key = "not-set";
-        assertFalse(prefs.contains(key));
-        assertEquals(0, prefs.getAll().size());
-        assertTrue(prefs.getAll().isEmpty());
-        assertEquals(false, prefs.getBoolean(key, false));
-        assertEquals(true, prefs.getBoolean(key, true));
-        assertEquals(0.5f, prefs.getFloat(key, 0.5f));
-        assertEquals(123, prefs.getInt(key, 123));
-        assertEquals(999L, prefs.getLong(key, 999L));
-        assertEquals("default", prefs.getString(key, "default"));
-    }
-
-    private abstract class RedundantWriteTest {
-        // Do some initial operation on editor.  No commit needed.
-        public abstract void setUp(SharedPreferences.Editor editor);
-
-        // Do some later operation on editor (e.g. a redundant edit).
-        // No commit needed.
-        public abstract void subsequentEdit(SharedPreferences.Editor editor);
-
-        public boolean expectingMutation() {
-            return false;
-        }
-
-        // Tests that a redundant edit after an initital setup doesn't
-        // result in a duplicate write-out to disk.
-        public final void test() throws Exception {
-            SharedPreferences prefs = getPrefs();
-            SharedPreferences.Editor editor;
-
-            assertFalse(mPrefsFile.exists());
-            prefs.edit().commit();
-            assertTrue(mPrefsFile.exists());
-
-            editor = prefs.edit();
-            setUp(editor);
-            editor.commit();
-            long modtimeMillis1 = mPrefsFile.lastModified();
-
-            // Wait a second and modify the preferences in a dummy,
-            // redundant way.  Wish I could inject a clock or disk mock
-            // here, but can't.  Instead relying on checking modtime of
-            // file on disk.
-            Thread.sleep(1000); // ms
-
-            editor = prefs.edit();
-            subsequentEdit(editor);
-            editor.commit();
-
-            long modtimeMillis2 = mPrefsFile.lastModified();
-            assertEquals(expectingMutation(), modtimeMillis1 != modtimeMillis2);
-        }
-    };
-
-    public void testRedundantBoolean() throws Exception {
-        new RedundantWriteTest() {
-            public void setUp(SharedPreferences.Editor editor) {
-                editor.putBoolean("foo", true);
-            }
-            public void subsequentEdit(SharedPreferences.Editor editor) {
-                editor.putBoolean("foo", true);
-            }
-        } .test();
-    }
-
-    public void testRedundantString() throws Exception {
-        new RedundantWriteTest() {
-            public void setUp(SharedPreferences.Editor editor) {
-                editor.putString("foo", "bar");
-            }
-            public void subsequentEdit(SharedPreferences.Editor editor) {
-                editor.putString("foo", "bar");
-            }
-        } .test();
-    }
-
-    public void testNonRedundantString() throws Exception {
-        new RedundantWriteTest() {
-            public void setUp(SharedPreferences.Editor editor) {
-                editor.putString("foo", "bar");
-            }
-            public void subsequentEdit(SharedPreferences.Editor editor) {
-                editor.putString("foo", "baz");
-            }
-            public boolean expectingMutation() {
-                return true;
-            }
-        } .test();
-    }
-
-    public void testRedundantClear() throws Exception {
-        new RedundantWriteTest() {
-            public void setUp(SharedPreferences.Editor editor) {
-                editor.clear();
-            }
-            public void subsequentEdit(SharedPreferences.Editor editor) {
-                editor.clear();
-            }
-        } .test();
-    }
-
-    public void testNonRedundantClear() throws Exception {
-        new RedundantWriteTest() {
-            public void setUp(SharedPreferences.Editor editor) {
-                editor.putString("foo", "bar");
-            }
-            public void subsequentEdit(SharedPreferences.Editor editor) {
-                editor.clear();
-            }
-            public boolean expectingMutation() {
-                return true;
-            }
-        } .test();
-    }
-
-    public void testRedundantRemove() throws Exception {
-        new RedundantWriteTest() {
-            public void setUp(SharedPreferences.Editor editor) {
-                editor.putString("foo", "bar");
-            }
-            public void subsequentEdit(SharedPreferences.Editor editor) {
-                editor.remove("not-exist-key");
-            }
-        } .test();
-    }
-
-    public void testRedundantCommitWritesFileIfNotAlreadyExisting() {
-        SharedPreferences prefs = getPrefs();
-        assertFalse(mPrefsFile.exists());
-        prefs.edit().putString("foo", "bar").commit();
-        assertTrue(mPrefsFile.exists());
-
-        // Delete the file out from under it.  (not sure why this
-        // would happen in practice, but perhaps the app did it for
-        // some reason...)
-        mPrefsFile.delete();
-
-        // And verify that a redundant edit (which would otherwise not
-        // write do disk), still does write to disk if the file isn't
-        // there.
-        prefs.edit().putString("foo", "bar").commit();
-        assertTrue(mPrefsFile.exists());
-    }
-
-    public void testTorture() {
-        Map<String, String> expectedMap = new HashMap<String, String>();
-        Random rand = new Random();
-
-        SharedPreferences prefs = mContext.getSharedPreferences("torture", Context.MODE_PRIVATE);
-        prefs.edit().clear().commit();
-
-        for (int i = 0; i < 100; i++) {
-            prefs = mContext.getSharedPreferences("torture", Context.MODE_PRIVATE);
-            assertEquals(expectedMap, prefs.getAll());
-
-            String key = new Integer(rand.nextInt(25)).toString();
-            String value = new Integer(i).toString();
-            SharedPreferences.Editor editor = prefs.edit();
-
-            if (rand.nextInt(100) < 85) {
-                Log.d(TAG, "Setting " + key + "=" + value);
-                editor.putString(key, value);
-                expectedMap.put(key, value);
-            } else {
-                Log.d(TAG, "Removing " + key);
-                editor.remove(key);
-                expectedMap.remove(key);
-            }
-
-            // Use apply on most, but commit some too.
-            if (rand.nextInt(100) < 85) {
-                Log.d(TAG, "apply.");
-                editor.apply();
-            } else {
-                Log.d(TAG, "commit.");
-                editor.commit();
-            }
-
-            assertEquals(expectedMap, prefs.getAll());
-        }
-    }
-
-    // Checks that an in-memory commit doesn't mutate a data structure
-    // still being used while writing out to disk.
-    public void testTorture2() {
-        Random rand = new Random();
-
-        for (int fi = 0; fi < 100; fi++) {
-            String prefsName = "torture_" + fi;
-            SharedPreferences prefs = mContext.getSharedPreferences(prefsName, Context.MODE_PRIVATE);
-            prefs.edit().clear().commit();
-            Map<String, String> expectedMap = new HashMap<String, String>();
-
-            for (int applies = 0; applies < 3; applies++) {
-                SharedPreferences.Editor editor = prefs.edit();
-                for (int n = 0; n < 1000; n++) {
-                    String key = new Integer(rand.nextInt(25)).toString();
-                    String value = new Integer(n).toString();
-                    editor.putString(key, value);
-                    expectedMap.put(key, value);
-                }
-                editor.apply();
-            }
-            QueuedWork.waitToFinish();
-
-            String clonePrefsName = prefsName + "_clone";
-            File prefsFile = mContext.getSharedPrefsFile(prefsName);
-            File prefsFileClone = mContext.getSharedPrefsFile(clonePrefsName);
-            prefsFileClone.delete();
-            try {
-                FileOutputStream fos = new FileOutputStream(prefsFileClone);
-                FileInputStream fis = new FileInputStream(prefsFile);
-                byte buf[] = new byte[1024];
-                int n;
-                while ((n = fis.read(buf)) > 0) {
-                    fos.write(buf, 0, n);
-                }
-                fis.close();
-                fos.close();
-            } catch (IOException e) {
-            }
-
-            SharedPreferences clonePrefs = mContext.getSharedPreferences(
-                clonePrefsName, Context.MODE_PRIVATE);
-            assertEquals(expectedMap, clonePrefs.getAll());
-
-            prefsFile.delete();
-            prefsFileClone.delete();
-        }
-    }
-
-    public void testModeMultiProcess() {
-        // Pre-load it.
-        mContext.getSharedPreferences("multiprocessTest", 0);
-
-        final StrictMode.ThreadPolicy oldPolicy = StrictMode.getThreadPolicy();
-        try {
-            StrictMode.ThreadPolicy diskReadDeath =
-                    new StrictMode.ThreadPolicy.Builder().detectDiskReads().penaltyDeath().build();
-            StrictMode.setThreadPolicy(diskReadDeath);
-
-            // This shouldn't hit disk.  (it was already pre-loaded above)
-            mContext.getSharedPreferences("multiprocessTest", 0);
-
-            boolean didRead = false;
-            // This SHOULD hit disk.  (multi-process flag is set)
-            try {
-                mContext.getSharedPreferences("multiprocessTest", Context.MODE_MULTI_PROCESS);
-                fail();  // we shouldn't get here.
-            } catch (StrictMode.StrictModeViolation e) {
-                didRead = true;
-            }
-            assertTrue(didRead);
-        } finally {
-            StrictMode.setThreadPolicy(oldPolicy);
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/UriMatcherTest.java b/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/UriMatcherTest.java
deleted file mode 100755
index 61d641cf661f94c9810090ff9694079cab28c6e2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/content/tests/src/mediatek/content/cts/UriMatcherTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import android.content.UriMatcher;
-import android.net.Uri;
-import android.test.AndroidTestCase;
-
-public class UriMatcherTest extends AndroidTestCase {
-    UriMatcher mUriMatcher;
-
-    private static final String sAuthority = "ctstest";
-    private static final String sPath1 = "testPath1";
-    private static final String sPath2 = "testPath2";
-    private static final String sPath3 = "testPath3";
-    private static final String sPath4 = "testPath4";
-
-    private static final int sCode1 = 1;
-    private static final int sCode2 = 2;
-    private static final int sCode3 = 3;
-    private static final int sCode4 = 4;
-
-    private Uri uri1 = Uri.parse("content://" + sAuthority + "/" + sPath1);
-    private Uri uri2 = Uri.parse("content://" + sAuthority + "/" + sPath2);
-    private Uri uri3 = Uri.parse("content://" + sAuthority + "/" + sPath3);
-    private Uri uri4 = Uri.parse("content://" + sAuthority + "/" + sPath4);
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
-    }
-
-    public void testConstructor() {
-        new UriMatcher(UriMatcher.NO_MATCH);
-    }
-
-    public void testMatch() {
-        mUriMatcher.addURI(sAuthority, sPath1, sCode1);
-        mUriMatcher.addURI(sAuthority, sPath2, sCode2);
-        mUriMatcher.addURI(sAuthority, sPath3, sCode3);
-        mUriMatcher.addURI(sAuthority, sPath4, sCode4);
-
-        assertEquals(sCode1, mUriMatcher.match(uri1));
-        assertEquals(sCode2, mUriMatcher.match(uri2));
-        assertEquals(sCode3, mUriMatcher.match(uri3));
-        assertEquals(sCode4, mUriMatcher.match(uri4));
-
-        //test unknown uri
-        Uri unknown = Uri.parse("abc");
-        assertEquals(-1, mUriMatcher.match(unknown));
-    }
-
-    public void testMatchFailure() {
-        try {
-            mUriMatcher.match(null);
-            fail("There should be a NullPointerException thrown out.");
-        } catch (NullPointerException e) {
-            //expected, test success.
-        }
-    }
-
-    public void testAddURI() {
-        assertEquals(-1, mUriMatcher.match(uri1));
-        assertEquals(-1, mUriMatcher.match(uri2));
-        assertEquals(-1, mUriMatcher.match(uri3));
-        assertEquals(-1, mUriMatcher.match(uri4));
-
-        mUriMatcher.addURI(sAuthority, sPath1, sCode1);
-        mUriMatcher.addURI(sAuthority, sPath2, sCode2);
-        mUriMatcher.addURI(sAuthority, sPath3, sCode3);
-        mUriMatcher.addURI(sAuthority, sPath4, sCode4);
-
-        assertEquals(sCode1, mUriMatcher.match(uri1));
-        assertEquals(sCode2, mUriMatcher.match(uri2));
-        assertEquals(sCode3, mUriMatcher.match(uri3));
-        assertEquals(sCode4, mUriMatcher.match(uri4));
-    }
-
-    public void testAddURIFailure() {
-        try {
-            mUriMatcher.addURI(null, null, -1);
-            fail("There should be an IllegalArgumentException thrown out.");
-        } catch (IllegalArgumentException e) {
-            //expected, test success.
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/Android.mk b/proprietary/frameworks/base/tests/database/Android.mk
deleted file mode 100755
index 5bc487775da801d7788b66d2ca9ca9c7fe4d01b4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)\
-              $(call all-java-files-under, core/runner/src)\
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-#LOCAL_JNI_SHARED_LIBRARIES := mtklibcts_jni
-
-# Resource unit tests use a private locale and some densities
-LOCAL_AAPT_FLAGS = -c xx_YY -c cs -c 32dpi -c 240dpi -c 160dpi
-
-LOCAL_PACKAGE_NAME := MediaTekDatabaseaTestStubs
-
-include $(BUILD_PACKAGE)
-
-# Build the test APK using its own makefile, and any other CTS-related packages
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/frameworks/base/tests/database/Android.mk_ b/proprietary/frameworks/base/tests/database/Android.mk_
deleted file mode 100755
index 5bc487775da801d7788b66d2ca9ca9c7fe4d01b4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/Android.mk_
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)\
-              $(call all-java-files-under, core/runner/src)\
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-#LOCAL_JNI_SHARED_LIBRARIES := mtklibcts_jni
-
-# Resource unit tests use a private locale and some densities
-LOCAL_AAPT_FLAGS = -c xx_YY -c cs -c 32dpi -c 240dpi -c 160dpi
-
-LOCAL_PACKAGE_NAME := MediaTekDatabaseaTestStubs
-
-include $(BUILD_PACKAGE)
-
-# Build the test APK using its own makefile, and any other CTS-related packages
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/frameworks/base/tests/database/AndroidManifest.xml b/proprietary/frameworks/base/tests/database/AndroidManifest.xml
deleted file mode 100755
index 2deaf2a259ed004f850df4e82cd61343b3bc8f56..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/AndroidManifest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mediatek.cts.database">
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.mediatek.cts.database"
-                     android:label="CTS tests of android.database"/>
-
-</manifest>
-
diff --git a/proprietary/frameworks/base/tests/database/NOTICE b/proprietary/frameworks/base/tests/database/NOTICE
deleted file mode 100755
index 77b50a488ce97ab1388bd5844afa4e590b0baf18..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/NOTICE
+++ /dev/null
@@ -1,30 +0,0 @@
-* Copyright (C) 2008 The Android Open Source Project:
-
-
-
-* Copyright (C) 2007 The Android Open Source Project:
-
-
-
-* Copyright (C) 2009 The Android Open Source Project:
-
-
-
-/*
-* Copyright (C) 2011-2014 MediaTek Inc.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-:
- 
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/database/README b/proprietary/frameworks/base/tests/database/README
deleted file mode 100755
index 79ef47255011eaabb757258cab0c1cc257f8691b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/README
+++ /dev/null
@@ -1,22 +0,0 @@
-Test cases stubs for android frameworks database module
-
-WHAT IT DOES?
-=============
-MediaTekDatabaseaTestStubs.apk is a test case stubs for database
-test cases.
-
-It provide test stubs for MediaTekDatabaseaTestStubs.apk
-
-The test cases are most come from Android CTS test cases
-
-HOW IT WAS BUILT?
-==================
-make 'vendor/mediatek/proprietary/frameworks/base/tests/database/' folder to get
-test apk.
-
-HOW TO USE IT?
-==============
-After build MediaTekDatabaseaTestStubs.apk, install to phone with
-MediaTekDatabaseaTestStubs.apk, and run command:
-'adb shell am instrument -w com.mediatek.cts.database/android.test.InstrumentationTestRunner'
-to get result.
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/cts/AbstractCursorTest.java b/proprietary/frameworks/base/tests/database/src/android/database/cts/AbstractCursorTest.java
deleted file mode 100755
index 125c4585068ab51087929018320eceda232ed912..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/cts/AbstractCursorTest.java
+++ /dev/null
@@ -1,615 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.cts;
-
-
-import android.content.Context;
-import android.database.AbstractCursor;
-import android.database.CharArrayBuffer;
-import android.database.ContentObserver;
-import android.database.CursorIndexOutOfBoundsException;
-import android.database.CursorWindow;
-import android.database.DataSetObserver;
-import android.database.sqlite.SQLiteDatabase;
-import android.net.Uri;
-import android.os.Bundle;
-import android.test.InstrumentationTestCase;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Random;
-
-/**
- * Test {@link AbstractCursor}.
- */
-public class AbstractCursorTest extends InstrumentationTestCase {
-    private static final int POSITION0 = 0;
-    private static final int POSITION1 = 1;
-    private  static final int ROW_MAX = 10;
-    private static final int DATA_COUNT = 10;
-    private static final String[] COLUMN_NAMES1 = new String[] {
-        "_id",             // 0
-        "number"           // 1
-    };
-    private static final String[] COLUMN_NAMES = new String[] { "name", "number", "profit" };
-    private TestAbstractCursor mTestAbstractCursor;
-    private Object mLockObj = new Object();
-
-    private SQLiteDatabase mDatabase;
-    private File mDatabaseFile;
-    private AbstractCursor mDatabaseCursor;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        setupDatabase();
-        ArrayList<ArrayList> list = createTestList(ROW_MAX, COLUMN_NAMES.length);
-        mTestAbstractCursor = new TestAbstractCursor(COLUMN_NAMES, list);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mDatabaseCursor.close();
-        mTestAbstractCursor.close();
-        mDatabase.close();
-        if (mDatabaseFile.exists()) {
-            mDatabaseFile.delete();
-        }
-        super.tearDown();
-    }
-
-    public void testConstructor() {
-        TestAbstractCursor abstractCursor = new TestAbstractCursor();
-        assertEquals(-1, abstractCursor.getPosition());
-    }
-
-    public void testGetBlob() {
-        try {
-            mTestAbstractCursor.getBlob(0);
-            fail("getBlob should throws a UnsupportedOperationException here");
-        } catch (UnsupportedOperationException e) {
-            // expected
-        }
-    }
-
-    public void testRegisterDataSetObserver() {
-        MockDataSetObserver datasetObserver = new MockDataSetObserver();
-
-        try {
-            mDatabaseCursor.unregisterDataSetObserver(datasetObserver);
-            fail("Can't unregister DataSetObserver before it is registered.");
-        } catch (IllegalStateException e) {
-            // expected
-        }
-
-        mDatabaseCursor.registerDataSetObserver(datasetObserver);
-
-        try {
-            mDatabaseCursor.registerDataSetObserver(datasetObserver);
-            fail("Can't register DataSetObserver twice before unregister it.");
-        } catch (IllegalStateException e) {
-            // expected
-        }
-
-        mDatabaseCursor.unregisterDataSetObserver(datasetObserver);
-        mDatabaseCursor.registerDataSetObserver(datasetObserver);
-    }
-
-    public void testRegisterContentObserver() {
-        MockContentObserver contentObserver = new MockContentObserver();
-
-        try {
-            mDatabaseCursor.unregisterContentObserver(contentObserver);
-            fail("Can't unregister ContentObserver before it is registered.");
-        } catch (IllegalStateException e) {
-            // expected
-        }
-
-        mDatabaseCursor.registerContentObserver(contentObserver);
-
-        try {
-            mDatabaseCursor.registerContentObserver(contentObserver);
-            fail("Can't register DataSetObserver twice before unregister it.");
-        } catch (IllegalStateException e) {
-            // expected
-        }
-
-        mDatabaseCursor.unregisterContentObserver(contentObserver);
-        mDatabaseCursor.registerContentObserver(contentObserver);
-    }
-
-    public void testSetNotificationUri() {
-        String MOCK_URI = "content://abstractrcursortest/testtable";
-        mDatabaseCursor.setNotificationUri(getInstrumentation().getContext().getContentResolver(),
-                Uri.parse(MOCK_URI));
-    }
-
-    public void testRespond() {
-        Bundle b = new Bundle();
-        Bundle bundle = mDatabaseCursor.respond(b);
-        assertSame(Bundle.EMPTY, bundle);
-
-        bundle = mDatabaseCursor.respond(null);
-        assertSame(Bundle.EMPTY, bundle);
-    }
-
-    public void testRequery() {
-        MockDataSetObserver mock = new MockDataSetObserver();
-        mDatabaseCursor.registerDataSetObserver(mock);
-        assertFalse(mock.hadCalledOnChanged());
-        mDatabaseCursor.requery();
-        assertTrue(mock.hadCalledOnChanged());
-    }
-
-    public void testOnChange() throws InterruptedException {
-        MockContentObserver mock = new MockContentObserver();
-        mTestAbstractCursor.registerContentObserver(mock);
-        assertFalse(mock.hadCalledOnChange());
-        mTestAbstractCursor.onChange(true);
-        synchronized (mLockObj) {
-            if (!mock.hadCalledOnChange()) {
-                mLockObj.wait(5000);
-            }
-        }
-        assertTrue(mock.hadCalledOnChange());
-    }
-
-    public void testOnMove() {
-        mTestAbstractCursor.resetOnMoveRet();
-        assertFalse(mTestAbstractCursor.getOnMoveRet());
-        mTestAbstractCursor.moveToFirst();
-        mTestAbstractCursor.moveToPosition(5);
-        assertTrue(mTestAbstractCursor.getOnMoveRet());
-        assertEquals(0, mTestAbstractCursor.getOldPos());
-        assertEquals(5, mTestAbstractCursor.getNewPos());
-    }
-
-    public void testMoveToPrevious() {
-        // Test moveToFirst, isFirst, moveToNext, getPosition
-        assertTrue(mDatabaseCursor.moveToFirst());
-        assertTrue(mDatabaseCursor.isFirst());
-        assertEquals(0, mDatabaseCursor.getPosition());
-        assertTrue(mDatabaseCursor.moveToNext());
-        assertEquals(1, mDatabaseCursor.getPosition());
-        assertFalse(mDatabaseCursor.isFirst());
-        assertTrue(mDatabaseCursor.moveToNext());
-        assertEquals(2, mDatabaseCursor.getPosition());
-
-        // invoke moveToPosition with a number larger than row count.
-        assertFalse(mDatabaseCursor.moveToPosition(30000));
-        assertEquals(mDatabaseCursor.getCount(), mDatabaseCursor.getPosition());
-
-        assertFalse(mDatabaseCursor.moveToPosition(-1));
-        assertEquals(-1, mDatabaseCursor.getPosition());
-        assertTrue(mDatabaseCursor.isBeforeFirst());
-
-        mDatabaseCursor.moveToPosition(5);
-        assertEquals(5, mDatabaseCursor.getPosition());
-
-        // Test moveToPrevious
-        assertTrue(mDatabaseCursor.moveToPrevious());
-        assertEquals(4, mDatabaseCursor.getPosition());
-        assertTrue(mDatabaseCursor.moveToPrevious());
-        assertEquals(3, mDatabaseCursor.getPosition());
-        assertTrue(mDatabaseCursor.moveToPrevious());
-        assertEquals(2, mDatabaseCursor.getPosition());
-
-        // Test moveToLast, isLast, moveToPrevius, isAfterLast.
-        assertFalse(mDatabaseCursor.isLast());
-        assertTrue(mDatabaseCursor.moveToLast());
-        assertTrue(mDatabaseCursor.isLast());
-        assertFalse(mDatabaseCursor.isAfterLast());
-
-        assertFalse(mDatabaseCursor.moveToNext());
-        assertTrue(mDatabaseCursor.isAfterLast());
-        assertFalse(mDatabaseCursor.moveToNext());
-        assertTrue(mDatabaseCursor.isAfterLast());
-        assertFalse(mDatabaseCursor.isLast());
-        assertTrue(mDatabaseCursor.moveToPrevious());
-        assertTrue(mDatabaseCursor.isLast());
-        assertTrue(mDatabaseCursor.moveToPrevious());
-        assertFalse(mDatabaseCursor.isLast());
-
-        // Test move(int).
-        mDatabaseCursor.moveToFirst();
-        assertEquals(0, mDatabaseCursor.getPosition());
-        assertFalse(mDatabaseCursor.move(-1));
-        assertEquals(-1, mDatabaseCursor.getPosition());
-        assertTrue(mDatabaseCursor.move(1));
-        assertEquals(0, mDatabaseCursor.getPosition());
-
-        assertTrue(mDatabaseCursor.move(5));
-        assertEquals(5, mDatabaseCursor.getPosition());
-        assertTrue(mDatabaseCursor.move(-1));
-        assertEquals(4, mDatabaseCursor.getPosition());
-
-        mDatabaseCursor.moveToLast();
-        assertTrue(mDatabaseCursor.isLast());
-        assertFalse(mDatabaseCursor.isAfterLast());
-        assertFalse(mDatabaseCursor.move(1));
-        assertFalse(mDatabaseCursor.isLast());
-        assertTrue(mDatabaseCursor.isAfterLast());
-        assertTrue(mDatabaseCursor.move(-1));
-        assertTrue(mDatabaseCursor.isLast());
-        assertFalse(mDatabaseCursor.isAfterLast());
-    }
-
-    public void testIsClosed() {
-        assertFalse(mDatabaseCursor.isClosed());
-        mDatabaseCursor.close();
-        assertTrue(mDatabaseCursor.isClosed());
-    }
-
-    public void testGetWindow() {
-        CursorWindow window = new CursorWindow(false);
-        assertEquals(0, window.getNumRows());
-        // fill window from position 0
-        mDatabaseCursor.fillWindow(0, window);
-
-        assertNotNull(mDatabaseCursor.getWindow());
-        assertEquals(mDatabaseCursor.getCount(), window.getNumRows());
-
-        while (mDatabaseCursor.moveToNext()) {
-            assertEquals(mDatabaseCursor.getInt(POSITION1),
-                    window.getInt(mDatabaseCursor.getPosition(), POSITION1));
-        }
-        window.clear();
-    }
-
-    public void testGetWantsAllOnMoveCalls() {
-        assertFalse(mDatabaseCursor.getWantsAllOnMoveCalls());
-    }
-
-    public void testIsFieldUpdated() {
-        mTestAbstractCursor.moveToFirst();
-        assertFalse(mTestAbstractCursor.isFieldUpdated(0));
-    }
-
-    public void testGetUpdatedField() {
-        mTestAbstractCursor.moveToFirst();
-        assertNull(mTestAbstractCursor.getUpdatedField(0));
-    }
-
-    public void testGetExtras() {
-        assertSame(Bundle.EMPTY, mDatabaseCursor.getExtras());
-    }
-
-    public void testGetCount() {
-        assertEquals(DATA_COUNT, mDatabaseCursor.getCount());
-    }
-
-    public void testGetColumnNames() {
-        String[] names = mDatabaseCursor.getColumnNames();
-        assertEquals(COLUMN_NAMES1.length, names.length);
-
-        for (int i = 0; i < COLUMN_NAMES1.length; i++) {
-            assertEquals(COLUMN_NAMES1[i], names[i]);
-        }
-    }
-
-    public void testGetColumnName() {
-        assertEquals(COLUMN_NAMES1[0], mDatabaseCursor.getColumnName(0));
-        assertEquals(COLUMN_NAMES1[1], mDatabaseCursor.getColumnName(1));
-    }
-
-    public void testGetColumnIndexOrThrow() {
-        final String COLUMN_FAKE = "fake_name";
-        assertEquals(POSITION0, mDatabaseCursor.getColumnIndex(COLUMN_NAMES1[POSITION0]));
-        assertEquals(POSITION1, mDatabaseCursor.getColumnIndex(COLUMN_NAMES1[POSITION1]));
-        assertEquals(POSITION0, mDatabaseCursor.getColumnIndexOrThrow(COLUMN_NAMES1[POSITION0]));
-        assertEquals(POSITION1, mDatabaseCursor.getColumnIndexOrThrow(COLUMN_NAMES1[POSITION1]));
-
-        try {
-            mDatabaseCursor.getColumnIndexOrThrow(COLUMN_FAKE);
-            fail("IllegalArgumentException expected, but not thrown");
-        } catch (IllegalArgumentException expected) {
-            // expected
-        }
-    }
-
-    public void testGetColumnIndex() {
-        assertEquals(POSITION0, mDatabaseCursor.getColumnIndex(COLUMN_NAMES1[POSITION0]));
-        assertEquals(POSITION1, mDatabaseCursor.getColumnIndex(COLUMN_NAMES1[POSITION1]));
-    }
-
-    public void testGetColumnCount() {
-        assertEquals(COLUMN_NAMES1.length, mDatabaseCursor.getColumnCount());
-    }
-
-    public void testDeactivate() {
-        MockDataSetObserver mock = new MockDataSetObserver();
-        mDatabaseCursor.registerDataSetObserver(mock);
-        assertFalse(mock.hadCalledOnInvalid());
-        mDatabaseCursor.deactivate();
-        assertTrue(mock.hadCalledOnInvalid());
-    }
-
-    public void testCopyStringToBuffer() {
-        CharArrayBuffer ca = new CharArrayBuffer(1000);
-        mTestAbstractCursor.moveToFirst();
-        mTestAbstractCursor.copyStringToBuffer(0, ca);
-        CursorWindow window = new CursorWindow(false);
-        mTestAbstractCursor.fillWindow(0, window);
-
-        StringBuffer sb = new StringBuffer();
-        sb.append(window.getString(0, 0));
-        String str = mTestAbstractCursor.getString(0);
-        assertEquals(str.length(), ca.sizeCopied);
-        assertEquals(sb.toString(), new String(ca.data, 0, ca.sizeCopied));
-    }
-
-    public void testCheckPosition() {
-        // Test with position = -1.
-        try {
-            mTestAbstractCursor.checkPosition();
-            fail("copyStringToBuffer() should throws CursorIndexOutOfBoundsException here.");
-        } catch (CursorIndexOutOfBoundsException e) {
-            // expected
-        }
-
-        // Test with position = count.
-        assertTrue(mTestAbstractCursor.moveToPosition(mTestAbstractCursor.getCount() - 1));
-        mTestAbstractCursor.checkPosition();
-
-        try {
-            assertFalse(mTestAbstractCursor.moveToPosition(mTestAbstractCursor.getCount()));
-            assertEquals(mTestAbstractCursor.getCount(), mTestAbstractCursor.getPosition());
-            mTestAbstractCursor.checkPosition();
-            fail("copyStringToBuffer() should throws CursorIndexOutOfBoundsException here.");
-        } catch (CursorIndexOutOfBoundsException e) {
-            // expected
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private static ArrayList<ArrayList> createTestList(int rows, int cols) {
-        ArrayList<ArrayList> list = new ArrayList<ArrayList>();
-        Random ran = new Random();
-
-        for (int i = 0; i < rows; i++) {
-            ArrayList<Integer> col = new ArrayList<Integer>();
-            list.add(col);
-
-            for (int j = 0; j < cols; j++) {
-                // generate random number
-                Integer r = ran.nextInt();
-                col.add(r);
-            }
-        }
-
-        return list;
-    }
-
-    private void setupDatabase() {
-        File dbDir = getInstrumentation().getTargetContext().getDir("tests",
-                Context.MODE_WORLD_WRITEABLE);
-        mDatabaseFile = new File(dbDir, "database_test.db");
-        if (mDatabaseFile.exists()) {
-            mDatabaseFile.delete();
-        }
-        mDatabase = SQLiteDatabase.openOrCreateDatabase(mDatabaseFile.getPath(), null);
-        assertNotNull(mDatabaseFile);
-        mDatabase.execSQL("CREATE TABLE test1 (_id INTEGER PRIMARY KEY, number TEXT);");
-        generateData();
-        mDatabaseCursor = (AbstractCursor) mDatabase.query("test1", null, null, null, null, null,
-                null);
-    }
-
-    private void generateData() {
-        for (int i = 0; i < DATA_COUNT; i++) {
-            mDatabase.execSQL("INSERT INTO test1 (number) VALUES ('" + i + "');");
-        }
-    }
-
-    private class TestAbstractCursor extends AbstractCursor {
-        private boolean mOnMoveReturnValue;
-        private int mOldPosition;
-        private int mNewPosition;
-        private String[] mColumnNames;
-        private ArrayList<Object>[] mRows;
-        private boolean mHadCalledOnChange = false;
-
-        public TestAbstractCursor() {
-            super();
-        }
-        @SuppressWarnings("unchecked")
-        public TestAbstractCursor(String[] columnNames, ArrayList<ArrayList> rows) {
-            int colCount = columnNames.length;
-            boolean foundID = false;
-            mRowIdColumnIndex = 0;
-
-            // Add an _id column if not in columnNames
-            for (int i = 0; i < colCount; ++i) {
-                if (columnNames[i].compareToIgnoreCase("_id") == 0) {
-                    mColumnNames = columnNames;
-                    foundID = true;
-                    break;
-                }
-            }
-
-            if (!foundID) {
-                mColumnNames = new String[colCount + 1];
-                System.arraycopy(columnNames, 0, mColumnNames, 0, columnNames.length);
-                mColumnNames[colCount] = "_id";
-            }
-
-            int rowCount = rows.size();
-            mRows = new ArrayList[rowCount];
-
-            for (int i = 0; i < rowCount; ++i) {
-                mRows[i] = rows.get(i);
-
-                if (!foundID) {
-                    mRows[i].add(Long.valueOf(i));
-                }
-            }
-        }
-
-        public boolean getOnMoveRet() {
-            return mOnMoveReturnValue;
-        }
-
-        public void resetOnMoveRet() {
-            mOnMoveReturnValue = false;
-        }
-
-        public int getOldPos() {
-            return mOldPosition;
-        }
-
-        public int getNewPos() {
-            return mNewPosition;
-        }
-
-        @Override
-        public boolean onMove(int oldPosition, int newPosition) {
-            mOnMoveReturnValue = super.onMove(oldPosition, newPosition);
-            mOldPosition = oldPosition;
-            mNewPosition = newPosition;
-            return mOnMoveReturnValue;
-        }
-
-        @Override
-        public int getCount() {
-            return mRows.length;
-        }
-
-        @Override
-        public String[] getColumnNames() {
-            return mColumnNames;
-        }
-
-        @Override
-        public String getString(int columnIndex) {
-            Object cell = mRows[mPos].get(columnIndex);
-            return (cell == null) ? null : cell.toString();
-        }
-
-        @Override
-        public short getShort(int columnIndex) {
-            Number num = (Number) mRows[mPos].get(columnIndex);
-            return num.shortValue();
-        }
-
-        @Override
-        public int getInt(int columnIndex) {
-            Number num = (Number) mRows[mPos].get(columnIndex);
-            return num.intValue();
-        }
-
-        @Override
-        public long getLong(int columnIndex) {
-            Number num = (Number) mRows[mPos].get(columnIndex);
-            return num.longValue();
-        }
-
-        @Override
-        public float getFloat(int columnIndex) {
-            Number num = (Number) mRows[mPos].get(columnIndex);
-            return num.floatValue();
-        }
-
-        @Override
-        public double getDouble(int columnIndex) {
-            Number num = (Number) mRows[mPos].get(columnIndex);
-            return num.doubleValue();
-        }
-
-        @Override
-        public boolean isNull(int column) {
-            return false;
-        }
-
-        public boolean hadCalledOnChange() {
-            return mHadCalledOnChange;
-        }
-
-        // the following are protected methods
-        @Override
-        protected void checkPosition() {
-            super.checkPosition();
-        }
-
-        @Override
-        protected Object getUpdatedField(int columnIndex) {
-            return super.getUpdatedField(columnIndex);
-        }
-
-        @Override
-        protected boolean isFieldUpdated(int columnIndex) {
-            return super.isFieldUpdated(columnIndex);
-        }
-
-        @Override
-        protected void onChange(boolean selfChange) {
-            super.onChange(selfChange);
-            mHadCalledOnChange = true;
-        }
-    }
-
-    private class MockContentObserver extends ContentObserver {
-        public boolean mHadCalledOnChange;
-
-        public MockContentObserver() {
-            super(null);
-        }
-
-        @Override
-        public void onChange(boolean selfChange) {
-            super.onChange(selfChange);
-            mHadCalledOnChange = true;
-            synchronized (mLockObj) {
-                mLockObj.notify();
-            }
-        }
-
-        @Override
-        public boolean deliverSelfNotifications() {
-            return true;
-        }
-
-        public boolean hadCalledOnChange() {
-            return mHadCalledOnChange;
-        }
-    }
-
-    private class MockDataSetObserver extends DataSetObserver {
-        private boolean mHadCalledOnChanged;
-        private boolean mHadCalledOnInvalid;
-
-        @Override
-        public void onChanged() {
-            super.onChanged();
-            mHadCalledOnChanged = true;
-        }
-
-        @Override
-        public void onInvalidated() {
-            super.onInvalidated();
-            mHadCalledOnInvalid = true;
-        }
-
-        public boolean hadCalledOnChanged() {
-            return mHadCalledOnChanged;
-        }
-
-        public boolean hadCalledOnInvalid() {
-            return mHadCalledOnInvalid;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/cts/AbstractCursor_SelfContentObserverTest.java b/proprietary/frameworks/base/tests/database/src/android/database/cts/AbstractCursor_SelfContentObserverTest.java
deleted file mode 100755
index b555c4cd2ffe00e736ced6c1f164278685527185..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/cts/AbstractCursor_SelfContentObserverTest.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.database.cts;
-
-import android.database.AbstractCursor;
-import android.test.AndroidTestCase;
-
-public class AbstractCursor_SelfContentObserverTest extends AndroidTestCase {
-
-    public void testConstructor() {
-        MockAbstractCursor mac = new MockAbstractCursor();
-        mac.getMockSelfContentObserver();
-    }
-
-    public void testDeliverSelfNotifications() {
-        MockAbstractCursor mac = new MockAbstractCursor();
-        MockAbstractCursor.MockSelfContentObserver msc = mac.getMockSelfContentObserver();
-        assertFalse(msc.deliverSelfNotifications());
-    }
-
-    public void testOnChange() {
-        MockAbstractCursor mockCursor = new MockAbstractCursor();
-        MockAbstractCursor.MockSelfContentObserver msc = mockCursor.getMockSelfContentObserver();
-        mockCursor.registerContentObserver(msc);
-        // here, the directly call of AbstractCurso#onChange is intended to test
-        // SelfContentObserver#onChange
-        mockCursor.onChange(false);
-        assertTrue(msc.mIsOnChangeCalled);
-        assertFalse(msc.mOnChangeResult);
-
-        msc.mIsOnChangeCalled = false;
-        mockCursor.onChange(true);
-        assertFalse(msc.mIsOnChangeCalled);
-        assertFalse(msc.mOnChangeResult);
-
-        msc.mIsOnChangeCalled = false;
-        msc.setDeliverSelfNotificationsValue(true);
-        mockCursor.onChange(true);
-        assertTrue(msc.mIsOnChangeCalled);
-        assertTrue(msc.mOnChangeResult);
-    }
-
-    class MockAbstractCursor extends AbstractCursor {
-
-        @Override
-        public String[] getColumnNames() {
-            return null;
-        }
-
-        @Override
-        public int getCount() {
-            return 0;
-        }
-
-        @Override
-        public double getDouble(int column) {
-            return 0;
-        }
-
-        @Override
-        public float getFloat(int column) {
-            return 0;
-        }
-
-        @Override
-        public int getInt(int column) {
-            return 0;
-        }
-
-        @Override
-        public long getLong(int column) {
-            return 0;
-        }
-
-        @Override
-        public short getShort(int column) {
-            return 0;
-        }
-
-        @Override
-        public String getString(int column) {
-            return null;
-        }
-
-        @Override
-        public boolean isNull(int column) {
-            return false;
-        }
-
-        public MockSelfContentObserver getMockSelfContentObserver() {
-            return new MockSelfContentObserver(new MockAbstractCursor());
-        }
-
-        @Override
-        public void onChange(boolean selfChange) {
-            super.onChange(selfChange);
-        }
-
-        public class MockSelfContentObserver extends AbstractCursor.SelfContentObserver {
-
-            public MockAbstractCursor mMockAbstractCursor;
-            public boolean mIsOnChangeCalled;
-            public boolean mOnChangeResult;
-            private boolean mIsTrue;
-            public MockSelfContentObserver(AbstractCursor cursor) {
-                super(cursor);
-                mMockAbstractCursor = (MockAbstractCursor) cursor;
-            }
-
-            @Override
-            public void onChange(boolean selfChange) {
-                super.onChange(selfChange);
-                mOnChangeResult = selfChange;
-                mIsOnChangeCalled = true;
-            }
-
-            @Override
-            public boolean deliverSelfNotifications() {
-                if (mIsTrue) {
-                    return true;
-                }
-                return super.deliverSelfNotifications();
-            }
-
-            public void setDeliverSelfNotificationsValue(boolean isTrue) {
-                mIsTrue = isTrue;
-            }
-        }
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/cts/AbstractWindowedCursorTest.java b/proprietary/frameworks/base/tests/database/src/android/database/cts/AbstractWindowedCursorTest.java
deleted file mode 100755
index 40b9ffa4d3729f78bd8a52091e097056097c2b99..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/cts/AbstractWindowedCursorTest.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.cts;
-
-import java.util.Arrays;
-
-import android.database.AbstractWindowedCursor;
-import android.database.CharArrayBuffer;
-import android.database.CursorIndexOutOfBoundsException;
-import android.database.CursorWindow;
-import android.database.StaleDataException;
-import android.test.InstrumentationTestCase;
-
-public class AbstractWindowedCursorTest extends InstrumentationTestCase {
-    private static final String TEST_STRING = "TESTSTRING";
-    private static final int COLUMN_INDEX0 = 0;
-    private static final int COLUMN_INDEX1 = 1;
-    private static final int ROW_INDEX0 = 0;
-    private static final int TEST_COLUMN_COUNT = 7;
-    private MockAbstractWindowedCursor mCursor;
-    private CursorWindow mWindow;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mCursor = new MockAbstractWindowedCursor();
-        mWindow = new CursorWindow(false);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mCursor.close();
-        mWindow.close();
-        super.tearDown();
-    }
-
-    public void testIsNull() {
-        mCursor.setWindow(mWindow);
-
-        assertTrue(mWindow.setNumColumns(TEST_COLUMN_COUNT));
-        mCursor.moveToFirst();
-        assertTrue(mCursor.isNull(COLUMN_INDEX0));
-        assertTrue(mWindow.allocRow());
-
-        String str = "abcdefg";
-        assertTrue(mWindow.putString(str, ROW_INDEX0, COLUMN_INDEX0));
-        assertFalse(mCursor.isNull(COLUMN_INDEX0));
-    }
-
-    public void testIsBlob() {
-        mCursor.setWindow(mWindow);
-        assertTrue(mWindow.setNumColumns(TEST_COLUMN_COUNT));
-        assertTrue(mWindow.allocRow());
-
-        mCursor.moveToFirst();
-        assertFalse(mCursor.isBlob(COLUMN_INDEX0));
-
-        String str = "abcdefg";
-        assertTrue(mWindow.putString(str, ROW_INDEX0, COLUMN_INDEX0));
-        assertTrue(mWindow.putBlob(new byte[10], ROW_INDEX0, COLUMN_INDEX1));
-        assertTrue(mCursor.isBlob(COLUMN_INDEX1));
-    }
-
-    public void testHasWindow() {
-        assertFalse(mCursor.hasWindow());
-        assertNull(mCursor.getWindow());
-
-        mCursor.setWindow(mWindow);
-        assertTrue(mCursor.hasWindow());
-        assertSame(mWindow, mCursor.getWindow());
-
-        mCursor.setWindow(null);
-        assertFalse(mCursor.hasWindow());
-        assertNull(mCursor.getWindow());
-    }
-
-    public void testGetString() {
-        mCursor.setWindow(mWindow);
-        assertTrue(mWindow.setNumColumns(TEST_COLUMN_COUNT));
-        assertTrue(mWindow.allocRow());
-
-        mCursor.moveToFirst();
-        String str = "abcdefg";
-        assertTrue(mWindow.putString(str, ROW_INDEX0, COLUMN_INDEX0));
-        assertEquals(str, mCursor.getString(COLUMN_INDEX0));
-    }
-
-    public void testGetShort() {
-        mCursor.setWindow(mWindow);
-        assertTrue(mWindow.setNumColumns(TEST_COLUMN_COUNT));
-        assertTrue(mWindow.allocRow());
-
-        mCursor.moveToFirst();
-        short shortNumber = 10;
-        assertTrue(mWindow.putLong((long) shortNumber, ROW_INDEX0, COLUMN_INDEX0));
-        assertEquals(shortNumber, mCursor.getShort(COLUMN_INDEX0));
-    }
-
-    public void testGetLong() {
-        mCursor.setWindow(mWindow);
-        assertTrue(mWindow.setNumColumns(TEST_COLUMN_COUNT));
-        assertTrue(mWindow.allocRow());
-
-        mCursor.moveToFirst();
-        long longNumber = 10;
-        assertTrue(mWindow.putLong(longNumber, ROW_INDEX0, COLUMN_INDEX0));
-        assertEquals(longNumber, mCursor.getLong(COLUMN_INDEX0));
-    }
-
-    public void testGetInt() {
-        mCursor.setWindow(mWindow);
-        assertTrue(mWindow.setNumColumns(TEST_COLUMN_COUNT));
-        assertTrue(mWindow.allocRow());
-
-        mCursor.moveToFirst();
-        int intNumber = 10;
-        assertTrue(mWindow.putLong((long) intNumber, ROW_INDEX0, COLUMN_INDEX0));
-        assertEquals(intNumber, mCursor.getInt(COLUMN_INDEX0));
-    }
-
-    public void testGetFloat() {
-        mCursor.setWindow(mWindow);
-        assertTrue(mWindow.setNumColumns(TEST_COLUMN_COUNT));
-        assertTrue(mWindow.allocRow());
-
-        mCursor.moveToFirst();
-        float f1oatNumber = 1.26f;
-        assertTrue(mWindow.putDouble((double) f1oatNumber, ROW_INDEX0, COLUMN_INDEX0));
-        assertEquals(f1oatNumber, mCursor.getFloat(COLUMN_INDEX0));
-    }
-
-    public void testGetDouble() {
-        mCursor.setWindow(mWindow);
-        assertTrue(mWindow.setNumColumns(TEST_COLUMN_COUNT));
-        assertTrue(mWindow.allocRow());
-
-        double db1 = 1.26;
-        assertTrue(mWindow.putDouble(db1, ROW_INDEX0, COLUMN_INDEX0));
-
-        double db2 = mWindow.getDouble(ROW_INDEX0, COLUMN_INDEX0);
-        assertEquals(db1, db2);
-
-        mCursor.moveToFirst();
-        double cd = mCursor.getDouble(COLUMN_INDEX0);
-        assertEquals(db1, cd);
-    }
-
-    public void testGetBlob() {
-        byte TEST_VALUE = 3;
-        byte BLOB_SIZE = 100;
-        assertTrue(mWindow.setNumColumns(TEST_COLUMN_COUNT));
-        assertTrue(mWindow.allocRow());
-        assertTrue(mWindow.putString("", ROW_INDEX0, COLUMN_INDEX0));
-
-        byte[] blob = new byte[BLOB_SIZE];
-        Arrays.fill(blob, TEST_VALUE);
-        assertTrue(mWindow.putBlob(blob, ROW_INDEX0, COLUMN_INDEX1));
-
-        mCursor.setWindow(mWindow);
-        mCursor.moveToFirst();
-
-        byte[] targetBuffer = mCursor.getBlob(COLUMN_INDEX1);
-        assertEquals(BLOB_SIZE, targetBuffer.length);
-        assertTrue(Arrays.equals(blob, targetBuffer));
-    }
-
-    public void testCopyStringToBuffer() {
-        assertTrue(mWindow.setNumColumns(TEST_COLUMN_COUNT));
-        assertTrue(mWindow.allocRow());
-        assertTrue(mWindow.putString(TEST_STRING, ROW_INDEX0, COLUMN_INDEX0));
-        assertTrue(mWindow.putString("", ROW_INDEX0, COLUMN_INDEX1));
-
-        mCursor.setWindow(mWindow);
-        mCursor.moveToFirst();
-
-        CharArrayBuffer charArrayBuffer = new CharArrayBuffer(TEST_STRING.length());
-
-        mCursor.copyStringToBuffer(COLUMN_INDEX0, charArrayBuffer);
-        assertEquals(TEST_STRING.length(), charArrayBuffer.sizeCopied);
-        assertTrue(Arrays.equals(TEST_STRING.toCharArray(), charArrayBuffer.data));
-
-        Arrays.fill(charArrayBuffer.data, '\0');
-        mCursor.copyStringToBuffer(COLUMN_INDEX1, charArrayBuffer);
-        assertEquals(0, charArrayBuffer.sizeCopied);
-    }
-
-    public void testCheckPosition() {
-        try {
-            mCursor.checkPosition();
-            fail("testCheckPosition failed");
-        } catch (CursorIndexOutOfBoundsException e) {
-            // expected
-        }
-
-        try {
-            assertTrue(mCursor.moveToPosition(mCursor.getCount() - 1));
-            mCursor.checkPosition();
-            fail("testCheckPosition failed");
-        } catch (StaleDataException e) {
-            // expected
-        }
-
-        assertTrue(mCursor.moveToPosition(mCursor.getCount() - 1));
-        mCursor.setWindow(mWindow);
-        mCursor.checkPosition();
-    }
-
-    private class MockAbstractWindowedCursor extends AbstractWindowedCursor {
-
-        public MockAbstractWindowedCursor() {
-        }
-
-        @Override
-        public String[] getColumnNames() {
-            return new String[] {
-                    "col1", "col2", "col3"
-            };
-        }
-
-        @Override
-        public int getCount() {
-            return 1;
-        }
-
-        @Override
-        protected void checkPosition() {
-            super.checkPosition();
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/cts/CharArrayBufferTest.java b/proprietary/frameworks/base/tests/database/src/android/database/cts/CharArrayBufferTest.java
deleted file mode 100755
index 63d8cdde53f30f01e03e7522d924ac79d2acf8f5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/cts/CharArrayBufferTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.database.cts;
-
-
-import android.database.CharArrayBuffer;
-import android.test.AndroidTestCase;
-
-public class CharArrayBufferTest extends AndroidTestCase {
-    public void testCharArrayBuffer() {
-        CharArrayBuffer charArrayBuffer;
-
-        charArrayBuffer = new CharArrayBuffer(0);
-        assertEquals(0, charArrayBuffer.data.length);
-        charArrayBuffer.data = new char[100];
-        assertEquals(100, charArrayBuffer.data.length);
-
-        assertEquals(100, (new CharArrayBuffer(100)).data.length);
-
-        assertNull((new CharArrayBuffer(null)).data);
-
-        char[] expectedData = new char[100];
-        assertSame(expectedData, (new CharArrayBuffer(expectedData)).data);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/cts/ContentObservableTest.java b/proprietary/frameworks/base/tests/database/src/android/database/cts/ContentObservableTest.java
deleted file mode 100755
index 13a75a128995e5cbd04b37bfce1d78f9298545a6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/cts/ContentObservableTest.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.cts;
-
-
-import android.database.ContentObservable;
-import android.database.ContentObserver;
-import android.net.Uri;
-import android.test.InstrumentationTestCase;
-
-public class ContentObservableTest extends InstrumentationTestCase {
-    private static final Uri CONTENT_URI = Uri.parse("content://uri");
-
-    ContentObservable mContentObservable;
-    MyContentObserver mObserver;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mContentObservable = new ContentObservable();
-        mObserver = new MyContentObserver();
-    }
-
-    public void testNotifyChange() {
-        mContentObservable.registerObserver(mObserver);
-        mObserver.resetStatus();
-        assertFalse(mObserver.hasChanged());
-        mContentObservable.notifyChange(false);
-        assertTrue(mObserver.hasChanged());
-
-        try {
-            mContentObservable.registerObserver(mObserver);
-            fail("Re-registering observer did not cause exception.");
-        } catch (IllegalStateException expected) {
-            // expected
-        }
-
-        try {
-            mContentObservable.registerObserver(null);
-            fail("Registering null observer did not cause exception.");
-        } catch (IllegalArgumentException expected) {
-            // expected
-        }
-
-        MyContentObserver second = new MyContentObserver();
-        mContentObservable.registerObserver(second);
-
-        mContentObservable.unregisterObserver(mObserver);
-        mObserver.resetStatus();
-        assertFalse(mObserver.hasChanged());
-        mContentObservable.notifyChange(false);
-        assertFalse(mObserver.hasChanged());
-        assertTrue(second.hasChanged());
-    }
-
-    public void testDispatchChange() {
-        mContentObservable.registerObserver(mObserver);
-        mObserver.resetStatus();
-        assertFalse(mObserver.hasChanged());
-        mContentObservable.dispatchChange(false);
-        assertTrue(mObserver.hasChanged());
-        assertNull(mObserver.getUri());
-
-        mObserver.resetStatus();
-        assertFalse(mObserver.hasChanged());
-        mContentObservable.dispatchChange(true);
-        assertFalse(mObserver.hasChanged());
-        mObserver.setDeliverSelfNotifications(true);
-        mContentObservable.dispatchChange(true);
-        assertTrue(mObserver.hasChanged());
-        assertNull(mObserver.getUri());
-
-        mContentObservable.unregisterObserver(mObserver);
-        mObserver.resetStatus();
-        assertFalse(mObserver.hasChanged());
-        mContentObservable.dispatchChange(false);
-        assertFalse(mObserver.hasChanged());
-    }
-
-    public void testDispatchChangeWithUri() {
-        mContentObservable.registerObserver(mObserver);
-        mObserver.resetStatus();
-        assertFalse(mObserver.hasChanged());
-        mContentObservable.dispatchChange(false, CONTENT_URI);
-        assertTrue(mObserver.hasChanged());
-        assertEquals(CONTENT_URI, mObserver.getUri());
-
-        mObserver.resetStatus();
-        assertFalse(mObserver.hasChanged());
-        mContentObservable.dispatchChange(true, CONTENT_URI);
-        assertFalse(mObserver.hasChanged());
-        mObserver.setDeliverSelfNotifications(true);
-        mContentObservable.dispatchChange(true, CONTENT_URI);
-        assertTrue(mObserver.hasChanged());
-        assertEquals(CONTENT_URI, mObserver.getUri());
-
-        mContentObservable.unregisterObserver(mObserver);
-        mObserver.resetStatus();
-        assertFalse(mObserver.hasChanged());
-        mContentObservable.dispatchChange(false, CONTENT_URI);
-        assertFalse(mObserver.hasChanged());
-    }
-
-    private static class MyContentObserver extends ContentObserver {
-        private boolean mHasChanged = false;
-        private boolean mDeliverSelfNotifications = false;
-        private Uri mUri;
-
-        public MyContentObserver() {
-            super(null);
-        }
-
-        @Override
-        public void onChange(boolean selfChange, Uri uri) {
-            super.onChange(selfChange, uri);
-            mHasChanged = true;
-            mUri = uri;
-        }
-
-        public boolean deliverSelfNotifications() {
-            return mDeliverSelfNotifications ;
-        }
-
-        protected boolean hasChanged() {
-            return mHasChanged;
-        }
-
-        protected void resetStatus() {
-            mHasChanged = false;
-            mUri = null;
-        }
-
-        protected void setDeliverSelfNotifications(boolean b) {
-            mDeliverSelfNotifications = b;
-        }
-
-        protected Uri getUri() {
-            return mUri;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/cts/ContentObserverTest.java b/proprietary/frameworks/base/tests/database/src/android/database/cts/ContentObserverTest.java
deleted file mode 100755
index eca3475b4e861e154b4eeaafc252e908470b8c9c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/cts/ContentObserverTest.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.cts;
-
-
-import android.database.ContentObserver;
-import android.net.Uri;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Looper;
-import android.test.InstrumentationTestCase;
-
-public class ContentObserverTest extends InstrumentationTestCase {
-    private static final Uri CONTENT_URI = Uri.parse("content://uri");
-
-    public void testContentObserver() throws InterruptedException {
-        // Test constructor with null handler, dispatchChange will directly invoke onChange.
-        MyContentObserver contentObserver;
-        contentObserver = new MyContentObserver(null);
-        assertFalse(contentObserver.hasChanged());
-        assertFalse(contentObserver.getSelfChangeState());
-        contentObserver.dispatchChange(true);
-        assertTrue(contentObserver.hasChanged());
-        assertTrue(contentObserver.getSelfChangeState());
-
-        contentObserver.resetStatus();
-        contentObserver.setSelfChangeState(true);
-        assertFalse(contentObserver.hasChanged());
-        assertTrue(contentObserver.getSelfChangeState());
-        contentObserver.dispatchChange(false);
-        assertTrue(contentObserver.hasChanged());
-        assertFalse(contentObserver.getSelfChangeState());
-
-        HandlerThread ht = new HandlerThread(getClass().getName());
-        ht.start();
-        Looper looper = ht.getLooper();
-        Handler handler = new Handler(looper);
-        final long timeout = 1000L;
-
-        contentObserver = new MyContentObserver(handler);
-        assertFalse(contentObserver.hasChanged());
-        assertFalse(contentObserver.getSelfChangeState());
-        contentObserver.dispatchChange(true);
-        assertTrue(contentObserver.hasChanged(timeout));
-        assertTrue(contentObserver.getSelfChangeState());
-
-        contentObserver.resetStatus();
-        contentObserver.setSelfChangeState(true);
-        assertFalse(contentObserver.hasChanged());
-        assertTrue(contentObserver.getSelfChangeState());
-        contentObserver.dispatchChange(false);
-        assertTrue(contentObserver.hasChanged(timeout));
-        assertFalse(contentObserver.getSelfChangeState());
-
-        looper.quit();
-    }
-
-    public void testContentObserverWithUri() throws InterruptedException {
-        // Test constructor with null handler, dispatchChange will directly invoke onChange.
-        MyContentObserverWithUri contentObserver;
-        contentObserver = new MyContentObserverWithUri(null);
-        assertFalse(contentObserver.hasChanged());
-        assertFalse(contentObserver.getSelfChangeState());
-        contentObserver.dispatchChange(true, CONTENT_URI);
-        assertTrue(contentObserver.hasChanged());
-        assertTrue(contentObserver.getSelfChangeState());
-        assertEquals(CONTENT_URI, contentObserver.getUri());
-
-        contentObserver.resetStatus();
-        contentObserver.setSelfChangeState(true);
-        assertFalse(contentObserver.hasChanged());
-        assertTrue(contentObserver.getSelfChangeState());
-        contentObserver.dispatchChange(false, CONTENT_URI);
-        assertTrue(contentObserver.hasChanged());
-        assertFalse(contentObserver.getSelfChangeState());
-        assertEquals(CONTENT_URI, contentObserver.getUri());
-
-        HandlerThread ht = new HandlerThread(getClass().getName());
-        ht.start();
-        Looper looper = ht.getLooper();
-        Handler handler = new Handler(looper);
-        final long timeout = 1000L;
-
-        contentObserver = new MyContentObserverWithUri(handler);
-        assertFalse(contentObserver.hasChanged());
-        assertFalse(contentObserver.getSelfChangeState());
-        contentObserver.dispatchChange(true, CONTENT_URI);
-        assertTrue(contentObserver.hasChanged(timeout));
-        assertTrue(contentObserver.getSelfChangeState());
-        assertEquals(CONTENT_URI, contentObserver.getUri());
-
-        contentObserver.resetStatus();
-        contentObserver.setSelfChangeState(true);
-        assertFalse(contentObserver.hasChanged());
-        assertTrue(contentObserver.getSelfChangeState());
-        contentObserver.dispatchChange(false, CONTENT_URI);
-        assertTrue(contentObserver.hasChanged(timeout));
-        assertFalse(contentObserver.getSelfChangeState());
-        assertEquals(CONTENT_URI, contentObserver.getUri());
-
-        looper.quit();
-    }
-
-    public void testDeliverSelfNotifications() {
-        MyContentObserver contentObserver = new MyContentObserver(null);
-        assertFalse(contentObserver.deliverSelfNotifications());
-    }
-
-    private static class MyContentObserver extends ContentObserver {
-        private boolean mHasChanged;
-        private boolean mSelfChange;
-
-        public MyContentObserver(Handler handler) {
-            super(handler);
-        }
-
-        @Override
-        public void onChange(boolean selfChange) {
-            super.onChange(selfChange);
-            synchronized (this) {
-                mHasChanged = true;
-                mSelfChange = selfChange;
-                notifyAll();
-            }
-        }
-
-        protected synchronized boolean hasChanged(long timeout) throws InterruptedException {
-            if (!mHasChanged) {
-                wait(timeout);
-            }
-            return mHasChanged;
-        }
-
-        protected boolean hasChanged() {
-            return mHasChanged;
-        }
-
-        protected void resetStatus() {
-            mHasChanged = false;
-            mSelfChange = false;
-        }
-
-        protected boolean getSelfChangeState() {
-            return mSelfChange;
-        }
-
-        protected void setSelfChangeState(boolean state) {
-            mSelfChange = state;
-        }
-    }
-
-    private static class MyContentObserverWithUri extends ContentObserver {
-        private boolean mHasChanged;
-        private boolean mSelfChange;
-        private Uri mUri;
-
-        public MyContentObserverWithUri(Handler handler) {
-            super(handler);
-        }
-
-        @Override
-        public void onChange(boolean selfChange, Uri uri) {
-            super.onChange(selfChange, uri);
-            synchronized (this) {
-                mHasChanged = true;
-                mSelfChange = selfChange;
-                mUri = uri;
-                notifyAll();
-            }
-        }
-
-        protected synchronized boolean hasChanged(long timeout) throws InterruptedException {
-            if (!mHasChanged) {
-                wait(timeout);
-            }
-            return mHasChanged;
-        }
-
-        protected boolean hasChanged() {
-            return mHasChanged;
-        }
-
-        protected void resetStatus() {
-            mHasChanged = false;
-            mSelfChange = false;
-            mUri = null;
-        }
-
-        protected boolean getSelfChangeState() {
-            return mSelfChange;
-        }
-
-        protected void setSelfChangeState(boolean state) {
-            mSelfChange = state;
-        }
-
-        protected Uri getUri() {
-            return mUri;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/cts/CursorIndexOutOfBoundsExceptionTest.java b/proprietary/frameworks/base/tests/database/src/android/database/cts/CursorIndexOutOfBoundsExceptionTest.java
deleted file mode 100755
index f84d967b28cb5459b16468f4d2384323dbfdcc71..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/cts/CursorIndexOutOfBoundsExceptionTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.cts;
-
-import android.database.CursorIndexOutOfBoundsException;
-import android.test.AndroidTestCase;
-
-public class CursorIndexOutOfBoundsExceptionTest extends AndroidTestCase {
-
-    public void testConstructors() {
-        int INDEX = 100;
-        int SIZE = 99;
-        String expected1 = "Expected exception message";
-        String expected2 = "Index " + INDEX + " requested, with a size of " + SIZE;
-        // Test CursorIndexOutOfBoundsException(String)
-        try {
-            throw new CursorIndexOutOfBoundsException(null);
-        } catch (CursorIndexOutOfBoundsException e) {
-            assertNull(e.getMessage());
-        }
-
-        try {
-            throw new CursorIndexOutOfBoundsException(expected1);
-        } catch (CursorIndexOutOfBoundsException e) {
-            assertEquals(expected1, e.getMessage());
-        }
-
-        // Test CursorIndexOutOfBoundsException(int, int)
-        try {
-            throw new CursorIndexOutOfBoundsException(INDEX, SIZE);
-        } catch (CursorIndexOutOfBoundsException e) {
-            assertEquals(expected2, e.getMessage());
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/cts/CursorJoinerTest.java b/proprietary/frameworks/base/tests/database/src/android/database/cts/CursorJoinerTest.java
deleted file mode 100755
index 48315882256e64c10102873b42c65a167a45bff7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/cts/CursorJoinerTest.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.cts;
-
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.CursorJoiner;
-import android.database.CursorJoiner.Result;
-import android.database.sqlite.SQLiteDatabase;
-import android.test.AndroidTestCase;
-
-import java.io.File;
-
-public class CursorJoinerTest extends AndroidTestCase {
-
-    private static final int TEST_ITEM_COUNT = 10;
-    private static final int DEFAULT_TABLE1_VALUE_BEGINS = 1;
-    private static final int DEFAULT_TABLE2_VALUE_BEGINS = 11;
-    private static final int EQUAL_START = 18;
-    // Every table has 7 unique numbers, and 3 other numbers they all have.
-    private static final int UNIQUE_COUNT = 7;
-    private static final int MAX_VALUE = 20;
-    private static final int EQUAL_VALUE_COUNT = MAX_VALUE - EQUAL_START + 1;
-    private static final String TABLE_NAME_1 = "test1";
-    private static final String TABLE_NAME_2 = "test2";
-    private static final String TABLE1_COLUMNS = " number TEXT";
-    private static final String TABLE2_COLUMNS = " number TEXT, int_number INTEGER";
-
-    private SQLiteDatabase mDatabase;
-    private File mDatabaseFile;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        setupDatabase();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mDatabase.close();
-        mDatabaseFile.delete();
-        super.tearDown();
-    }
-
-    public void testCursorJoinerAndIterator() {
-        Cursor cursor1 = getCursor(TABLE_NAME_1, null, null);
-        Cursor cursor2 = getCursor(TABLE_NAME_2, null, null);
-        // Test with different length ColumenNAmes
-        try {
-            new CursorJoiner(cursor1, cursor1.getColumnNames(), cursor2, cursor2.getColumnNames());
-            fail("CursorJoiner's constructor should throws  IllegalArgumentException here.");
-        } catch (IllegalArgumentException e) {
-            //expected
-        }
-        closeCursor(cursor1);
-        closeCursor(cursor2);
-
-        String[] columnNames = new String[] { "number" };
-        cursor1 = getCursor(TABLE_NAME_1, null, columnNames);
-        cursor2 = getCursor(TABLE_NAME_2, null, columnNames);
-
-        CursorJoiner cursorJoiner = new CursorJoiner(cursor1, cursor1.getColumnNames(), cursor2,
-                cursor2.getColumnNames());
-
-        // Test remove()
-        try {
-            cursorJoiner.remove();
-            fail("remove() should throws UnsupportedOperationException here");
-        } catch (UnsupportedOperationException e) {
-            // expected
-        }
-
-        assertEquals(TEST_ITEM_COUNT, cursor1.getCount());
-        assertEquals(TEST_ITEM_COUNT, cursor2.getCount());
-
-        // Test iterator
-        for (CursorJoiner.Result joinResult : cursorJoiner) {
-            switch (joinResult) {
-            case LEFT:
-                // Add the values into table test1 which table test1 possess and table test2 don't.
-                assertTrue(cursor1.getString(0).compareTo(cursor2.getString(0)) < 0);
-                addValueIntoTable(TABLE_NAME_2, cursor1.getString(0));
-                break;
-            case RIGHT:
-                // Add the values into table test2 which table test2 possess and table test1 don't.
-                assertTrue(cursor1.getString(0).compareTo(cursor2.getString(0)) > 0);
-                addValueIntoTable(TABLE_NAME_1, cursor2.getString(0));
-                break;
-            case BOTH:
-                // Delete the values table test1 and test2 both possess.
-                assertEquals(cursor1.getString(0), cursor2.getString(0));
-                deleteValueFromTable(TABLE_NAME_1, cursor1.getString(0));
-                deleteValueFromTable(TABLE_NAME_2, cursor2.getString(0));
-                break;
-            }
-        }
-        cursor1.requery();
-        cursor2.requery();
-
-        // Finally, two tables's number columns have the same contents
-        assertEquals(UNIQUE_COUNT * 2, cursor1.getCount());
-        assertEquals(UNIQUE_COUNT * 2, cursor2.getCount());
-
-        // For every  table, merged with the other one's unique numbers, and deleted the originally
-        // mutual same numbers(EQUAL_START~MAX_VALUE);
-        cursor1.moveToFirst();
-        cursor2.moveToFirst();
-        for (int i = 0; i < UNIQUE_COUNT; i++) {
-            assertEquals(getOrderNumberString(DEFAULT_TABLE1_VALUE_BEGINS + i, MAX_VALUE),
-                    cursor1.getString(0));
-            assertEquals(cursor1.getString(0), cursor2.getString(0));
-            cursor1.moveToNext();
-            cursor2.moveToNext();
-        }
-        closeCursor(cursor2);
-        closeCursor(cursor1);
-    }
-
-    public void testNext() {
-        String[] columnNames = new String[] { "number" };
-        Cursor cursor1 = getCursor(TABLE_NAME_1, null, columnNames);
-        Cursor cursor2 = getCursor(TABLE_NAME_2, null, columnNames);
-
-        // For cursor1 , values are '01'~'07' and 'EQUAL_START'~'MAX_VALUE'
-        assertEquals(TEST_ITEM_COUNT, cursor1.getCount());
-        // For cursor2 , values are '11'~'17' and 'EQUAL_START'~'MAX_VALUE'
-        assertEquals(TEST_ITEM_COUNT, cursor2.getCount());
-        CursorJoiner cursorJoiner = new CursorJoiner(cursor1, cursor1.getColumnNames(), cursor2,
-                cursor2.getColumnNames());
-        for (int i = 0; i < UNIQUE_COUNT; i++) {
-            // For cursor1, value 1~7 result value as LEFT to cursor2 value '11'
-            assertTrue(cursorJoiner.hasNext());
-            assertEquals(Result.LEFT, cursorJoiner.next());
-            assertEquals(getOrderNumberString(DEFAULT_TABLE1_VALUE_BEGINS + i, MAX_VALUE), cursor1
-                    .getString(0));
-            assertEquals(getOrderNumberString(DEFAULT_TABLE2_VALUE_BEGINS, MAX_VALUE), cursor2
-                  .getString(0));
-        }
-        for (int i = 0; i < UNIQUE_COUNT; i++) {
-            // For cursor2, value 11~17 result a value as LEFT to cursor1 value '18'
-            assertTrue(cursorJoiner.hasNext());
-            assertEquals(Result.RIGHT, cursorJoiner.next());
-            assertEquals(getOrderNumberString(EQUAL_START, MAX_VALUE), cursor1.getString(0));
-            assertEquals(getOrderNumberString(DEFAULT_TABLE2_VALUE_BEGINS + i, MAX_VALUE), cursor2
-                    .getString(0));
-        }
-        for (int i = 0; i < EQUAL_VALUE_COUNT; i++) {
-            // For cursor1 and cursor2, value 18~20 result a value as BOTH
-            assertTrue(cursorJoiner.hasNext());
-            assertEquals(Result.BOTH, cursorJoiner.next());
-            assertEquals(getOrderNumberString(EQUAL_START + i, MAX_VALUE), cursor1.getString(0));
-            assertEquals(getOrderNumberString(EQUAL_START + i, MAX_VALUE), cursor2.getString(0));
-        }
-        closeCursor(cursor1);
-        closeCursor(cursor2);
-    }
-
-    /**
-     * This function accepts integer maxValue to determine max length of number.
-     * Return a converted decimal number string of input integer parameter 'value',
-     *  according to  the max length, '0' will be placeholder(s).
-     * For example: if max length is 2, 1 -> '01', 10 -> '10'.
-     * @param value
-     * @param maxValue
-     * @return
-     */
-    private String getOrderNumberString(int value, int maxValue) {
-        // Convert decimal number as string, '0' as placeholder
-        int maxLength = Integer.toString(maxValue).length();
-        int basicLength = Integer.toString(value).length();
-        String placeHolders = "";
-        for (int i = 0; i < (maxLength - basicLength); i++) {
-            placeHolders += "0";
-        }
-        return placeHolders + Integer.toString(value);
-    }
-
-    private void initializeTables() {
-        // Add 1 to 7 into Table1
-        addValuesIntoTable(TABLE_NAME_1, DEFAULT_TABLE1_VALUE_BEGINS,
-                DEFAULT_TABLE1_VALUE_BEGINS + UNIQUE_COUNT - 1);
-        // Add 18 to 20 into Table1
-        addValuesIntoTable(TABLE_NAME_1, DEFAULT_TABLE2_VALUE_BEGINS + UNIQUE_COUNT, MAX_VALUE);
-        // Add 11 to 17 into Table2
-        addValuesIntoTable(TABLE_NAME_2, DEFAULT_TABLE2_VALUE_BEGINS,
-                DEFAULT_TABLE2_VALUE_BEGINS + UNIQUE_COUNT - 1);
-        // Add 18 to 20 into Table2
-        addValuesIntoTable(TABLE_NAME_2, DEFAULT_TABLE2_VALUE_BEGINS + UNIQUE_COUNT, MAX_VALUE);
-    }
-
-    private void setupDatabase() {
-        File dbDir = getContext().getDir("tests", Context.MODE_PRIVATE);
-        mDatabaseFile = new File(dbDir, "database_test.db");
-        if (mDatabaseFile.exists()) {
-            mDatabaseFile.delete();
-        }
-        mDatabase = SQLiteDatabase.openOrCreateDatabase(mDatabaseFile.getPath(), null);
-        assertNotNull(mDatabaseFile);
-        createTable(TABLE_NAME_1, TABLE1_COLUMNS);
-        createTable(TABLE_NAME_2, TABLE2_COLUMNS);
-        initializeTables();
-    }
-
-    private void closeCursor(Cursor cursor) {
-        if (null != cursor) {
-            cursor.close();
-            cursor = null;
-        }
-    }
-
-    private void createTable(String tableName, String columnNames) {
-        String sql = "Create TABLE " + tableName + " (_id INTEGER PRIMARY KEY, " + columnNames
-                + " );";
-        mDatabase.execSQL(sql);
-    }
-
-    private void addValuesIntoTable(String tableName, int start, int end) {
-        for (int i = start; i <= end; i++) {
-            mDatabase.execSQL("INSERT INTO " + tableName + "(number) VALUES ('"
-                    + getOrderNumberString(i, MAX_VALUE) + "');");
-        }
-    }
-
-    private void addValueIntoTable(String tableName, String value) {
-        mDatabase.execSQL("INSERT INTO " + tableName + "(number) VALUES ('" + value + "');");
-    }
-
-    private void deleteValueFromTable(String tableName, String value) {
-        mDatabase.execSQL("DELETE FROM " + tableName + " WHERE number = '" + value + "';");
-    }
-
-    private Cursor getCursor(String tableName, String selection, String[] columnNames) {
-        return mDatabase.query(tableName, columnNames, selection, null, null, null, "number");
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/cts/CursorWindowTest.java b/proprietary/frameworks/base/tests/database/src/android/database/cts/CursorWindowTest.java
deleted file mode 100755
index 65ce3fd950a7f51e3f753ebd11aae1bcc4a99017..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/cts/CursorWindowTest.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.cts;
-
-import android.database.CharArrayBuffer;
-import android.database.CursorWindow;
-import android.database.MatrixCursor;
-import android.database.sqlite.SQLiteException;
-import android.os.Parcel;
-import android.test.AndroidTestCase;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Random;
-
-public class CursorWindowTest extends AndroidTestCase {
-
-    private static final String TEST_STRING = "Test String";
-
-    public void testWriteCursorToWindow() throws Exception {
-        // create cursor
-        String[] colNames = new String[]{"_id", "name", "number", "profit"};
-        int colsize = colNames.length;
-        ArrayList<ArrayList<Integer>> list = createTestList(10, colsize);
-        MatrixCursor cursor = new MatrixCursor(colNames, list.size());
-        for (ArrayList<Integer> row : list) {
-            cursor.addRow(row);
-        }
-
-        // fill window
-        CursorWindow window = new CursorWindow(false);
-        cursor.fillWindow(0, window);
-
-        // read from cursor window
-        for (int i = 0; i < list.size(); i++) {
-            ArrayList<Integer> col = list.get(i);
-            for (int j = 0; j < colsize; j++) {
-                String s = window.getString(i, j);
-                int r2 = col.get(j);
-                int r1 = Integer.parseInt(s);
-                assertEquals(r2, r1);
-            }
-        }
-
-        // test cursor window handle startpos != 0
-        window.clear();
-        cursor.fillWindow(1, window);
-        // read from cursor from window
-        for (int i = 1; i < list.size(); i++) {
-            ArrayList<Integer> col = list.get(i);
-            for (int j = 0; j < colsize; j++) {
-                String s = window.getString(i, j);
-                int r2 = col.get(j);
-                int r1 = Integer.parseInt(s);
-                assertEquals(r2, r1);
-            }
-        }
-
-        // Clear the window and make sure it's empty
-        window.clear();
-        assertEquals(0, window.getNumRows());
-    }
-
-    public void testNull() {
-        CursorWindow window = getOneByOneWindow();
-
-        // Put in a null value and read it back as various types
-        assertTrue(window.putNull(0, 0));
-        assertNull(window.getString(0, 0));
-        assertEquals(0, window.getLong(0, 0));
-        assertEquals(0.0, window.getDouble(0, 0));
-        assertNull(window.getBlob(0, 0));
-    }
-
-    public void testEmptyString() {
-        CursorWindow window = getOneByOneWindow();
-
-        // put size 0 string and read it back as various types
-        assertTrue(window.putString("", 0, 0));
-        assertEquals("", window.getString(0, 0));
-        assertEquals(0, window.getLong(0, 0));
-        assertEquals(0.0, window.getDouble(0, 0));
-    }
-
-    public void testConstructors() {
-        int TEST_NUMBER = 5;
-        CursorWindow cursorWindow;
-
-        // Test constructor with 'true' input, and getStartPosition should return 0
-        cursorWindow = new CursorWindow(true);
-        assertEquals(0, cursorWindow.getStartPosition());
-
-        // Test constructor with 'false' input
-        cursorWindow = new CursorWindow(false);
-        assertEquals(0, cursorWindow.getStartPosition());
-
-        // Test newFromParcel
-        Parcel parcel = Parcel.obtain();
-        cursorWindow = new CursorWindow(true);
-        cursorWindow.setStartPosition(TEST_NUMBER);
-        cursorWindow.setNumColumns(1);
-        cursorWindow.allocRow();
-        cursorWindow.putString(TEST_STRING, TEST_NUMBER, 0);
-        cursorWindow.writeToParcel(parcel, 0);
-
-        parcel.setDataPosition(0);
-        cursorWindow = CursorWindow.CREATOR.createFromParcel(parcel);
-        assertEquals(TEST_NUMBER, cursorWindow.getStartPosition());
-        assertEquals(TEST_STRING, cursorWindow.getString(TEST_NUMBER, 0));
-    }
-
-    public void testDataStructureOperations() {
-        CursorWindow cursorWindow = new CursorWindow(true);
-
-        // Test with normal values
-        assertTrue(cursorWindow.setNumColumns(0));
-        // If the column has been set to zero, can't put String.
-        assertFalse(cursorWindow.putString(TEST_STRING, 0, 0));
-
-        // Test allocRow().
-        assertTrue(cursorWindow.allocRow());
-        assertEquals(1, cursorWindow.getNumRows());
-        assertTrue(cursorWindow.allocRow());
-        assertEquals(2, cursorWindow.getNumRows());
-        // Though allocate a row, but the column number is still 0, so can't putString.
-        assertFalse(cursorWindow.putString(TEST_STRING, 0, 0));
-
-        // Test freeLstRow
-        cursorWindow.freeLastRow();
-        assertEquals(1, cursorWindow.getNumRows());
-        cursorWindow.freeLastRow();
-        assertEquals(0, cursorWindow.getNumRows());
-
-        cursorWindow = new CursorWindow(true);
-        assertTrue(cursorWindow.setNumColumns(6));
-        assertTrue(cursorWindow.allocRow());
-        // Column number set to negative number, so now can put values.
-        assertTrue(cursorWindow.putString(TEST_STRING, 0, 0));
-        assertEquals(TEST_STRING, cursorWindow.getString(0, 0));
-
-        // Test with negative value
-        assertFalse(cursorWindow.setNumColumns(-1));
-
-        // Test with reference limitation
-        cursorWindow.releaseReference();
-        try {
-            cursorWindow.setNumColumns(5);
-            fail("setNumColumns() should throws IllegalStateException here.");
-        } catch (IllegalStateException e) {
-            // expected
-        }
-
-        // Test close(), close will also minus references, that will lead acquireReference()
-        // related operation failed.
-        cursorWindow.close();
-        try {
-            cursorWindow.acquireReference();
-            fail("setNumColumns() should throws IllegalStateException here.");
-        } catch (IllegalStateException e) {
-            // expected
-        }
-    }
-
-    public void testAccessDataValues() {
-        final long NUMBER_LONG_INTEGER = (long) 0xaabbccddffL;
-        final long NUMBER_INTEGER = (int) NUMBER_LONG_INTEGER;
-        final long NUMBER_SHORT = (short) NUMBER_INTEGER;
-        final float NUMBER_FLOAT_SCIENCE = 7.332952E11f;
-        final double NUMBER_DOUBLE_SCIENCE = 7.33295205887E11;
-        final String NUMBER_FLOAT_SCIENCE_STRING = "7.332952E11";
-        final String NUMBER_DOUBLE_SCIENCE_STRING = "7.33295205887E11";
-        final String NUMBER_FLOAT_SCIENCE_STRING2 = "7.33295e+11";
-
-        byte[] originalBlob = new byte[Byte.MAX_VALUE];
-        for (int i = 0; i < Byte.MAX_VALUE; i++) {
-            originalBlob[i] = (byte) i;
-        }
-
-        CursorWindow cursorWindow = new CursorWindow(true);
-        cursorWindow.setNumColumns(5);
-        cursorWindow.allocRow();
-
-        // Test putString, getString, getLong, getInt, isBlob
-        assertTrue(cursorWindow.putString(Long.toString(NUMBER_LONG_INTEGER), 0, 0));
-        assertEquals(Long.toString(NUMBER_LONG_INTEGER), cursorWindow.getString(0, 0));
-        assertEquals(NUMBER_LONG_INTEGER, cursorWindow.getLong(0, 0));
-        assertEquals(NUMBER_INTEGER, cursorWindow.getInt(0, 0));
-        assertEquals(NUMBER_SHORT, cursorWindow.getShort(0, 0));
-        // Converting of Float, there would be some little precision differences. So just compare
-        // first 6 digits.
-        assertEquals(NUMBER_FLOAT_SCIENCE_STRING.substring(0, 6), Float.toString(
-                cursorWindow.getFloat(0, 0)).substring(0, 6));
-        assertEquals(NUMBER_DOUBLE_SCIENCE_STRING, Double.toString(cursorWindow.getDouble(0, 0)));
-        assertFalse(cursorWindow.isNull(0, 0));
-        assertFalse(cursorWindow.isBlob(0, 0));
-
-        // Test null String
-        assertTrue(cursorWindow.putString("", 0, 0));
-        assertEquals("", cursorWindow.getString(0, 0));
-        assertEquals(0, cursorWindow.getLong(0, 0));
-        assertEquals(0, cursorWindow.getInt(0, 0));
-        assertEquals(0, cursorWindow.getShort(0, 0));
-        assertEquals(0.0, cursorWindow.getDouble(0, 0));
-        assertEquals(0.0f, cursorWindow.getFloat(0, 0), 0.00000001f);
-        assertFalse(cursorWindow.isNull(0, 0));
-        assertFalse(cursorWindow.isBlob(0, 0));
-
-        // Test putNull, getString, getLong, getDouble, getBlob, getInd, getShort, getFloat,
-        // isBlob.
-        assertTrue(cursorWindow.putNull(0, 1));
-        assertNull(cursorWindow.getString(0, 1));
-        assertEquals(0, cursorWindow.getLong(0, 1));
-        assertEquals(0, cursorWindow.getInt(0, 1));
-        assertEquals(0, cursorWindow.getShort(0, 1));
-        assertEquals(0.0, cursorWindow.getDouble(0, 1));
-        assertEquals(0.0f, cursorWindow.getFloat(0, 1), 0.00000001f);
-        assertNull(cursorWindow.getBlob(0, 1));
-        assertTrue(cursorWindow.isNull(0, 1));
-        // If the field is null, isBlob will return true.
-        assertTrue(cursorWindow.isBlob(0, 1));
-
-        // Test putLong, getLong, getInt, getString , getShort, getFloat, getDouble, isBlob.
-        assertTrue(cursorWindow.putLong(NUMBER_LONG_INTEGER, 0, 2));
-        assertEquals(NUMBER_LONG_INTEGER, cursorWindow.getLong(0, 2));
-        assertEquals(NUMBER_INTEGER, cursorWindow.getInt(0, 2));
-        assertEquals(Long.toString(NUMBER_LONG_INTEGER), cursorWindow.getString(0, 2));
-        assertEquals(NUMBER_SHORT, cursorWindow.getShort(0, 2));
-        assertEquals(NUMBER_FLOAT_SCIENCE, cursorWindow.getFloat(0, 2), 0.00000001f);
-        assertEquals(NUMBER_DOUBLE_SCIENCE, cursorWindow.getDouble(0, 2), 0.00000001);
-        try {
-            cursorWindow.getBlob(0, 2);
-            fail("Can't get Blob from a Integer value.");
-        } catch (SQLiteException e) {
-            // expected
-        }
-        assertFalse(cursorWindow.isNull(0, 2));
-        assertFalse(cursorWindow.isBlob(0, 2));
-
-        // Test putDouble
-        assertTrue(cursorWindow.putDouble(NUMBER_DOUBLE_SCIENCE, 0, 3));
-        assertEquals(NUMBER_LONG_INTEGER, cursorWindow.getLong(0, 3));
-        assertEquals(NUMBER_INTEGER, cursorWindow.getInt(0, 3));
-        // Converting from Double to String, there would be some little precision differences. So
-        // Just compare first 6 digits.
-        assertEquals(NUMBER_FLOAT_SCIENCE_STRING2.substring(0, 6), cursorWindow.getString(0, 3)
-                .substring(0, 6));
-        assertEquals(NUMBER_SHORT, cursorWindow.getShort(0, 3));
-        assertEquals(NUMBER_FLOAT_SCIENCE, cursorWindow.getFloat(0, 3), 0.00000001f);
-        assertEquals(NUMBER_DOUBLE_SCIENCE, cursorWindow.getDouble(0, 3), 0.00000001);
-        try {
-            cursorWindow.getBlob(0, 3);
-            fail("Can't get Blob from a Double value.");
-        } catch (SQLiteException e) {
-            // expected
-        }
-        assertFalse(cursorWindow.isNull(0, 3));
-        assertFalse(cursorWindow.isBlob(0, 3));
-
-        // Test putBlob
-        assertTrue(cursorWindow.putBlob(originalBlob, 0, 4));
-        byte[] targetBlob = cursorWindow.getBlob(0, 4);
-        assertTrue(Arrays.equals(originalBlob, targetBlob));
-        assertFalse(cursorWindow.isNull(0, 4));
-        // Test isBlob
-        assertTrue(cursorWindow.isBlob(0, 4));
-    }
-
-    public void testCopyStringToBuffer() {
-        int DEFAULT_ARRAY_LENGTH = 64;
-        String baseString = "0123456789";
-        String expectedString = "";
-        // Create a 60 characters string.
-        for (int i = 0; i < 6; i++) {
-            expectedString += baseString;
-        }
-        CharArrayBuffer charArrayBuffer = new CharArrayBuffer(null);
-        CursorWindow cursorWindow = new CursorWindow(true);
-        cursorWindow.setNumColumns(2);
-        cursorWindow.allocRow();
-
-        assertEquals(null, charArrayBuffer.data);
-        cursorWindow.putString(expectedString, 0, 0);
-        cursorWindow.copyStringToBuffer(0, 0, charArrayBuffer);
-        assertNotNull(charArrayBuffer.data);
-        // By default, if the field's string is shorter than 64, array will be allocated as 64.
-        assertEquals(DEFAULT_ARRAY_LENGTH, charArrayBuffer.data.length);
-        assertEquals(expectedString,
-                new String(charArrayBuffer.data, 0, charArrayBuffer.sizeCopied));
-
-        // Test in case of string is longer than 64,
-        expectedString += baseString;
-        charArrayBuffer = new CharArrayBuffer(null);
-        cursorWindow.putString(expectedString, 0, 1);
-        cursorWindow.copyStringToBuffer(0, 1, charArrayBuffer);
-        assertNotNull(charArrayBuffer.data);
-        // If the string is longer than 64, array will be allocated as needed(longer than 64).
-        assertEquals(expectedString,
-                new String(charArrayBuffer.data, 0, charArrayBuffer.sizeCopied));
-        assertEquals(70, expectedString.length());
-        assertEquals(expectedString.length(), charArrayBuffer.data.length);
-    }
-
-    public void testAccessStartPosition() {
-        final int TEST_POSITION_1 = 0;
-        final int TEST_POSITION_2 = 3;
-
-        CursorWindow cursorWindow = new CursorWindow(true);
-        fillCursorTestContents(cursorWindow, 5);
-
-        // Test setStartPosition
-        assertEquals(TEST_POSITION_1, cursorWindow.getStartPosition());
-        assertEquals(3, cursorWindow.getInt(3, 0));
-        assertEquals(TEST_STRING + "3", cursorWindow.getString(3, 1));
-        assertEquals(4, cursorWindow.getInt(4, 0));
-        assertEquals(TEST_STRING + "4", cursorWindow.getString(4, 1));
-        cursorWindow.setStartPosition(TEST_POSITION_2);
-
-        assertEquals(TEST_POSITION_2, cursorWindow.getStartPosition());
-
-        assertEquals(0, cursorWindow.getInt(3, 0));
-        assertEquals(TEST_STRING + "0", cursorWindow.getString(3, 1));
-        assertEquals(1, cursorWindow.getInt(4, 0));
-        assertEquals(TEST_STRING + "1", cursorWindow.getString(4, 1));
-        try {
-            cursorWindow.getBlob(0, 0);
-            fail("Row number is smaller than startPosition, will cause a IllegalStateException.");
-        } catch (IllegalStateException e) {
-            // expected
-        }
-    }
-
-    public void testClearAndOnAllReferencesReleased() {
-        MockCursorWindow cursorWindow = new MockCursorWindow(true);
-
-        assertEquals(0, cursorWindow.getNumRows());
-        fillCursorTestContents(cursorWindow, 10);
-        assertEquals(10, cursorWindow.getNumRows());
-        assertEquals(0, cursorWindow.getStartPosition());
-        cursorWindow.setStartPosition(5);
-        assertEquals(5, cursorWindow.getStartPosition());
-
-        // Test clear(). a complete calling process of cursorWindow has a perfect acquiring and
-        // releasing pair, so the references number will be equal at the begin and the end.
-        assertFalse(cursorWindow.hasReleasedAllReferences());
-        cursorWindow.clear();
-        assertEquals(0, cursorWindow.getNumRows());
-        assertEquals(0, cursorWindow.getStartPosition());
-        assertFalse(cursorWindow.hasReleasedAllReferences());
-
-        // Test onAllReferencesReleased.
-        // By default, cursorWindow's reference is 1, when it reachs 0, onAllReferencesReleased
-        // be invoked.
-        cursorWindow = new MockCursorWindow(true);
-        cursorWindow.releaseReference();
-        assertTrue(cursorWindow.hasReleasedAllReferences());
-    }
-
-    public void testDescribeContents() {
-        CursorWindow cursorWindow = new CursorWindow(true);
-        assertEquals(0, cursorWindow.describeContents());
-    }
-
-    private class MockCursorWindow extends CursorWindow {
-        private boolean mHasReleasedAllReferences = false;
-
-        public MockCursorWindow(boolean localWindow) {
-            super(localWindow);
-        }
-
-        @Override
-        protected void onAllReferencesReleased() {
-            super.onAllReferencesReleased();
-            mHasReleasedAllReferences = true;
-        }
-
-        public boolean hasReleasedAllReferences() {
-            return mHasReleasedAllReferences;
-        }
-
-        public void resetStatus() {
-            mHasReleasedAllReferences = false;
-        }
-    }
-
-    private void fillCursorTestContents(CursorWindow cursorWindow, int length) {
-        cursorWindow.clear();
-        cursorWindow.setStartPosition(0);
-        cursorWindow.setNumColumns(2);
-        for (int i = 0; i < length; i++) {
-            cursorWindow.allocRow();
-            cursorWindow.putLong(i, i, 0);
-            cursorWindow.putString(TEST_STRING + i, i, 1);
-        }
-    }
-
-    private static ArrayList<ArrayList<Integer>> createTestList(int rows, int cols) {
-        ArrayList<ArrayList<Integer>> list = new ArrayList<ArrayList<Integer>>();
-        Random generator = new Random();
-
-        for (int i = 0; i < rows; i++) {
-            ArrayList<Integer> col = new ArrayList<Integer>();
-            list.add(col);
-            for (int j = 0; j < cols; j++) {
-                // generate random number
-                col.add(j == 0 ? i : generator.nextInt());
-            }
-        }
-        return list;
-    }
-
-    /**
-     * The method comes from unit_test CursorWindowTest.
-     */
-    private CursorWindow getOneByOneWindow() {
-        CursorWindow window = new CursorWindow(false);
-        assertTrue(window.setNumColumns(1));
-        assertTrue(window.allocRow());
-        return window;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/cts/CursorWrapperTest.java b/proprietary/frameworks/base/tests/database/src/android/database/cts/CursorWrapperTest.java
deleted file mode 100755
index 7cf7cc0ae558bd4c854b95d257eb89d7aea62f59..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/cts/CursorWrapperTest.java
+++ /dev/null
@@ -1,527 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.cts;
-
-
-import android.content.Context;
-import android.database.CharArrayBuffer;
-import android.database.ContentObserver;
-import android.database.Cursor;
-import android.database.CursorWrapper;
-import android.database.DataSetObserver;
-import android.database.StaleDataException;
-import android.database.sqlite.SQLiteDatabase;
-import android.os.Bundle;
-import android.os.Handler;
-import android.test.AndroidTestCase;
-
-import java.io.File;
-import java.util.Arrays;
-
-public class CursorWrapperTest extends AndroidTestCase {
-
-    private static final String FIRST_NUMBER = "123";
-    private static final String SECOND_NUMBER = "5555";
-    private static final int TESTVALUE1 = 199;
-    private static final int TESTVALUE2 = 200;
-    private static final String[] NUMBER_PROJECTION = new String[] {
-        "_id",             // 0
-        "number"           // 1
-    };
-    private static final int DEFAULT_RECORD_COUNT = 2;
-    private static final int DEFAULT_COLUMN_COUNT = 2;
-
-    private SQLiteDatabase mDatabase;
-    private File mDatabaseFile;
-    private Cursor mCursor;
-
-    private static final int CURRENT_DATABASE_VERSION = 42;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        setupDatabase();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        closeDatabase();
-        super.tearDown();
-    }
-
-    public void testConstrucotorAndClose() {
-        CursorWrapper cursorWrapper = new CursorWrapper(getCursor());
-
-        assertTrue(cursorWrapper.requery());
-        cursorWrapper.deactivate();
-        cursorWrapper.move(1);
-        assertEquals(DEFAULT_RECORD_COUNT, cursorWrapper.getCount());
-
-        assertFalse(cursorWrapper.isClosed());
-        assertTrue(cursorWrapper.requery());
-        cursorWrapper.close();
-        assertTrue(cursorWrapper.isClosed());
-        assertFalse(cursorWrapper.requery());
-    }
-
-    private Cursor getCursor() {
-        Cursor cursor = mDatabase.query("test1", NUMBER_PROJECTION, null, null, null, null, null);
-        return cursor;
-    }
-
-    public void testGetCount() {
-        CursorWrapper cursorWrapper = new CursorWrapper(getCursor());
-        int defaultCount = cursorWrapper.getCount();
-
-        // Add two records into the table.
-        addWithValue(mDatabase, TESTVALUE1);
-        int expected = defaultCount + 1;
-        assertTrue(cursorWrapper.requery());
-        assertEquals(expected, cursorWrapper.getCount());
-        addWithValue(mDatabase, TESTVALUE2);
-        expected += 1;
-        assertTrue(cursorWrapper.requery());
-        assertEquals(expected, cursorWrapper.getCount());
-
-        // Delete previous two records which have been added just now.
-        deleteWithValue(mDatabase, TESTVALUE1);
-        assertTrue(cursorWrapper.requery());
-        assertEquals(defaultCount + 1, cursorWrapper.getCount());
-        deleteWithValue(mDatabase, TESTVALUE2);
-        assertTrue(cursorWrapper.requery());
-        assertEquals(defaultCount, cursorWrapper.getCount());
-
-        // Continue to delete all the records
-        deleteAllRecords(mDatabase);
-        assertTrue(cursorWrapper.requery());
-        assertEquals(0, cursorWrapper.getCount());
-
-        cursorWrapper.close();
-        assertFalse(cursorWrapper.requery());
-
-        // Restore original database status
-        rebuildDatabase();
-    }
-
-    public void testDeactivate() throws IllegalStateException {
-        CursorWrapper cursorWrapper = new CursorWrapper(getCursor());
-        MockObserver observer = new MockObserver();
-
-        // one DataSetObserver can't unregistered before it had been registered.
-        try {
-            cursorWrapper.unregisterDataSetObserver(observer);
-            fail("testUnregisterDataSetObserver failed");
-        } catch (IllegalStateException e) {
-        }
-
-        // Before registering, observer can't be notified.
-        assertFalse(observer.hasInvalidated());
-        cursorWrapper.moveToLast();
-        cursorWrapper.deactivate();
-        assertFalse(observer.hasInvalidated());
-
-        // Test with registering DataSetObserver
-        assertTrue(cursorWrapper.requery());
-        cursorWrapper.registerDataSetObserver(observer);
-        assertFalse(observer.hasInvalidated());
-        cursorWrapper.moveToLast();
-        assertEquals(Integer.parseInt(SECOND_NUMBER), cursorWrapper.getInt(1));
-        cursorWrapper.deactivate();
-        // deactivate method can invoke invalidate() method, can be observed by DataSetObserver.
-        assertTrue(observer.hasInvalidated());
-        // After deactivating, the cursor can not provide values from database record.
-        try {
-            cursorWrapper.getInt(1);
-            fail("After deactivating, cursor cannot execute getting value operations.");
-        } catch (StaleDataException e) {
-        }
-
-        // Can't register a same observer twice before unregister it.
-        try {
-            cursorWrapper.registerDataSetObserver(observer);
-            fail("testRegisterDataSetObserver failed");
-        } catch (IllegalStateException e) {
-        }
-
-        // After runegistering, observer can't be notified.
-        cursorWrapper.unregisterDataSetObserver(observer);
-        observer.resetStatus();
-        assertFalse(observer.hasInvalidated());
-        cursorWrapper.moveToLast();
-        cursorWrapper.deactivate();
-        assertFalse(observer.hasInvalidated());
-
-        // one DataSetObserver can't be unregistered twice continuously.
-        try {
-            cursorWrapper.unregisterDataSetObserver(observer);
-            fail("testUnregisterDataSetObserver failed");
-        } catch (IllegalStateException e) {
-        }
-    }
-
-    public void testGettingColumnInfos() {
-        CursorWrapper cursorWrapper = new CursorWrapper(getCursor());
-
-        assertEquals(DEFAULT_COLUMN_COUNT, cursorWrapper.getColumnCount());
-
-        // Test getColumnIndex
-        assertEquals(0, cursorWrapper.getColumnIndex("_id"));
-        assertEquals(1, cursorWrapper.getColumnIndex("number"));
-        assertEquals(-1, cursorWrapper.getColumnIndex("NON_EXISTENCE"));
-
-        // Test getColumnIndexOrThrow
-        assertEquals(0, cursorWrapper.getColumnIndexOrThrow("_id"));
-        assertEquals(1, cursorWrapper.getColumnIndexOrThrow("number"));
-        try {
-            cursorWrapper.getColumnIndexOrThrow("NON_EXISTENCE");
-            fail("getColumnIndexOrThrow should throws IllegalArgumentException if the column"
-                    + "does not exist");
-        } catch (IllegalArgumentException e) {
-        }
-
-        assertEquals("_id", cursorWrapper.getColumnName(0));
-        assertEquals("number", cursorWrapper.getColumnName(1));
-
-        String[] columnNames = cursorWrapper.getColumnNames();
-        assertEquals(DEFAULT_COLUMN_COUNT, cursorWrapper.getColumnCount());
-        assertEquals("_id", columnNames[0]);
-        assertEquals("number", columnNames[1]);
-        cursorWrapper.close();
-    }
-
-    public void testPositioning() {
-        CursorWrapper cursorWrapper = new CursorWrapper(getCursor());
-
-        // There are totally 2 records.
-        // At first, the cursor is at beginning position: -1
-        // Test isBeforeFirst, getPosition, isFirst
-        assertTrue(cursorWrapper.isBeforeFirst());
-        assertEquals(-1, cursorWrapper.getPosition());
-        assertFalse(cursorWrapper.isFirst());
-
-        // Test moveToNext
-        assertTrue(cursorWrapper.moveToNext());
-        assertEquals(0, cursorWrapper.getPosition());
-        assertTrue(cursorWrapper.isFirst());
-
-        // Test isLast
-        assertFalse(cursorWrapper.isLast());
-        assertTrue(cursorWrapper.moveToNext());
-        assertEquals(1, cursorWrapper.getPosition());
-        assertTrue(cursorWrapper.isLast());
-
-        // move to the end
-        // Test isLast and isAfterLast
-        assertFalse(cursorWrapper.moveToNext());
-        assertFalse(cursorWrapper.isLast());
-        assertTrue(cursorWrapper.isAfterLast());
-        assertEquals(2, cursorWrapper.getPosition());
-
-        // Test move(int)
-        assertTrue(cursorWrapper.move(-1));
-        assertEquals(1, cursorWrapper.getPosition());
-        assertTrue(cursorWrapper.move(-1));
-        assertEquals(0, cursorWrapper.getPosition());
-        // While reach the edge, function will return false
-        assertFalse(cursorWrapper.move(-1));
-        assertEquals(-1, cursorWrapper.getPosition());
-        assertTrue(cursorWrapper.move(2));
-        assertEquals(1, cursorWrapper.getPosition());
-        // While reach the edge, function will return false
-        assertFalse(cursorWrapper.move(1));
-        assertTrue(cursorWrapper.isAfterLast());
-
-        // Test moveToPrevious()
-        assertEquals(2, cursorWrapper.getPosition());
-        assertTrue(cursorWrapper.moveToPrevious());
-        assertEquals(1, cursorWrapper.getPosition());
-        assertTrue(cursorWrapper.moveToPrevious());
-        assertEquals(0, cursorWrapper.getPosition());
-        // While reach the edge, function will return false
-        assertFalse(cursorWrapper.moveToPrevious());
-        assertEquals(-1, cursorWrapper.getPosition());
-        assertTrue(cursorWrapper.isBeforeFirst());
-
-        // Test moveToPosition
-        // While reach the edge, function will return false
-        assertFalse(cursorWrapper.moveToPosition(2));
-        assertEquals(2, cursorWrapper.getPosition());
-        // While reach the edge, function will return false
-        assertFalse(cursorWrapper.moveToPosition(-1));
-        assertEquals(-1, cursorWrapper.getPosition());
-        assertTrue(cursorWrapper.moveToPosition(1));
-        assertEquals(1, cursorWrapper.getPosition());
-        assertTrue(cursorWrapper.moveToPosition(0));
-        assertEquals(0, cursorWrapper.getPosition());
-
-        // Test moveToFirst and moveToFirst
-        assertFalse(cursorWrapper.isLast());
-        assertTrue(cursorWrapper.moveToLast());
-        assertEquals(1, cursorWrapper.getPosition());
-        assertTrue(cursorWrapper.isLast());
-        assertFalse(cursorWrapper.isFirst());
-        assertTrue(cursorWrapper.moveToFirst());
-        assertEquals(0, cursorWrapper.getPosition());
-        assertTrue(cursorWrapper.isFirst());
-        cursorWrapper.close();
-    }
-
-    public void testGettingValues() {
-        final byte NUMBER_BLOB_UNIT = 99;
-        final String STRING_TEXT = "Test String";
-        final String STRING_TEXT2 = "Test String2";
-        final double NUMBER_DOUBLE = Double.MAX_VALUE;
-        final double NUMBER_FLOAT = (float) NUMBER_DOUBLE;
-        final long NUMBER_LONG_INTEGER = 0xaabbccddffL;
-        final long NUMBER_INTEGER = (int) NUMBER_LONG_INTEGER;
-        final long NUMBER_SHORT = (short) NUMBER_INTEGER;
-
-        assertTrue(NUMBER_DOUBLE != NUMBER_FLOAT);
-        assertTrue(NUMBER_LONG_INTEGER != NUMBER_INTEGER);
-        assertTrue(NUMBER_LONG_INTEGER != (short) NUMBER_SHORT);
-        assertTrue(NUMBER_INTEGER != (int) NUMBER_SHORT);
-
-        // create table
-        mDatabase.execSQL("CREATE TABLE test2 (_id INTEGER PRIMARY KEY, string_text TEXT,"
-                + "double_number REAL, int_number INTEGER, blob_data BLOB);");
-        // insert blob and other values
-        Object[] args = new Object[4];
-        byte[] originalBlob = new byte[1000];
-        Arrays.fill(originalBlob, NUMBER_BLOB_UNIT);
-        args[0] = STRING_TEXT;
-        args[1] = NUMBER_DOUBLE;
-        args[2] = NUMBER_LONG_INTEGER;
-        args[3] = originalBlob;
-
-        // Insert record.
-        String sql = "INSERT INTO test2 (string_text, double_number, int_number, blob_data)"
-                + "VALUES (?,?,?,?)";
-        mDatabase.execSQL(sql, args);
-        // use cursor to access blob
-        Cursor cursor = mDatabase.query("test2", null, null, null, null, null, null);
-
-        // Test getColumnCount
-        CursorWrapper cursorWrapper = new CursorWrapper(getCursor());
-        assertEquals(DEFAULT_COLUMN_COUNT, cursorWrapper.getColumnCount());
-        cursorWrapper.close();
-        cursorWrapper = new CursorWrapper(cursor);
-        assertEquals(5, cursorWrapper.getColumnCount());
-
-        cursorWrapper.moveToNext();
-        int columnBlob = cursorWrapper.getColumnIndexOrThrow("blob_data");
-        int columnString = cursorWrapper.getColumnIndexOrThrow("string_text");
-        int columnDouble = cursorWrapper.getColumnIndexOrThrow("double_number");
-        int columnInteger = cursorWrapper.getColumnIndexOrThrow("int_number");
-
-        // Test getting value methods.
-        byte[] targetBlob = cursorWrapper.getBlob(columnBlob);
-        assertTrue(Arrays.equals(originalBlob, targetBlob));
-
-        assertEquals(STRING_TEXT, cursorWrapper.getString(columnString));
-
-        assertEquals(NUMBER_DOUBLE, cursorWrapper.getDouble(columnDouble), 0.000000000001);
-
-        assertEquals(NUMBER_FLOAT, cursorWrapper.getFloat(columnDouble), 0.000000000001f);
-
-        assertEquals(NUMBER_LONG_INTEGER, cursorWrapper.getLong(columnInteger));
-
-        assertEquals(NUMBER_INTEGER, cursorWrapper.getInt(columnInteger));
-
-        assertEquals(NUMBER_SHORT, cursorWrapper.getShort(columnInteger));
-
-        // Test isNull(int).
-        assertFalse(cursorWrapper.isNull(columnBlob));
-        sql = "INSERT INTO test2 (string_text) VALUES ('" + STRING_TEXT2 + "')";
-        mDatabase.execSQL(sql);
-        cursorWrapper.close();
-        cursor = mDatabase.query("test2", null, null, null, null, null, null);
-        cursorWrapper = new CursorWrapper(cursor);
-        cursorWrapper.moveToPosition(1);
-        assertTrue(cursorWrapper.isNull(columnBlob));
-
-        mDatabase.execSQL("DROP TABLE test2");
-    }
-
-    public void testGetExtras() {
-        CursorWrapper cursor = new CursorWrapper(getCursor());
-        Bundle bundle = cursor.getExtras();
-        assertSame(Bundle.EMPTY, bundle);
-    }
-
-    public void testCopyStringToBuffer() {
-        CharArrayBuffer charArrayBuffer = new CharArrayBuffer(1000);
-        Cursor cursor = getCursor();
-
-        CursorWrapper cursorWrapper = new CursorWrapper(cursor);
-        cursorWrapper.moveToFirst();
-
-        assertEquals(0, charArrayBuffer.sizeCopied);
-        cursorWrapper.copyStringToBuffer(0, charArrayBuffer);
-        String string = new String(charArrayBuffer.data);
-        assertTrue(charArrayBuffer.sizeCopied > 0);
-        assertEquals("1", string.substring(0, charArrayBuffer.sizeCopied));
-
-        cursorWrapper.copyStringToBuffer(1, charArrayBuffer);
-        string = new String(charArrayBuffer.data);
-        assertTrue(charArrayBuffer.sizeCopied > 0);
-        assertEquals(FIRST_NUMBER, string.substring(0, charArrayBuffer.sizeCopied));
-
-        cursorWrapper.moveToNext();
-        cursorWrapper.copyStringToBuffer(1, charArrayBuffer);
-        string = new String(charArrayBuffer.data);
-        assertTrue(charArrayBuffer.sizeCopied > 0);
-        assertEquals(SECOND_NUMBER, string.substring(0, charArrayBuffer.sizeCopied));
-        cursorWrapper.close();
-    }
-
-    public void testRespond() {
-        Bundle b = new Bundle();
-        CursorWrapper cursorWrapper = new CursorWrapper(getCursor());
-        Bundle bundle = cursorWrapper.respond(b);
-        assertSame(Bundle.EMPTY, bundle);
-        cursorWrapper.close();
-    }
-
-    public void testGetWantsAllOnMoveCalls() {
-        CursorWrapper cursorWrapper = new CursorWrapper(getCursor());
-        assertFalse(cursorWrapper.getWantsAllOnMoveCalls());
-        cursorWrapper.close();
-    }
-
-    public void testContentObsererOperations() throws IllegalStateException {
-        CursorWrapper cursorWrapper = new CursorWrapper(getCursor());
-        MockContentObserver observer = new MockContentObserver(null);
-
-        // Can't unregister a Observer before it has been registered.
-        try {
-            cursorWrapper.unregisterContentObserver(observer);
-            fail("testUnregisterContentObserver failed");
-        } catch (IllegalStateException e) {
-            assertTrue(true);
-        }
-
-        cursorWrapper.registerContentObserver(observer);
-
-        // Can't register a same observer twice before unregister it.
-        try {
-            cursorWrapper.registerContentObserver(observer);
-            fail("testRegisterContentObserver failed");
-        } catch (IllegalStateException e) {
-        }
-
-        cursorWrapper.unregisterContentObserver(observer);
-        // one Observer can be registered again after it has been unregistered.
-        cursorWrapper.registerContentObserver(observer);
-
-        cursorWrapper.unregisterContentObserver(observer);
-
-        try {
-            cursorWrapper.unregisterContentObserver(observer);
-            fail("testUnregisterContentObserver failed");
-        } catch (IllegalStateException e) {
-        }
-        cursorWrapper.close();
-    }
-
-    private class MockContentObserver extends ContentObserver {
-
-        public MockContentObserver(Handler handler) {
-            super(handler);
-        }
-    }
-
-    private void deleteWithValue(SQLiteDatabase database, int value) {
-        database.execSQL("DELETE FROM test1 WHERE number = " + value + ";");
-    }
-
-    private void addWithValue(SQLiteDatabase database, int value) {
-        database.execSQL("INSERT INTO test1 (number) VALUES ('" + value + "');");
-    }
-
-    private void deleteAllRecords(SQLiteDatabase database) {
-        database.delete("test1", null, null);
-    }
-
-    private void setupDatabase() {
-        File dbDir = getContext().getDir("tests", Context.MODE_PRIVATE);
-        /* don't use the same database name as the one in super class
-         * this class's setUp() method deletes a database file just opened by super.setUp().
-         * that can cause corruption in database in the following situation:
-         *    super.setUp() creates the database, inserts some data into it.
-         *    this class setUp() deletes just the database file but not the associated
-         *    database files such as wal, shm files.
-         * solution is to have this class delete the whole database directory.
-         * better yet, this class shouldn't extend DatabaseCursortest at all.
-         * TODO: fix this bogus cts class hierarchy
-         */
-        mDatabaseFile = new File(dbDir, "cursor_test.db");
-        if (mDatabaseFile.exists()) {
-            mDatabaseFile.delete();
-        }
-        mDatabase = SQLiteDatabase.openOrCreateDatabase(mDatabaseFile.getPath(), null);
-        assertNotNull(mDatabase);
-        mDatabase.setVersion(CURRENT_DATABASE_VERSION);
-        mDatabase.execSQL("CREATE TABLE test1 (_id INTEGER PRIMARY KEY, number TEXT);");
-        mDatabase.execSQL("INSERT INTO test1 (number) VALUES ('" + FIRST_NUMBER + "');");
-        mDatabase.execSQL("INSERT INTO test1 (number) VALUES ('" + SECOND_NUMBER + "');");
-        mCursor = getCursor();
-    }
-
-    private void closeDatabase() {
-        if (null != mCursor) {
-            mCursor.close();
-            mCursor = null;
-        }
-        mDatabase.close();
-        mDatabaseFile.delete();
-    }
-
-    private void rebuildDatabase() {
-        closeDatabase();
-        setupDatabase();
-    }
-
-    private class MockObserver extends DataSetObserver {
-        private boolean mHasChanged = false;
-        private boolean mHasInvalidated = false;
-
-        @Override
-        public void onChanged() {
-            super.onChanged();
-            mHasChanged = true;
-        }
-
-        @Override
-        public void onInvalidated() {
-            super.onInvalidated();
-            mHasInvalidated = true;
-        }
-
-        protected void resetStatus() {
-            mHasChanged = false;
-            mHasInvalidated = false;
-        }
-
-        protected boolean hasChanged() {
-            return mHasChanged;
-        }
-
-        protected boolean hasInvalidated() {
-            return mHasInvalidated;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/cts/DataSetObservableTest.java b/proprietary/frameworks/base/tests/database/src/android/database/cts/DataSetObservableTest.java
deleted file mode 100755
index 026fb7e9af061b7975c59473e8a02faa168ab398..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/cts/DataSetObservableTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.cts;
-
-import android.database.DataSetObservable;
-import android.database.DataSetObserver;
-import android.test.AndroidTestCase;
-
-public class DataSetObservableTest extends AndroidTestCase {
-
-    public void testNotifyMethods() {
-        DataSetObservable dataSetObservalbe = new DataSetObservable();
-        MockDataSetObserver dataSetObserver1 = new MockDataSetObserver();
-        MockDataSetObserver dataSetObserver2 = new MockDataSetObserver();
-
-        dataSetObservalbe.registerObserver(dataSetObserver1);
-        dataSetObservalbe.registerObserver(dataSetObserver2);
-
-        assertFalse(dataSetObserver1.hasChanged());
-        assertFalse(dataSetObserver2.hasChanged());
-        dataSetObservalbe.notifyChanged();
-        assertTrue(dataSetObserver1.hasChanged());
-        assertTrue(dataSetObserver2.hasChanged());
-
-        assertFalse(dataSetObserver1.hasInvalidated());
-        assertFalse(dataSetObserver2.hasInvalidated());
-        dataSetObservalbe.notifyInvalidated();
-        assertTrue(dataSetObserver1.hasInvalidated());
-        assertTrue(dataSetObserver2.hasInvalidated());
-
-        // After unregistering, all the observers can not be notified.
-        dataSetObservalbe.unregisterAll();
-        dataSetObserver1.resetStatus();
-        dataSetObserver2.resetStatus();
-
-        // notifyChanged is not working on dataSetObserver1 & 2 anymore.
-        dataSetObservalbe.notifyChanged();
-        assertFalse(dataSetObserver1.hasChanged());
-        assertFalse(dataSetObserver2.hasChanged());
-
-        // notifyInvalidated is not working on dataSetObserver1 & 2 anymore.
-        dataSetObservalbe.notifyInvalidated();
-        assertFalse(dataSetObserver1.hasInvalidated());
-        assertFalse(dataSetObserver2.hasInvalidated());
-    }
-
-    private class MockDataSetObserver extends DataSetObserver {
-        private boolean mHasChanged = false;
-        private boolean mHasInvalidated = false;
-
-        @Override
-        public void onChanged() {
-            super.onChanged();
-            mHasChanged = true;
-        }
-
-        @Override
-        public void onInvalidated() {
-            super.onInvalidated();
-            mHasInvalidated = true;
-        }
-
-        protected boolean hasChanged() {
-            return mHasChanged;
-        }
-
-        protected boolean hasInvalidated() {
-            return mHasInvalidated;
-        }
-
-        protected void resetStatus() {
-            mHasChanged = false;
-            mHasInvalidated = false;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/cts/DataSetObserverTest.java b/proprietary/frameworks/base/tests/database/src/android/database/cts/DataSetObserverTest.java
deleted file mode 100755
index 9107b7038d6d76f1b75aa50d7a2207315630346e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/cts/DataSetObserverTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.cts;
-
-import android.database.DataSetObserver;
-import android.test.AndroidTestCase;
-
-public class DataSetObserverTest extends AndroidTestCase {
-    public void testOnChanged() {
-        MockDataSetObserver dataSetObserver = new MockDataSetObserver();
-        dataSetObserver.onChanged();
-    }
-
-    public void testOnInvalidated() {
-        MockDataSetObserver dataSetObserver = new MockDataSetObserver();
-        dataSetObserver.onInvalidated();
-    }
-
-    private class MockDataSetObserver extends DataSetObserver {
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/cts/DatabaseCursorTest.java b/proprietary/frameworks/base/tests/database/src/android/database/cts/DatabaseCursorTest.java
deleted file mode 100755
index e581b436fa40859c6b7771c2a26e2bdf8570c50e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/cts/DatabaseCursorTest.java
+++ /dev/null
@@ -1,505 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.cts;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.CursorIndexOutOfBoundsException;
-import android.database.CursorWrapper;
-import android.database.DataSetObserver;
-import android.database.DatabaseUtils;
-import android.database.sqlite.SQLiteCursor;
-import android.database.sqlite.SQLiteCursorDriver;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteQuery;
-import android.os.Looper;
-import android.test.AndroidTestCase;
-import android.test.PerformanceTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.util.Log;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.Random;
-
-public class DatabaseCursorTest extends AndroidTestCase implements PerformanceTestCase {
-    private static final String sString1 = "this is a test";
-    private static final String sString2 = "and yet another test";
-    private static final String sString3 = "this string is a little longer, but still a test";
-
-    private static final int CURRENT_DATABASE_VERSION = 42;
-    private SQLiteDatabase mDatabase;
-    private File mDatabaseFile;
-    protected static final int TYPE_CURSOR = 0;
-    protected static final int TYPE_CURSORWRAPPER = 1;
-    private int  mTestType = TYPE_CURSOR;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        File dbDir = getContext().getDir("tests", Context.MODE_PRIVATE);
-        mDatabaseFile = new File(dbDir, "database_test.db");
-        if (mDatabaseFile.exists()) {
-            mDatabaseFile.delete();
-        }
-        mDatabase = SQLiteDatabase.openOrCreateDatabase(mDatabaseFile.getPath(), null);
-        assertNotNull(mDatabase);
-        mDatabase.setVersion(CURRENT_DATABASE_VERSION);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mDatabase.close();
-        mDatabaseFile.delete();
-        super.tearDown();
-    }
-
-    public void setupTestType(int testType) {
-        mTestType = testType;
-    }
-
-    private Cursor getTestCursor(Cursor cursor) {
-        switch (mTestType) {
-        case TYPE_CURSORWRAPPER:
-            return new CursorWrapper(cursor);
-        case TYPE_CURSOR:
-        default:
-            return cursor;
-        }
-    }
-
-    public boolean isPerformanceOnly() {
-        return false;
-    }
-
-    // These test can only be run once.
-    public int startPerformance(Intermediates intermediates) {
-        return 1;
-    }
-
-    private void populateDefaultTable() {
-        mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, data TEXT);");
-
-        mDatabase.execSQL("INSERT INTO test (data) VALUES ('" + sString1 + "');");
-        mDatabase.execSQL("INSERT INTO test (data) VALUES ('" + sString2 + "');");
-        mDatabase.execSQL("INSERT INTO test (data) VALUES ('" + sString3 + "');");
-    }
-
-    @MediumTest
-    public void testBlob() throws Exception {
-        // create table
-        mDatabase.execSQL(
-                "CREATE TABLE test (_id INTEGER PRIMARY KEY, s TEXT, d REAL, l INTEGER, b BLOB);");
-        // insert blob
-        Object[] args = new Object[4];
-
-        byte[] blob = new byte[1000];
-        byte value = 99;
-        Arrays.fill(blob, value);
-        args[3] = blob;
-
-        String s = new String("text");
-        args[0] = s;
-        Double d = 99.9;
-        args[1] = d;
-        Long l = (long) 1000;
-        args[2] = l;
-
-        String sql = "INSERT INTO test (s, d, l, b) VALUES (?,?,?,?)";
-        mDatabase.execSQL(sql, args);
-        // use cursor to access blob
-
-        Cursor testCursor = mDatabase.query("test", null, null, null, null, null, null);
-
-        testCursor.moveToNext();
-        ContentValues cv = new ContentValues();
-        DatabaseUtils.cursorRowToContentValues(testCursor, cv);
-
-        int bCol = testCursor.getColumnIndexOrThrow("b");
-        int sCol = testCursor.getColumnIndexOrThrow("s");
-        int dCol = testCursor.getColumnIndexOrThrow("d");
-        int lCol = testCursor.getColumnIndexOrThrow("l");
-        byte[] cBlob = testCursor.getBlob(bCol);
-        assertTrue(Arrays.equals(blob, cBlob));
-        assertEquals(s, testCursor.getString(sCol));
-        assertEquals((double) d, testCursor.getDouble(dCol));
-        assertEquals((long) l, testCursor.getLong(lCol));
-    }
-
-    @MediumTest
-    public void testRealColumns() throws Exception {
-        mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, data REAL);");
-        ContentValues values = new ContentValues();
-        values.put("data", 42.11);
-        long id = mDatabase.insert("test", "data", values);
-        assertTrue(id > 0);
-        Cursor testCursor = getTestCursor(mDatabase.rawQuery("SELECT data FROM test", null));
-        assertNotNull(testCursor);
-        assertTrue(testCursor.moveToFirst());
-        assertEquals(42.11, testCursor.getDouble(0));
-        testCursor.close();
-    }
-
-    @MediumTest
-    public void testCursor1() throws Exception {
-        populateDefaultTable();
-
-        Cursor testCursor = getTestCursor(mDatabase.query("test", null, null, null, null, null,
-                null));
-
-        int dataColumn = testCursor.getColumnIndexOrThrow("data");
-
-        // The cursor should ignore text before the last period when looking for a column. (This
-        // is a temporary hack in all implementations of getColumnIndex.)
-        int dataColumn2 = testCursor.getColumnIndexOrThrow("junk.data");
-        assertEquals(dataColumn, dataColumn2);
-
-        assertSame(3, testCursor.getCount());
-
-        assertTrue(testCursor.isBeforeFirst());
-
-        try {
-            testCursor.getInt(0);
-            fail("CursorIndexOutOfBoundsException expected");
-        } catch (CursorIndexOutOfBoundsException ex) {
-            // expected
-        }
-
-        testCursor.moveToNext();
-        assertEquals(1, testCursor.getInt(0));
-
-        String s = testCursor.getString(dataColumn);
-        assertEquals(sString1, s);
-
-        testCursor.moveToNext();
-        s = testCursor.getString(dataColumn);
-        assertEquals(sString2, s);
-
-        testCursor.moveToNext();
-        s = testCursor.getString(dataColumn);
-        assertEquals(sString3, s);
-
-        testCursor.moveToPosition(-1);
-        testCursor.moveToNext();
-        s = testCursor.getString(dataColumn);
-        assertEquals(sString1, s);
-
-        testCursor.moveToPosition(2);
-        s = testCursor.getString(dataColumn);
-        assertEquals(sString3, s);
-
-        int i;
-
-        for (testCursor.moveToFirst(), i = 0; !testCursor.isAfterLast();
-                testCursor.moveToNext(), i++) {
-            testCursor.getInt(0);
-        }
-
-        assertEquals(3, i);
-
-        try {
-            testCursor.getInt(0);
-            fail("CursorIndexOutOfBoundsException expected");
-        } catch (CursorIndexOutOfBoundsException ex) {
-            // expected
-        }
-        testCursor.close();
-    }
-
-    @MediumTest
-    public void testCursor2() throws Exception {
-        populateDefaultTable();
-
-        Cursor testCursor = getTestCursor(mDatabase.query("test", null, "_id > 1000", null, null,
-                null, null));
-        assertEquals(0, testCursor.getCount());
-        assertTrue(testCursor.isBeforeFirst());
-
-        try {
-            testCursor.getInt(0);
-            fail("CursorIndexOutOfBoundsException expected");
-        } catch (CursorIndexOutOfBoundsException ex) {
-            // expected
-        }
-
-        int i;
-        for (testCursor.moveToFirst(), i = 0; !testCursor.isAfterLast();
-                testCursor.moveToNext(), i++) {
-            testCursor.getInt(0);
-        }
-        assertEquals(0, i);
-        try {
-            testCursor.getInt(0);
-            fail("CursorIndexOutOfBoundsException expected");
-        } catch (CursorIndexOutOfBoundsException ex) {
-            // expected
-        }
-        testCursor.close();
-    }
-
-    @MediumTest
-    public void testLargeField() throws Exception {
-        mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, data TEXT);");
-
-        StringBuilder sql = new StringBuilder(2100);
-        sql.append("INSERT INTO test (data) VALUES ('");
-        Random random = new Random(System.currentTimeMillis());
-        StringBuilder randomString = new StringBuilder(1979);
-        for (int i = 0; i < 1979; i++) {
-            randomString.append((random.nextInt() & 0xf) % 10);
-        }
-        sql.append(randomString);
-        sql.append("');");
-        mDatabase.execSQL(sql.toString());
-
-        Cursor testCursor = getTestCursor(mDatabase.query("test", null, null, null, null, null,
-                null));
-        assertNotNull(testCursor);
-        assertEquals(1, testCursor.getCount());
-
-        assertTrue(testCursor.moveToFirst());
-        assertEquals(0, testCursor.getPosition());
-        String largeString = testCursor.getString(testCursor.getColumnIndexOrThrow("data"));
-        assertNotNull(largeString);
-        assertEquals(randomString.toString(), largeString);
-        testCursor.close();
-    }
-
-    private class TestObserver extends DataSetObserver {
-        int total;
-        SQLiteCursor c;
-        boolean quit = false;
-
-        public TestObserver(int total_, SQLiteCursor cursor) {
-            c = cursor;
-            total = total_;
-        }
-
-        @Override
-        public void onChanged() {
-            int count = c.getCount();
-            if (total == count) {
-                int i = 0;
-                while (c.moveToNext()) {
-                    assertEquals(i, c.getInt(1));
-                    i++;
-                }
-                assertEquals(count, i);
-                quit = true;
-                Looper.myLooper().quit();
-            }
-        }
-
-        @Override
-        public void onInvalidated() {
-        }
-    }
-
-    @LargeTest
-    public void testManyRowsLong() throws Exception {
-        mDatabase.beginTransaction();
-        final int count = 9000;
-        try {
-            mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, data INT);");
-
-            for (int i = 0; i < count; i++) {
-                mDatabase.execSQL("INSERT INTO test (data) VALUES (" + i + ");");
-            }
-            mDatabase.setTransactionSuccessful();
-        } finally {
-            mDatabase.endTransaction();
-        }
-
-        Cursor testCursor = getTestCursor(mDatabase.query("test", new String[] { "data" },
-                null, null, null, null, null));
-        assertNotNull(testCursor);
-
-        int i = 0;
-        while (testCursor.moveToNext()) {
-            assertEquals(i, testCursor.getInt(0));
-            i++;
-        }
-        assertEquals(count, i);
-        assertEquals(count, testCursor.getCount());
-
-        Log.d("testManyRows", "count " + Integer.toString(i));
-        testCursor.close();
-    }
-
-    @LargeTest
-    public void testManyRowsTxt() throws Exception {
-        mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, data TEXT);");
-        StringBuilder sql = new StringBuilder(2100);
-        sql.append("INSERT INTO test (data) VALUES ('");
-        Random random = new Random(System.currentTimeMillis());
-        StringBuilder randomString = new StringBuilder(1979);
-        for (int i = 0; i < 1979; i++) {
-            randomString.append((random.nextInt() & 0xf) % 10);
-        }
-        sql.append(randomString);
-        sql.append("');");
-
-        // if cursor window size changed, adjust this value too
-        final int count = 600; // more than two fillWindow needed
-        for (int i = 0; i < count; i++) {
-            mDatabase.execSQL(sql.toString());
-        }
-
-        Cursor testCursor = getTestCursor(mDatabase.query("test", new String[] { "data" }, null,
-                null, null, null, null));
-        assertNotNull(testCursor);
-
-        int i = 0;
-        while (testCursor.moveToNext()) {
-            assertEquals(randomString.toString(), testCursor.getString(0));
-            i++;
-        }
-        assertEquals(count, i);
-        assertEquals(count, testCursor.getCount());
-        testCursor.close();
-    }
-
-    @LargeTest
-    public void testManyRowsTxtLong() throws Exception {
-        mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, txt TEXT, data INT);");
-
-        Random random = new Random(System.currentTimeMillis());
-        StringBuilder randomString = new StringBuilder(1979);
-        for (int i = 0; i < 1979; i++) {
-            randomString.append((random.nextInt() & 0xf) % 10);
-        }
-
-        // if cursor window size changed, adjust this value too
-        final int count = 600;
-        for (int i = 0; i < count; i++) {
-            StringBuilder sql = new StringBuilder(2100);
-            sql.append("INSERT INTO test (txt, data) VALUES ('");
-            sql.append(randomString);
-            sql.append("','");
-            sql.append(i);
-            sql.append("');");
-            mDatabase.execSQL(sql.toString());
-        }
-
-        Cursor testCursor = getTestCursor(mDatabase.query("test", new String[] { "txt", "data" },
-                null, null, null, null, null));
-        assertNotNull(testCursor);
-
-        int i = 0;
-        while (testCursor.moveToNext()) {
-            assertEquals(randomString.toString(), testCursor.getString(0));
-            assertEquals(i, testCursor.getInt(1));
-            i++;
-        }
-        assertEquals(count, i);
-        assertEquals(count, testCursor.getCount());
-        testCursor.close();
-    }
-
-    @MediumTest
-    public void testRequery() throws Exception {
-        populateDefaultTable();
-
-        Cursor testCursor = getTestCursor(mDatabase.rawQuery("SELECT * FROM test", null));
-        assertNotNull(testCursor);
-        assertEquals(3, testCursor.getCount());
-        testCursor.deactivate();
-        testCursor.requery();
-        assertEquals(3, testCursor.getCount());
-        testCursor.close();
-    }
-
-    @MediumTest
-    public void testRequeryWithSelection() throws Exception {
-        populateDefaultTable();
-
-        Cursor testCursor = getTestCursor(
-                mDatabase.rawQuery("SELECT data FROM test WHERE data = '" + sString1 + "'",
-                null));
-        assertNotNull(testCursor);
-        assertEquals(1, testCursor.getCount());
-        assertTrue(testCursor.moveToFirst());
-        assertEquals(sString1, testCursor.getString(0));
-        testCursor.deactivate();
-        testCursor.requery();
-        assertEquals(1, testCursor.getCount());
-        assertTrue(testCursor.moveToFirst());
-        assertEquals(sString1, testCursor.getString(0));
-        testCursor.close();
-    }
-
-    @MediumTest
-    public void testRequeryWithSelectionArgs() throws Exception {
-        populateDefaultTable();
-
-        Cursor testCursor = getTestCursor(mDatabase.rawQuery("SELECT data FROM test WHERE data = ?",
-                new String[] { sString1 }));
-        assertNotNull(testCursor);
-        assertEquals(1, testCursor.getCount());
-        assertTrue(testCursor.moveToFirst());
-        assertEquals(sString1, testCursor.getString(0));
-        testCursor.deactivate();
-        testCursor.requery();
-        assertEquals(1, testCursor.getCount());
-        assertTrue(testCursor.moveToFirst());
-        assertEquals(sString1, testCursor.getString(0));
-        testCursor.close();
-    }
-
-    @MediumTest
-    public void testRequeryWithAlteredSelectionArgs() throws Exception {
-        /**
-         * Test the ability of a subclass of SQLiteCursor to change its query arguments.
-         */
-        populateDefaultTable();
-
-        SQLiteDatabase.CursorFactory factory = new SQLiteDatabase.CursorFactory() {
-            public Cursor newCursor(SQLiteDatabase db, SQLiteCursorDriver masterQuery,
-                    String editTable, SQLiteQuery query) {
-                return new SQLiteCursor(db, masterQuery, editTable, query) {
-                    @Override
-                    public boolean requery() {
-                        setSelectionArguments(new String[] { "2" });
-                        return super.requery();
-                    }
-                };
-            }
-        };
-        Cursor testCursor = getTestCursor(mDatabase.rawQueryWithFactory(factory,
-                "SELECT data FROM test WHERE _id <= ?",
-                new String[] { "1" }, null));
-        assertNotNull(testCursor);
-        assertEquals(1, testCursor.getCount());
-        assertTrue(testCursor.moveToFirst());
-        assertEquals(sString1, testCursor.getString(0));
-
-        // Our hacked requery() changes the query arguments in the cursor.
-        testCursor.requery();
-
-        assertEquals(2, testCursor.getCount());
-        assertTrue(testCursor.moveToFirst());
-        assertEquals(sString1, testCursor.getString(0));
-        assertTrue(testCursor.moveToNext());
-        assertEquals(sString2, testCursor.getString(0));
-
-        // Test that setting query args on a deactivated cursor also works.
-        testCursor.deactivate();
-        testCursor.requery();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/cts/DatabaseUtilsTest.java b/proprietary/frameworks/base/tests/database/src/android/database/cts/DatabaseUtilsTest.java
deleted file mode 100755
index b593449918acb76827fee2847545f6739e24e064..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/cts/DatabaseUtilsTest.java
+++ /dev/null
@@ -1,678 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.cts;
-
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.DatabaseUtils;
-import android.database.DatabaseUtils.InsertHelper;
-import android.database.sqlite.SQLiteAbortException;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteDoneException;
-import android.database.sqlite.SQLiteException;
-import android.database.sqlite.SQLiteStatement;
-import android.os.Parcel;
-import android.os.ParcelFileDescriptor;
-import android.test.AndroidTestCase;
-import android.test.MoreAsserts;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.util.Locale;
-
-public class DatabaseUtilsTest extends AndroidTestCase {
-    private SQLiteDatabase mDatabase;
-    private File mDatabaseFile;
-    private static final String[] TEST_PROJECTION = new String[] {
-        "_id",             // 0
-        "name",            // 1
-        "age",             // 2
-        "address"          // 3
-    };
-    private static final String TABLE_NAME = "test";
-    private Locale mLocale;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        File dbDir = getContext().getDir("tests", Context.MODE_PRIVATE);
-        mDatabaseFile = new File(dbDir, "database_test.db");
-        if (mDatabaseFile.exists()) {
-            mDatabaseFile.delete();
-        }
-        mDatabase = SQLiteDatabase.openOrCreateDatabase(mDatabaseFile.getPath(), null);
-        assertNotNull(mDatabase);
-        mDatabase.execSQL("CREATE TABLE " + TABLE_NAME + " (_id INTEGER PRIMARY KEY, " +
-                "name TEXT, age INTEGER, address TEXT);");
-        mDatabase.execSQL(
-                "CREATE TABLE blob_test (_id INTEGER PRIMARY KEY, name TEXT, data BLOB)");
-        mLocale = DatabaseUtils.getCollatorLocale();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mDatabase.close();
-        mDatabaseFile.delete();
-        DatabaseUtils.setCollatorLocale(mLocale);
-        super.tearDown();
-    }
-
-    public void testAppendEscapedSQLString() {
-        String expected = "name='Mike'";
-        StringBuilder sb = new StringBuilder("name=");
-        DatabaseUtils.appendEscapedSQLString(sb, "Mike");
-        assertEquals(expected, sb.toString());
-
-        expected = "'name=''Mike'''";
-        sb = new StringBuilder();
-        DatabaseUtils.appendEscapedSQLString(sb, "name='Mike'");
-        assertEquals(expected, sb.toString());
-    }
-
-    public void testSqlEscapeString() {
-        String expected = "'Jack'";
-        assertEquals(expected, DatabaseUtils.sqlEscapeString("Jack"));
-    }
-
-    public void testAppendValueToSql() {
-        String expected = "address='LA'";
-        StringBuilder sb = new StringBuilder("address=");
-        DatabaseUtils.appendValueToSql(sb, "LA");
-        assertEquals(expected, sb.toString());
-
-        expected = "address=NULL";
-        sb = new StringBuilder("address=");
-        DatabaseUtils.appendValueToSql(sb, null);
-        assertEquals(expected, sb.toString());
-
-        expected = "flag=1";
-        sb = new StringBuilder("flag=");
-        DatabaseUtils.appendValueToSql(sb, true);
-        assertEquals(expected, sb.toString());
-    }
-
-    public void testBindObjectToProgram() {
-        String name = "Mike";
-        int age = 21;
-        String address = "LA";
-
-        // at the beginning, there are no records in the database.
-        Cursor cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION,
-                null, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(0, cursor.getCount());
-
-        String sql = "INSERT INTO " + TABLE_NAME + " (name, age, address) VALUES (?, ?, ?);";
-        SQLiteStatement statement = mDatabase.compileStatement(sql);
-        DatabaseUtils.bindObjectToProgram(statement, 1, name);
-        DatabaseUtils.bindObjectToProgram(statement, 2, age);
-        DatabaseUtils.bindObjectToProgram(statement, 3, address);
-        statement.execute();
-        statement.close();
-
-        cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToFirst();
-        assertEquals(name, cursor.getString(1));
-        assertEquals(age, cursor.getInt(2));
-        assertEquals(address, cursor.getString(3));
-    }
-
-    public void testCreateDbFromSqlStatements() {
-        String dbName = "ExampleName";
-        String sqls = "CREATE TABLE " + TABLE_NAME + " (_id INTEGER PRIMARY KEY, name TEXT);\n"
-                + "INSERT INTO " + TABLE_NAME + " (name) VALUES ('Mike');\n";
-        DatabaseUtils.createDbFromSqlStatements(getContext(), dbName, 1, sqls);
-
-        SQLiteDatabase db = getContext().openOrCreateDatabase(dbName, 0, null);
-        final String[] PROJECTION = new String[] {
-            "_id",             // 0
-            "name"             // 1
-        };
-        Cursor cursor = db.query(TABLE_NAME, PROJECTION, null, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToFirst();
-        assertEquals("Mike", cursor.getString(1));
-        getContext().deleteDatabase(dbName);
-    }
-
-    public void testCursorDoubleToContentValues() {
-        mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
-                " VALUES ('Mike', '20', 'LA');");
-        Cursor cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION,
-                null, null, null, null, null);
-        assertNotNull(cursor);
-
-        ContentValues contentValues = new ContentValues();
-        String key = "key";
-        cursor.moveToFirst();
-        DatabaseUtils.cursorDoubleToContentValues(cursor, "age", contentValues, key);
-        assertEquals(20.0, contentValues.getAsDouble(key));
-
-        DatabaseUtils.cursorDoubleToContentValues(cursor, "Error Field Name", contentValues, key);
-        assertNull(contentValues.getAsDouble(key));
-
-        DatabaseUtils.cursorDoubleToContentValues(cursor, "name", contentValues, key);
-        assertEquals(0.0, contentValues.getAsDouble(key));
-    }
-
-    public void testCursorDoubleToCursorValues() {
-        mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
-                " VALUES ('Mike', '20', 'LA');");
-        Cursor cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION,
-                null, null, null, null, null);
-        assertNotNull(cursor);
-
-        ContentValues contentValues = new ContentValues();
-        cursor.moveToFirst();
-        DatabaseUtils.cursorDoubleToCursorValues(cursor, "age", contentValues);
-        assertEquals(20.0, contentValues.getAsDouble("age"));
-
-        DatabaseUtils.cursorDoubleToCursorValues(cursor, "Error Field Name", contentValues);
-        assertNull(contentValues.getAsDouble("Error Field Name"));
-
-        DatabaseUtils.cursorDoubleToCursorValues(cursor, "name", contentValues);
-        assertEquals(0.0, contentValues.getAsDouble("name"));
-    }
-
-    public void testCursorIntToContentValues() {
-        mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
-                " VALUES ('Mike', '20', 'LA');");
-        Cursor cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null, null, null, null, null);
-        assertNotNull(cursor);
-
-        ContentValues contentValues = new ContentValues();
-        String key = "key";
-        cursor.moveToFirst();
-        DatabaseUtils.cursorIntToContentValues(cursor, "age", contentValues, key);
-        assertEquals(Integer.valueOf(20), contentValues.getAsInteger(key));
-
-        DatabaseUtils.cursorIntToContentValues(cursor, "Error Field Name", contentValues, key);
-        assertNull(contentValues.getAsInteger(key));
-
-        DatabaseUtils.cursorIntToContentValues(cursor, "name", contentValues, key);
-        assertEquals(Integer.valueOf(0), contentValues.getAsInteger(key));
-
-        contentValues = new ContentValues();
-        DatabaseUtils.cursorIntToContentValues(cursor, "age", contentValues);
-        assertEquals(Integer.valueOf(20), contentValues.getAsInteger("age"));
-
-        DatabaseUtils.cursorIntToContentValues(cursor, "Error Field Name", contentValues);
-        assertNull(contentValues.getAsInteger("Error Field Name"));
-
-        DatabaseUtils.cursorIntToContentValues(cursor, "name", contentValues);
-        assertEquals(Integer.valueOf(0), contentValues.getAsInteger("name"));
-    }
-
-    public void testcursorLongToContentValues() {
-        mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
-                " VALUES ('Mike', '20', 'LA');");
-        Cursor cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null, null, null, null, null);
-        assertNotNull(cursor);
-
-        ContentValues contentValues = new ContentValues();
-        String key = "key";
-        cursor.moveToNext();
-        DatabaseUtils.cursorLongToContentValues(cursor, "age", contentValues, key);
-        assertEquals(Long.valueOf(20), contentValues.getAsLong(key));
-
-        DatabaseUtils.cursorLongToContentValues(cursor, "Error Field Name", contentValues, key);
-        assertNull(contentValues.getAsLong(key));
-
-        DatabaseUtils.cursorLongToContentValues(cursor, "name", contentValues, key);
-        assertEquals(Long.valueOf(0), contentValues.getAsLong(key));
-
-        contentValues = new ContentValues();
-        DatabaseUtils.cursorLongToContentValues(cursor, "age", contentValues);
-        assertEquals(Long.valueOf(20), contentValues.getAsLong("age"));
-
-        DatabaseUtils.cursorLongToContentValues(cursor, "Error Field Name", contentValues);
-        assertNull(contentValues.getAsLong("Error Field Name"));
-
-        DatabaseUtils.cursorLongToContentValues(cursor, "name", contentValues);
-        assertEquals(Long.valueOf(0), contentValues.getAsLong("name"));
-    }
-
-    public void testCursorRowToContentValues() {
-        mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
-                " VALUES ('Mike', '20', 'LA');");
-        Cursor cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION,
-                null, null, null, null, null);
-        assertNotNull(cursor);
-
-        ContentValues contentValues = new ContentValues();
-        cursor.moveToNext();
-        DatabaseUtils.cursorRowToContentValues(cursor, contentValues);
-        assertEquals("Mike", (String) contentValues.get("name"));
-        assertEquals("20", (String) contentValues.get("age"));
-        assertEquals("LA", (String) contentValues.get("address"));
-    }
-
-    public void testCursorStringToContentValues() {
-        mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
-                " VALUES ('Mike', '20', 'LA');");
-        Cursor cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION,
-                null, null, null, null, null);
-        assertNotNull(cursor);
-
-        ContentValues contentValues = new ContentValues();
-        String key = "key";
-        cursor.moveToNext();
-        DatabaseUtils.cursorStringToContentValues(cursor, "age", contentValues, key);
-        assertEquals("20", (String) contentValues.get(key));
-
-        try {
-            DatabaseUtils.cursorStringToContentValues(cursor, "Error Field Name",
-                    contentValues, key);
-            fail("should throw IllegalArgumentException.");
-        } catch (IllegalArgumentException e) {
-            // expected
-        }
-
-        DatabaseUtils.cursorStringToContentValues(cursor, "name", contentValues, key);
-        assertEquals("Mike", contentValues.get(key));
-
-        contentValues = new ContentValues();
-        DatabaseUtils.cursorStringToContentValues(cursor, "age", contentValues);
-        assertEquals("20", contentValues.get("age"));
-
-        try {
-            DatabaseUtils.cursorStringToContentValues(cursor, "Error Field Name", contentValues);
-            fail("should throw IllegalArgumentException.");
-        } catch (IllegalArgumentException e) {
-            // expected
-        }
-
-        DatabaseUtils.cursorStringToContentValues(cursor, "name", contentValues);
-        assertEquals("Mike", contentValues.get("name"));
-    }
-
-    public void testCursorStringToInsertHelper() {
-        // create a new table.
-        mDatabase.execSQL("CREATE TABLE test_copy (_id INTEGER PRIMARY KEY, " +
-                "name TEXT, age INTEGER, address TEXT);");
-
-        mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
-                " VALUES ('Mike', '20', 'LA');");
-        Cursor cursor = mDatabase.query("test_copy", TEST_PROJECTION, null, null, null, null, null);
-        assertEquals(0, cursor.getCount());
-
-        InsertHelper insertHelper = new InsertHelper(mDatabase, "test_copy");
-        int indexName = insertHelper.getColumnIndex("name");
-        int indexAge = insertHelper.getColumnIndex("age");
-        int indexAddress = insertHelper.getColumnIndex("address");
-
-        cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null, null, null, null, null);
-        cursor.moveToNext();
-        insertHelper.prepareForInsert();
-        DatabaseUtils.cursorStringToInsertHelper(cursor, "name", insertHelper, indexName);
-        DatabaseUtils.cursorStringToInsertHelper(cursor, "age", insertHelper, indexAge);
-        DatabaseUtils.cursorStringToInsertHelper(cursor, "address", insertHelper, indexAddress);
-        insertHelper.execute();
-
-        cursor = mDatabase.query("test_copy", TEST_PROJECTION, null, null, null, null, null);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToNext();
-        assertEquals("Mike", cursor.getString(1));
-        assertEquals(20, cursor.getInt(2));
-        assertEquals("LA", cursor.getString(3));
-    }
-
-    public void testDumpCurrentRow() {
-        mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
-                " VALUES ('Mike', '20', 'LA');");
-        Cursor cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION,
-                null, null, null, null, null);
-        assertNotNull(cursor);
-        cursor.moveToNext();
-        String expected = "0 {\n   _id=1\n   name=Mike\n   age=20\n   address=LA\n}\n";
-
-        DatabaseUtils.dumpCurrentRow(cursor);
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        PrintStream os = new PrintStream(bos);
-        DatabaseUtils.dumpCurrentRow(cursor, os);
-        os.flush();
-        os.close();
-        assertEquals(expected, bos.toString());
-
-        StringBuilder sb = new StringBuilder();
-        DatabaseUtils.dumpCurrentRow(cursor, sb);
-        assertEquals(expected, sb.toString());
-
-        assertEquals(expected, DatabaseUtils.dumpCurrentRowToString(cursor));
-    }
-
-    public void testDumpCursor() {
-        mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
-                " VALUES ('Mike', '20', 'LA');");
-        mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
-                " VALUES ('Jack', '30', 'London');");
-        Cursor cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION,
-                null, null, null, null, null);
-        assertNotNull(cursor);
-        int pos = cursor.getPosition();
-        String expected = ">>>>> Dumping cursor " + cursor + "\n" +
-                "0 {\n" +
-                "   _id=1\n" +
-                "   name=Mike\n" +
-                "   age=20\n" +
-                "   address=LA\n" +
-                "}\n" +
-                "1 {\n" +
-                "   _id=2\n" +
-                "   name=Jack\n" +
-                "   age=30\n" +
-                "   address=London\n" +
-                "}\n" +
-                "<<<<<\n";
-
-        DatabaseUtils.dumpCursor(cursor);
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        PrintStream os = new PrintStream(bos);
-        DatabaseUtils.dumpCursor(cursor, os);
-        os.flush();
-        os.close();
-        assertEquals(pos, cursor.getPosition()); // dumpCursor should not change status of cursor
-        assertEquals(expected, bos.toString());
-
-        StringBuilder sb = new StringBuilder();
-        DatabaseUtils.dumpCursor(cursor, sb);
-        assertEquals(pos, cursor.getPosition()); // dumpCursor should not change status of cursor
-        assertEquals(expected, sb.toString());
-
-        assertEquals(expected, DatabaseUtils.dumpCursorToString(cursor));
-        assertEquals(pos, cursor.getPosition()); // dumpCursor should not change status of cursor
-    }
-
-    public void testCollationKey() {
-        String key1 = DatabaseUtils.getCollationKey("abc");
-        String key2 = DatabaseUtils.getCollationKey("ABC");
-        String key3 = DatabaseUtils.getCollationKey("bcd");
-
-        assertTrue(key1.equals(key2));
-        assertFalse(key1.equals(key3));
-
-        key1 = DatabaseUtils.getHexCollationKey("abc");
-        key2 = DatabaseUtils.getHexCollationKey("ABC");
-        key3 = DatabaseUtils.getHexCollationKey("bcd");
-
-        assertTrue(key1.equals(key2));
-        assertFalse(key1.equals(key3));
-    }
-
-    public void testLongForQuery() {
-        mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
-                " VALUES ('Mike', '20', 'LA');");
-
-        String query = "SELECT age FROM " + TABLE_NAME;
-        assertEquals(20, DatabaseUtils.longForQuery(mDatabase, query, null));
-
-        mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
-                " VALUES ('Jack', '35', 'London');");
-        query = "SELECT age FROM " + TABLE_NAME + " WHERE name = ?";
-        String[] args = new String[] { "Jack" };
-        assertEquals(35, DatabaseUtils.longForQuery(mDatabase, query, args));
-        args = new String[] { "No such name" };
-        try {
-            DatabaseUtils.longForQuery(mDatabase, query, args);
-            fail("should throw SQLiteDoneException");
-        } catch (SQLiteDoneException e) {
-            // expected
-        }
-
-        query = "SELECT count(*) FROM " + TABLE_NAME + ";";
-        SQLiteStatement statement = mDatabase.compileStatement(query);
-        assertEquals(2, DatabaseUtils.longForQuery(statement, null));
-
-        query = "SELECT age FROM " + TABLE_NAME + " WHERE address = ?;";
-        statement = mDatabase.compileStatement(query);
-        args = new String[] { "London" };
-        assertEquals(35, DatabaseUtils.longForQuery(statement, args));
-
-        args = new String[] { "No such address" };
-        try {
-            DatabaseUtils.longForQuery(statement, args);
-            fail("should throw SQLiteDoneException");
-        } catch (SQLiteDoneException e) {
-            // expected
-        }
-        statement.close();
-    }
-
-    public void testQueryNumEntries() {
-        assertEquals(0, DatabaseUtils.queryNumEntries(mDatabase, TABLE_NAME));
-
-        mDatabase.execSQL(
-                "INSERT INTO " + TABLE_NAME + " (name, age, address)" +
-                " VALUES ('Mike', '20', 'LA');");
-        assertEquals(1, DatabaseUtils.queryNumEntries(mDatabase, TABLE_NAME));
-
-        mDatabase.execSQL(
-                "INSERT INTO " + TABLE_NAME + " (name, age, address)" +
-                " VALUES ('Susan', '20', 'AR');");
-        assertEquals(2, DatabaseUtils.queryNumEntries(mDatabase, TABLE_NAME));
-
-        mDatabase.execSQL(
-                "INSERT INTO " + TABLE_NAME + " (name, age, address)" +
-                " VALUES ('Christian', '25', 'AT');");
-        assertEquals(3, DatabaseUtils.queryNumEntries(mDatabase, TABLE_NAME));
-
-        assertEquals(2, DatabaseUtils.queryNumEntries(mDatabase, TABLE_NAME, "AGE = 20"));
-
-        assertEquals(1, DatabaseUtils.queryNumEntries(mDatabase, TABLE_NAME, "AGE = ?",
-                new String[] { "25" }));
-
-        try {
-            DatabaseUtils.queryNumEntries(mDatabase, "NoSuchTable");
-            fail("should throw SQLiteException.");
-        } catch (SQLiteException e) {
-            // expected
-        }
-    }
-
-    public void testExceptionFromParcel() {
-        Parcel parcel = Parcel.obtain();
-        DatabaseUtils.writeExceptionToParcel(parcel, new IllegalArgumentException());
-        parcel.setDataPosition(0);
-        try {
-            DatabaseUtils.readExceptionFromParcel(parcel);
-            fail("should throw IllegalArgumentException.");
-        } catch (IllegalArgumentException e) {
-            // expected
-        }
-
-        parcel = Parcel.obtain();
-        DatabaseUtils.writeExceptionToParcel(parcel, new SQLiteAbortException());
-        parcel.setDataPosition(0);
-        try {
-            DatabaseUtils.readExceptionFromParcel(parcel);
-            fail("should throw SQLiteAbortException.");
-        } catch (SQLiteAbortException e) {
-            // expected
-        }
-
-        parcel = Parcel.obtain();
-        DatabaseUtils.writeExceptionToParcel(parcel, new FileNotFoundException());
-        parcel.setDataPosition(0);
-        try {
-            DatabaseUtils.readExceptionFromParcel(parcel);
-            fail("should throw RuntimeException.");
-        } catch (RuntimeException e) {
-            // expected
-        }
-
-        parcel = Parcel.obtain();
-        DatabaseUtils.writeExceptionToParcel(parcel, new FileNotFoundException());
-        parcel.setDataPosition(0);
-        try {
-            DatabaseUtils.readExceptionWithFileNotFoundExceptionFromParcel(parcel);
-            fail("should throw FileNotFoundException.");
-        } catch (FileNotFoundException e) {
-            // expected
-        }
-    }
-
-    public void testStringForQuery() {
-        mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
-                " VALUES ('Mike', '20', 'LA');");
-
-        String query = "SELECT name FROM " + TABLE_NAME;
-        assertEquals("Mike", DatabaseUtils.stringForQuery(mDatabase, query, null));
-
-        mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
-                " VALUES ('Jack', '35', 'London');");
-        query = "SELECT name FROM " + TABLE_NAME + " WHERE address = ?";
-        String[] args = new String[] { "London" };
-        assertEquals("Jack", DatabaseUtils.stringForQuery(mDatabase, query, args));
-        args = new String[] { "No such address" };
-        try {
-            DatabaseUtils.stringForQuery(mDatabase, query, args);
-            fail("should throw SQLiteDoneException");
-        } catch (SQLiteDoneException e) {
-            // expected
-        }
-
-        query = "SELECT name FROM " + TABLE_NAME + " WHERE age = ?;";
-        SQLiteStatement statement = mDatabase.compileStatement(query);
-        args = new String[] { "20" };
-        assertEquals("Mike", DatabaseUtils.stringForQuery(statement, args));
-
-        args = new String[] { "1000" }; // NO people can be older than this.
-        try {
-            DatabaseUtils.blobFileDescriptorForQuery(statement, args);
-            fail("should throw SQLiteDoneException");
-        } catch (SQLiteDoneException e) {
-            // expected
-        }
-        statement.close();
-    }
-
-    public void testBlobFileDescriptorForQuery() throws Exception {
-        String data1 = "5300FEFF";
-        String data2 = "DECAFBAD";
-        mDatabase.execSQL("INSERT INTO blob_test (name, data) VALUES ('Mike', X'" + data1 + "')");
-
-        String query = "SELECT data FROM blob_test";
-        assertFileDescriptorContent(parseBlob(data1),
-                        DatabaseUtils.blobFileDescriptorForQuery(mDatabase, query, null));
-
-        mDatabase.execSQL("INSERT INTO blob_test (name, data) VALUES ('Jack', X'" + data2 + "');");
-        query = "SELECT data FROM blob_test WHERE name = ?";
-        String[] args = new String[] { "Jack" };
-        assertFileDescriptorContent(parseBlob(data2),
-                DatabaseUtils.blobFileDescriptorForQuery(mDatabase, query, args));
-
-        args = new String[] { "No such name" };
-        try {
-            DatabaseUtils.stringForQuery(mDatabase, query, args);
-            fail("should throw SQLiteDoneException");
-        } catch (SQLiteDoneException e) {
-            // expected
-        }
-
-        query = "SELECT data FROM blob_test WHERE name = ?;";
-        SQLiteStatement statement = mDatabase.compileStatement(query);
-        args = new String[] { "Mike" };
-        assertFileDescriptorContent(parseBlob(data1),
-                DatabaseUtils.blobFileDescriptorForQuery(statement, args));
-
-        args = new String[] { "No such name" };
-        try {
-            DatabaseUtils.blobFileDescriptorForQuery(statement, args);
-            fail("should throw SQLiteDoneException");
-        } catch (SQLiteDoneException e) {
-            // expected
-        }
-        statement.close();
-    }
-
-    private static byte[] parseBlob(String src) {
-        int len = src.length();
-        byte[] result = new byte[len / 2];
-
-        for (int i = 0; i < len / 2; i++) {
-            int val;
-            char c1 = src.charAt(i * 2);
-            char c2 = src.charAt(i * 2 + 1);
-            int val1 = Character.digit(c1, 16);
-            int val2 = Character.digit(c2, 16);
-            val = (val1 << 4) | val2;
-            result[i] = (byte) val;
-        }
-        return result;
-    }
-
-    private static void assertFileDescriptorContent(byte[] expected, ParcelFileDescriptor fd)
-            throws IOException {
-        assertInputStreamContent(expected, new ParcelFileDescriptor.AutoCloseInputStream(fd));
-    }
-
-    private static void assertInputStreamContent(byte[] expected, InputStream is)
-            throws IOException {
-        try {
-            byte[] observed = new byte[expected.length];
-            int count = is.read(observed);
-            assertEquals(expected.length, count);
-            assertEquals(-1, is.read());
-            MoreAsserts.assertEquals(expected, observed);
-        } finally {
-            is.close();
-        }
-    }
-
-    public void testGetCollatorLocale() {
-
-        //set Locale
-        String language = "en_";
-        String country = "EN";
-        Locale locale = new Locale(language, country);
-        DatabaseUtils.setCollatorLocale(locale);
-
-        // get Locale
-        Locale tempLocale = DatabaseUtils.getCollatorLocale();
-
-        assertTrue(language.equals(tempLocale.getLanguage()));
-        assertTrue(country.equals(tempLocale.getCountry()));
-
-    }
-
-    public void testSetCollatorLocale() {
-
-        //set Locale
-        String language = "zh_";
-        String country = "ZH";
-        Locale locale = new Locale(language, country);
-        DatabaseUtils.setCollatorLocale(locale);
-
-        // get Locale
-        Locale tempLocale = DatabaseUtils.getCollatorLocale();
-
-        assertTrue(language.equals(tempLocale.getLanguage()));
-        assertTrue(country.equals(tempLocale.getCountry()));
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/cts/DatabaseUtils_InsertHelperTest.java b/proprietary/frameworks/base/tests/database/src/android/database/cts/DatabaseUtils_InsertHelperTest.java
deleted file mode 100755
index d72b78d1b97ee4cd8b9689554ec14192c162dd75..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/cts/DatabaseUtils_InsertHelperTest.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.cts;
-
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.DatabaseUtils.InsertHelper;
-import android.database.sqlite.SQLiteDatabase;
-import android.test.AndroidTestCase;
-import android.test.MoreAsserts;
-
-public class DatabaseUtils_InsertHelperTest extends AndroidTestCase {
-    private static final String TEST_TABLE_NAME = "test";
-    private static final String DATABASE_NAME = "database_test.db";
-
-    private SQLiteDatabase mDatabase;
-    private InsertHelper mInsertHelper;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        getContext().deleteDatabase(DATABASE_NAME);
-        mDatabase = getContext().openOrCreateDatabase(DATABASE_NAME, Context.MODE_PRIVATE, null);
-        assertNotNull(mDatabase);
-        mInsertHelper = new InsertHelper(mDatabase, TEST_TABLE_NAME);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mInsertHelper.close();
-        mDatabase.close();
-        getContext().deleteDatabase(DATABASE_NAME);
-        super.tearDown();
-    }
-
-    public void testConstructor() {
-        new InsertHelper(mDatabase, TEST_TABLE_NAME);
-    }
-
-    public void testClose() {
-        mInsertHelper.close();
-    }
-
-    public void testGetColumnIndex() {
-        mDatabase.execSQL("CREATE TABLE " + TEST_TABLE_NAME + " (_id INTEGER PRIMARY KEY, " +
-                "name TEXT, age INTEGER, address TEXT);");
-        assertEquals(1, mInsertHelper.getColumnIndex("_id"));
-        assertEquals(2, mInsertHelper.getColumnIndex("name"));
-        assertEquals(3, mInsertHelper.getColumnIndex("age"));
-        assertEquals(4, mInsertHelper.getColumnIndex("address"));
-        try {
-            mInsertHelper.getColumnIndex("missing_column");
-            fail("Should throw exception (column does not exist)");
-        } catch (IllegalArgumentException expected) {
-            // expected
-        }
-    }
-
-    public void testInsert() {
-        mDatabase.execSQL("CREATE TABLE " + TEST_TABLE_NAME + "(_id INTEGER PRIMARY KEY," +
-                " boolean_value INTEGER, int_value INTEGER, long_value INTEGER," +
-                " double_value DOUBLE, float_value DOUBLE, string_value TEXT," +
-                " blob_value BLOB, null_value TEXT);");
-        final int booleanValueIndex = 1;
-        final int intValueIndex     = 2;
-        final int longValueIndex    = 3;
-        final int doubleValueIndex  = 4;
-        final int floatValueIndex   = 5;
-        final int stringValueIndex  = 6;
-        final int blobValueIndex    = 7;
-        final int nullValueIndex    = 8;
-        final String[] projection = new String[] {
-            "_id",                    // index 0
-            "boolean_value",          // index 1
-            "int_value",              // index 2
-            "long_value",             // index 3
-            "double_value",           // index 4
-            "float_value",            // index 5
-            "string_value",           // index 6
-            "blob_value",             // index 7
-            "null_value"              // index 8
-        };
-
-        Cursor cursor = mDatabase.query(TEST_TABLE_NAME, projection, null, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(0, cursor.getCount());
-        cursor.close();
-
-        try {
-            mInsertHelper.execute();
-            fail("Should throw exception (execute without prepare)");
-        } catch (IllegalStateException expected) {
-            // expected
-        }
-
-        mInsertHelper.prepareForInsert();
-        mInsertHelper.bind(mInsertHelper.getColumnIndex("boolean_value"), true);
-        mInsertHelper.bind(mInsertHelper.getColumnIndex("int_value"), 10);
-        mInsertHelper.bind(mInsertHelper.getColumnIndex("long_value"), 1000L);
-        mInsertHelper.bind(mInsertHelper.getColumnIndex("double_value"), 123.456);
-        mInsertHelper.bind(mInsertHelper.getColumnIndex("float_value"), 1.0f);
-        mInsertHelper.bind(mInsertHelper.getColumnIndex("string_value"), "test insert");
-        byte[] blob = new byte[] { '1', '2', '3' };
-        mInsertHelper.bind(mInsertHelper.getColumnIndex("blob_value"), blob);
-        mInsertHelper.bindNull(mInsertHelper.getColumnIndex("null_value"));
-        long id = mInsertHelper.execute();
-        assertEquals(1, id);
-
-        cursor = mDatabase.query(TEST_TABLE_NAME, projection, null, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToFirst();
-        assertEquals(1, cursor.getInt(booleanValueIndex));
-        assertEquals(10, cursor.getInt(intValueIndex));
-        assertEquals(1000L, cursor.getLong(longValueIndex));
-        assertEquals(123.456, cursor.getDouble(doubleValueIndex));
-        assertEquals(1.0f, cursor.getFloat(floatValueIndex));
-        assertEquals("test insert", cursor.getString(stringValueIndex));
-        byte[] value = cursor.getBlob(blobValueIndex);
-        MoreAsserts.assertEquals(blob, value);
-        assertNull(cursor.getString(nullValueIndex));
-        cursor.close();
-
-        // try inserting a conflicting column -> should return -1
-        mInsertHelper.prepareForInsert();
-        mInsertHelper.bind(mInsertHelper.getColumnIndex("_id"), id);
-        assertEquals(-1, mInsertHelper.execute());
-
-        // subsequent insert() should ignore existing bindings
-        ContentValues values = new ContentValues();
-        values.put("boolean_value", false);
-        values.put("int_value", 123);
-        values.put("long_value", 987654L);
-        values.put("double_value", 654.321);
-        values.put("float_value", 21.1f);
-        values.put("string_value", "insert another row");
-        values.put("blob_value", blob);
-        values.putNull("null_value");
-        id = mInsertHelper.insert(values);
-        assertEquals(2, id);
-        cursor = mDatabase.query(TEST_TABLE_NAME, projection, "_id = " + id,
-                null, null, null, null);
-        assertNotNull(cursor);
-        cursor.moveToFirst();
-        assertEquals(0, cursor.getInt(booleanValueIndex));
-        assertEquals(123, cursor.getInt(intValueIndex));
-        assertEquals(987654L, cursor.getLong(longValueIndex));
-        assertEquals(654.321, cursor.getDouble(doubleValueIndex));
-        assertEquals(21.1f, cursor.getFloat(floatValueIndex));
-        assertEquals("insert another row", cursor.getString(stringValueIndex));
-        value = cursor.getBlob(blobValueIndex);
-        MoreAsserts.assertEquals(blob, value);
-        assertNull(cursor.getString(nullValueIndex));
-        cursor.close();
-
-        // try inserting a conflicting column -> should return -1
-        values.put("_id", id);
-        assertEquals(-1, mInsertHelper.insert(values));
-    }
-
-    public void testReplace() {
-        mDatabase.execSQL("CREATE TABLE " + TEST_TABLE_NAME + "(_id INTEGER PRIMARY KEY," +
-                " boolean_value INTEGER, int_value INTEGER, long_value INTEGER," +
-                " double_value DOUBLE, float_value DOUBLE, string_value TEXT," +
-                " blob_value BLOB, null_value TEXT);");
-        final int booleanValueIndex = 1;
-        final int intValueIndex     = 2;
-        final int longValueIndex    = 3;
-        final int doubleValueIndex  = 4;
-        final int floatValueIndex   = 5;
-        final int stringValueIndex  = 6;
-        final int blobValueIndex    = 7;
-        final int nullValueIndex    = 8;
-        final String[] projection = new String[] {
-            "_id",                    // index 0
-            "boolean_value",          // index 1
-            "int_value",              // index 2
-            "long_value",             // index 3
-            "double_value",           // index 4
-            "float_value",            // index 5
-            "string_value",           // index 6
-            "blob_value",             // index 7
-            "null_value"              // index 8
-        };
-
-        Cursor cursor = mDatabase.query(TEST_TABLE_NAME, projection, null, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(0, cursor.getCount());
-        cursor.close();
-
-        // without specifying a key, this becomes an insert
-        mInsertHelper.prepareForReplace();
-        mInsertHelper.bind(mInsertHelper.getColumnIndex("boolean_value"), true);
-        mInsertHelper.bind(mInsertHelper.getColumnIndex("int_value"), 10);
-        mInsertHelper.bind(mInsertHelper.getColumnIndex("long_value"), 1000L);
-        mInsertHelper.bind(mInsertHelper.getColumnIndex("double_value"), 123.456);
-        mInsertHelper.bind(mInsertHelper.getColumnIndex("float_value"), 1.0f);
-        mInsertHelper.bind(mInsertHelper.getColumnIndex("string_value"), "test insert");
-        byte[] blob = new byte[] { '1', '2', '3' };
-        mInsertHelper.bind(mInsertHelper.getColumnIndex("blob_value"), blob);
-        mInsertHelper.bindNull(mInsertHelper.getColumnIndex("null_value"));
-        long id = mInsertHelper.execute();
-        assertEquals(1, id);
-
-        cursor = mDatabase.query(TEST_TABLE_NAME, projection, null, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToFirst();
-        assertEquals(1, cursor.getInt(booleanValueIndex));
-        assertEquals(10, cursor.getInt(intValueIndex));
-        assertEquals(1000L, cursor.getLong(longValueIndex));
-        assertEquals(123.456, cursor.getDouble(doubleValueIndex));
-        assertEquals(1.0f, cursor.getFloat(floatValueIndex));
-        assertEquals("test insert", cursor.getString(stringValueIndex));
-        byte[] value = cursor.getBlob(blobValueIndex);
-        MoreAsserts.assertEquals(blob, value);
-        assertNull(cursor.getString(nullValueIndex));
-        cursor.close();
-
-        mInsertHelper.prepareForReplace();
-        mInsertHelper.bind(mInsertHelper.getColumnIndex("_id"), id);
-        mInsertHelper.bind(mInsertHelper.getColumnIndex("int_value"), 42);
-        mInsertHelper.execute();
-        cursor = mDatabase.query(TEST_TABLE_NAME, projection, null, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToFirst();
-        assertEquals(42, cursor.getInt(intValueIndex));
-        // previous bindings are forgotten
-        assertNull(cursor.getString(stringValueIndex));
-        cursor.close();
-
-        // illegal primary key -> should return -1
-        mInsertHelper.prepareForReplace();
-        mInsertHelper.bind(mInsertHelper.getColumnIndex("_id"), "illegal_id");
-        assertEquals(-1, mInsertHelper.execute());
-
-        ContentValues values = new ContentValues();
-        // will replace row id
-        values.put("_id", id);
-        values.put("boolean_value", false);
-        values.put("int_value", 123);
-        values.put("long_value", 987654L);
-        values.put("double_value", 654.321);
-        values.put("float_value", 21.1f);
-        values.put("string_value", "replace the row");
-        values.put("blob_value", blob);
-        values.putNull("null_value");
-        id = mInsertHelper.replace(values);
-        assertEquals(1, id);
-        cursor = mDatabase.query(TEST_TABLE_NAME, projection, null, null, null, null, null);
-        assertEquals(1, cursor.getCount());
-        assertNotNull(cursor);
-        cursor.moveToFirst();
-        assertEquals(0, cursor.getInt(booleanValueIndex));
-        assertEquals(123, cursor.getInt(intValueIndex));
-        assertEquals(987654L, cursor.getLong(longValueIndex));
-        assertEquals(654.321, cursor.getDouble(doubleValueIndex));
-        assertEquals(21.1f, cursor.getFloat(floatValueIndex));
-        assertEquals("replace the row", cursor.getString(stringValueIndex));
-        value = cursor.getBlob(blobValueIndex);
-        MoreAsserts.assertEquals(blob, value);
-        assertNull(cursor.getString(nullValueIndex));
-        cursor.close();
-
-        // illegal primary key -> should return -1
-        values.put("_id", "illegal_id");
-        assertEquals(-1, mInsertHelper.replace(values));
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/cts/MatrixCursorTest.java b/proprietary/frameworks/base/tests/database/src/android/database/cts/MatrixCursorTest.java
deleted file mode 100755
index 689c2a62264b0d2206eb80b5ee73b6bee3ef1cac..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/cts/MatrixCursorTest.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.cts;
-
-
-import android.database.CursorIndexOutOfBoundsException;
-import android.database.MatrixCursor;
-import android.database.MatrixCursor.RowBuilder;
-
-import java.util.ArrayList;
-
-import junit.framework.TestCase;
-
-public class MatrixCursorTest extends TestCase {
-    private static final String COLUMN0_NAME = "column0";
-
-    private static final String COLUMN1_NAME = "column1";
-
-    private static final String COLUMN2_NAME = "column2";
-
-    private static final int COLUMN0_INDEX = 0;
-
-    private static final int COLUMN1_INDEX = 1;
-
-    private static final int COLUMN2_INDEX = 2;
-
-    private MatrixCursor mMatrixCursor;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mMatrixCursor = new MatrixCursor(new String[] { COLUMN0_NAME, COLUMN1_NAME, COLUMN2_NAME });
-    }
-
-    public void testMatrixCursor() {
-        new MatrixCursor(new String[0]);
-
-        new MatrixCursor(new String[] { COLUMN0_NAME }, 10);
-    }
-
-    public void testNewRow() {
-        assertEquals(0, mMatrixCursor.getCount());
-        RowBuilder builder = mMatrixCursor.newRow();
-        assertNotNull(builder);
-        assertEquals(1, mMatrixCursor.getCount());
-        mMatrixCursor.moveToFirst();
-        assertTrue(mMatrixCursor.isNull(COLUMN0_INDEX));
-        assertTrue(mMatrixCursor.isNull(COLUMN1_INDEX));
-        assertTrue(mMatrixCursor.isNull(COLUMN2_INDEX));
-
-        builder.add(Integer.MIN_VALUE);
-        assertFalse(mMatrixCursor.isNull(COLUMN0_INDEX));
-        assertEquals(Integer.MIN_VALUE, mMatrixCursor.getInt(COLUMN0_INDEX));
-        assertTrue(mMatrixCursor.isNull(COLUMN1_INDEX));
-        assertTrue(mMatrixCursor.isNull(COLUMN2_INDEX));
-
-        builder.add(0);
-        assertFalse(mMatrixCursor.isNull(COLUMN0_INDEX));
-        assertEquals(Integer.MIN_VALUE, mMatrixCursor.getInt(COLUMN0_INDEX));
-        assertFalse(mMatrixCursor.isNull(COLUMN1_INDEX));
-        assertEquals(0, mMatrixCursor.getInt(COLUMN1_INDEX));
-        assertTrue(mMatrixCursor.isNull(COLUMN2_INDEX));
-
-        builder.add(Integer.MAX_VALUE);
-        assertFalse(mMatrixCursor.isNull(COLUMN0_INDEX));
-        assertEquals(Integer.MIN_VALUE, mMatrixCursor.getInt(COLUMN0_INDEX));
-        assertFalse(mMatrixCursor.isNull(COLUMN1_INDEX));
-        assertEquals(0, mMatrixCursor.getInt(COLUMN1_INDEX));
-        assertFalse(mMatrixCursor.isNull(COLUMN2_INDEX));
-        assertEquals(Integer.MAX_VALUE, mMatrixCursor.getInt(COLUMN2_INDEX));
-
-        try {
-            builder.add(1);
-            fail("Should throw CursorIndexOutOfBoundsException when adding too many values");
-        } catch (CursorIndexOutOfBoundsException e) {
-            // expected
-        }
-
-        assertNotNull(mMatrixCursor.newRow());
-        assertEquals(2, mMatrixCursor.getCount());
-    }
-
-    public void testAddRow() {
-        assertEquals(0, mMatrixCursor.getCount());
-
-        mMatrixCursor.addRow(new Long[] { Long.MIN_VALUE, 0L, Long.MAX_VALUE });
-        assertEquals(1, mMatrixCursor.getCount());
-        mMatrixCursor.moveToLast();
-        assertFalse(mMatrixCursor.isNull(COLUMN0_INDEX));
-        assertEquals(Long.MIN_VALUE, mMatrixCursor.getLong(COLUMN0_INDEX));
-        assertFalse(mMatrixCursor.isNull(COLUMN1_INDEX));
-        assertEquals(0, mMatrixCursor.getLong(COLUMN1_INDEX));
-        assertFalse(mMatrixCursor.isNull(COLUMN2_INDEX));
-        assertEquals(Long.MAX_VALUE, mMatrixCursor.getLong(COLUMN2_INDEX));
-
-        try {
-            mMatrixCursor.addRow(new Long[2]);
-            fail("Should throw IllegalArgumentException if values does not have the same length "
-                    + "as the columns");
-        } catch (IllegalArgumentException e) {
-            // expected
-        }
-
-        try {
-            mMatrixCursor.addRow(new Long[4]);
-            fail("Should throw IllegalArgumentException if values does not have the same length "
-                    + "as the columns");
-        } catch (IllegalArgumentException e) {
-            // expected
-        }
-
-        ArrayList<String> values = new ArrayList<String>();
-        values.add("value0");
-        values.add("value1");
-        try {
-            mMatrixCursor.addRow(values);
-            fail("Should throw IllegalArgumentException if values does not have the same length "
-                    + "as the columns");
-        } catch (IllegalArgumentException e) {
-            // expected
-        }
-
-        values.add("value2");
-        mMatrixCursor.addRow(values);
-        assertEquals(2, mMatrixCursor.getCount());
-        mMatrixCursor.moveToLast();
-        assertFalse(mMatrixCursor.isNull(COLUMN0_INDEX));
-        assertEquals("value0", mMatrixCursor.getString(COLUMN0_INDEX));
-        assertFalse(mMatrixCursor.isNull(COLUMN1_INDEX));
-        assertEquals("value1", mMatrixCursor.getString(COLUMN1_INDEX));
-        assertFalse(mMatrixCursor.isNull(COLUMN2_INDEX));
-        assertEquals("value2", mMatrixCursor.getString(COLUMN2_INDEX));
-
-        values.add("value3");
-        try {
-            mMatrixCursor.addRow(values);
-            fail("Should throw IllegalArgumentException if values does not have the same length "
-                    + "as the columns");
-        } catch (IllegalArgumentException e) {
-            // expected
-        }
-    }
-
-    public void testGetColumnNames() {
-        String[] names = mMatrixCursor.getColumnNames();
-        assertEquals(3, names.length);
-        assertEquals(COLUMN0_NAME, names[0]);
-        assertEquals(COLUMN1_NAME, names[1]);
-        assertEquals(COLUMN2_NAME, names[2]);
-
-        // the following methods from super class will call {@link MatrixCursor#getColumnNames()}
-        assertEquals(COLUMN0_INDEX, mMatrixCursor.getColumnIndex(COLUMN0_NAME));
-        assertEquals(COLUMN1_INDEX, mMatrixCursor.getColumnIndex(COLUMN1_NAME));
-        assertEquals(COLUMN2_INDEX, mMatrixCursor.getColumnIndex(COLUMN2_NAME));
-    }
-
-    public void testGetters() {
-        mMatrixCursor.addRow(new Short[] { Short.MIN_VALUE, 0, Short.MAX_VALUE });
-        mMatrixCursor.moveToLast();
-        assertFalse(mMatrixCursor.isNull(COLUMN0_INDEX));
-        assertFalse(mMatrixCursor.isNull(COLUMN1_INDEX));
-        assertFalse(mMatrixCursor.isNull(COLUMN2_INDEX));
-
-        // numbers can be converted to each other and strings
-        assertEquals(Short.MIN_VALUE, mMatrixCursor.getShort(COLUMN0_INDEX));
-        assertEquals(0, mMatrixCursor.getShort(COLUMN1_INDEX));
-        assertEquals(Short.MAX_VALUE, mMatrixCursor.getShort(COLUMN2_INDEX));
-
-        assertEquals(Short.MIN_VALUE, mMatrixCursor.getInt(COLUMN0_INDEX));
-        assertEquals(0, mMatrixCursor.getInt(COLUMN1_INDEX));
-        assertEquals(Short.MAX_VALUE, mMatrixCursor.getInt(COLUMN2_INDEX));
-
-        assertEquals(Short.MIN_VALUE, mMatrixCursor.getLong(COLUMN0_INDEX));
-        assertEquals(0, mMatrixCursor.getLong(COLUMN1_INDEX));
-        assertEquals(Short.MAX_VALUE, mMatrixCursor.getLong(COLUMN2_INDEX));
-
-        assertEquals(-32768f, mMatrixCursor.getFloat(COLUMN0_INDEX), 0.0f);
-        assertEquals(0f, mMatrixCursor.getFloat(COLUMN1_INDEX), 0.0f);
-        assertEquals(32767f, mMatrixCursor.getFloat(COLUMN2_INDEX), 0.0f);
-
-        assertEquals(-32768d, mMatrixCursor.getDouble(COLUMN0_INDEX), 0.0d);
-        assertEquals(0d, mMatrixCursor.getDouble(COLUMN1_INDEX), 0.0d);
-        assertEquals(32767d, mMatrixCursor.getDouble(COLUMN2_INDEX), 0.0d);
-
-        assertEquals("-32768", mMatrixCursor.getString(COLUMN0_INDEX));
-        assertEquals("0", mMatrixCursor.getString(COLUMN1_INDEX));
-        assertEquals("32767", mMatrixCursor.getString(COLUMN2_INDEX));
-
-        mMatrixCursor.addRow(new Double[] { Double.MIN_VALUE, 0d, Double.MAX_VALUE });
-        mMatrixCursor.moveToLast();
-        assertFalse(mMatrixCursor.isNull(COLUMN0_INDEX));
-        assertFalse(mMatrixCursor.isNull(COLUMN1_INDEX));
-        assertFalse(mMatrixCursor.isNull(COLUMN2_INDEX));
-
-        // numbers can be converted to each other but loose accuracy
-        assertEquals(0, mMatrixCursor.getShort(COLUMN0_INDEX));
-        assertEquals(0, mMatrixCursor.getShort(COLUMN1_INDEX));
-        assertEquals(-1, mMatrixCursor.getShort(COLUMN2_INDEX));
-
-        assertEquals(0, mMatrixCursor.getInt(COLUMN0_INDEX));
-        assertEquals(0, mMatrixCursor.getInt(COLUMN1_INDEX));
-        assertEquals(Integer.MAX_VALUE, mMatrixCursor.getInt(COLUMN2_INDEX));
-
-        assertEquals(0, mMatrixCursor.getLong(COLUMN0_INDEX));
-        assertEquals(0, mMatrixCursor.getLong(COLUMN1_INDEX));
-        assertEquals(Long.MAX_VALUE, mMatrixCursor.getLong(COLUMN2_INDEX));
-
-        assertEquals(0.0f, mMatrixCursor.getFloat(COLUMN0_INDEX), 0.0f);
-        assertEquals(0f, mMatrixCursor.getFloat(COLUMN1_INDEX), 0.0f);
-        assertEquals(Float.POSITIVE_INFINITY, mMatrixCursor.getFloat(COLUMN2_INDEX), 0.0f);
-
-        assertEquals(Double.MIN_VALUE, mMatrixCursor.getDouble(COLUMN0_INDEX), 0.0d);
-        assertEquals(0d, mMatrixCursor.getDouble(COLUMN1_INDEX), 0.0d);
-        assertEquals(Double.MAX_VALUE, mMatrixCursor.getDouble(COLUMN2_INDEX), 0.0d);
-
-        assertEquals(Double.toString(Double.MIN_VALUE), mMatrixCursor.getString(COLUMN0_INDEX));
-        assertEquals(Double.toString(0d), mMatrixCursor.getString(COLUMN1_INDEX));
-        assertEquals(Double.toString(Double.MAX_VALUE), mMatrixCursor.getString(COLUMN2_INDEX));
-
-        mMatrixCursor.addRow(new String[] { "-1", "0", "1" });
-        mMatrixCursor.moveToLast();
-        assertFalse(mMatrixCursor.isNull(COLUMN0_INDEX));
-        assertFalse(mMatrixCursor.isNull(COLUMN1_INDEX));
-        assertFalse(mMatrixCursor.isNull(COLUMN2_INDEX));
-        // strings can be converted to numbers
-        assertEquals(-1, mMatrixCursor.getShort(COLUMN0_INDEX));
-        assertEquals(0, mMatrixCursor.getShort(COLUMN1_INDEX));
-        assertEquals(1, mMatrixCursor.getShort(COLUMN2_INDEX));
-
-        assertEquals(-1, mMatrixCursor.getInt(COLUMN0_INDEX));
-        assertEquals(0, mMatrixCursor.getInt(COLUMN1_INDEX));
-        assertEquals(1, mMatrixCursor.getInt(COLUMN2_INDEX));
-
-        assertEquals(-1, mMatrixCursor.getLong(COLUMN0_INDEX));
-        assertEquals(0, mMatrixCursor.getLong(COLUMN1_INDEX));
-        assertEquals(1, mMatrixCursor.getLong(COLUMN2_INDEX));
-
-        assertEquals(-1f, mMatrixCursor.getFloat(COLUMN0_INDEX), 0.0f);
-        assertEquals(0f, mMatrixCursor.getFloat(COLUMN1_INDEX), 0.0f);
-        assertEquals(1f, mMatrixCursor.getFloat(COLUMN2_INDEX), 0.0f);
-
-        assertEquals(-1d, mMatrixCursor.getDouble(COLUMN0_INDEX), 0.0d);
-        assertEquals(0f, mMatrixCursor.getDouble(COLUMN1_INDEX), 0.0d);
-        assertEquals(1d, mMatrixCursor.getDouble(COLUMN2_INDEX), 0.0d);
-
-        assertEquals("-1", mMatrixCursor.getString(COLUMN0_INDEX));
-        assertEquals("0", mMatrixCursor.getString(COLUMN1_INDEX));
-        assertEquals("1", mMatrixCursor.getString(COLUMN2_INDEX));
-
-        mMatrixCursor.addRow(new String[] { "1.0E2", "0xff", "not number" });
-        mMatrixCursor.moveToLast();
-        assertFalse(mMatrixCursor.isNull(COLUMN0_INDEX));
-        assertFalse(mMatrixCursor.isNull(COLUMN1_INDEX));
-        assertFalse(mMatrixCursor.isNull(COLUMN2_INDEX));
-        assertEquals("1.0E2", mMatrixCursor.getString(COLUMN0_INDEX));
-        assertEquals("0xff", mMatrixCursor.getString(COLUMN1_INDEX));
-        assertEquals("not number", mMatrixCursor.getString(COLUMN2_INDEX));
-
-        assertEquals(100f, mMatrixCursor.getFloat(COLUMN0_INDEX), 0.0f);
-        // strings can not be converted to numbers
-        try {
-            mMatrixCursor.getShort(COLUMN1_INDEX);
-            fail("Should throw NumberFormatException");
-        } catch (NumberFormatException e) {
-            // expected
-        }
-
-        try {
-            mMatrixCursor.getShort(COLUMN2_INDEX);
-            fail("Should throw NumberFormatException");
-        } catch (NumberFormatException e) {
-            // expected
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/cts/MatrixCursor_RowBuilderTest.java b/proprietary/frameworks/base/tests/database/src/android/database/cts/MatrixCursor_RowBuilderTest.java
deleted file mode 100755
index c5004d86753d817b7843c31a1db37d5e2975f0fb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/cts/MatrixCursor_RowBuilderTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.cts;
-
-
-import android.database.CursorIndexOutOfBoundsException;
-import android.database.MatrixCursor;
-import android.database.MatrixCursor.RowBuilder;
-
-import junit.framework.TestCase;
-
-public class MatrixCursor_RowBuilderTest extends TestCase {
-    private static final int COLUMN0_INDEX = 0;
-
-    private static final int COLUMN1_INDEX = 1;
-
-    private static final int COLUMN2_INDEX = 2;
-
-    public void testAdd() {
-        MatrixCursor cursor = new MatrixCursor(new String[] { "column0", "column1", "column2" });
-        assertEquals(0, cursor.getCount());
-        RowBuilder builder = cursor.newRow();
-        assertNotNull(builder);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToFirst();
-        assertTrue(cursor.isNull(COLUMN0_INDEX));
-        assertTrue(cursor.isNull(COLUMN1_INDEX));
-        assertTrue(cursor.isNull(COLUMN2_INDEX));
-
-        builder.add(Integer.MIN_VALUE);
-        assertFalse(cursor.isNull(COLUMN0_INDEX));
-        assertEquals(Integer.MIN_VALUE, cursor.getInt(COLUMN0_INDEX));
-        assertTrue(cursor.isNull(COLUMN1_INDEX));
-        assertTrue(cursor.isNull(COLUMN2_INDEX));
-
-        builder.add(0);
-        assertFalse(cursor.isNull(COLUMN0_INDEX));
-        assertEquals(Integer.MIN_VALUE, cursor.getInt(COLUMN0_INDEX));
-        assertFalse(cursor.isNull(COLUMN1_INDEX));
-        assertEquals(0, cursor.getInt(COLUMN1_INDEX));
-        assertTrue(cursor.isNull(COLUMN2_INDEX));
-
-        builder.add(Integer.MAX_VALUE);
-        assertFalse(cursor.isNull(COLUMN0_INDEX));
-        assertEquals(Integer.MIN_VALUE, cursor.getInt(COLUMN0_INDEX));
-        assertFalse(cursor.isNull(COLUMN1_INDEX));
-        assertEquals(0, cursor.getInt(COLUMN1_INDEX));
-        assertFalse(cursor.isNull(COLUMN2_INDEX));
-        assertEquals(Integer.MAX_VALUE, cursor.getInt(COLUMN2_INDEX));
-
-        try {
-            builder.add(1);
-            fail("Should throw CursorIndexOutOfBoundsException when adding too many values");
-        } catch (CursorIndexOutOfBoundsException e) {
-            // expected
-        }
-
-        assertNotNull(cursor.newRow());
-        assertEquals(2, cursor.getCount());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/cts/MergeCursorTest.java b/proprietary/frameworks/base/tests/database/src/android/database/cts/MergeCursorTest.java
deleted file mode 100755
index 94a379f737ac85036352a66db3b17c7352872393..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/cts/MergeCursorTest.java
+++ /dev/null
@@ -1,391 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.cts;
-
-
-import android.content.Context;
-import android.database.ContentObserver;
-import android.database.Cursor;
-import android.database.DataSetObserver;
-import android.database.MergeCursor;
-import android.database.StaleDataException;
-import android.database.sqlite.SQLiteDatabase;
-import android.test.AndroidTestCase;
-
-import java.io.File;
-import java.util.Arrays;
-
-public class MergeCursorTest extends AndroidTestCase {
-    private final int NUMBER_1_COLUMN_INDEX = 1;
-    private static final String TABLE1_NAME = "test1";
-    private static final String TABLE2_NAME = "test2";
-    private static final String TABLE3_NAME = "test3";
-    private static final String TABLE4_NAME = "test4";
-    private static final String TABLE5_NAME = "test5";
-    private static final String COLUMN_FOR_NULL_TEST = "Null Field";
-
-    private SQLiteDatabase mDatabase;
-    private File mDatabaseFile;
-
-    Cursor[] mCursors = null;
-    private static final String TABLE1_COLUMNS = " number_1 INTEGER";
-    private static final String TABLE2_COLUMNS = " number_1 INTEGER, number_2 INTEGER";
-    private static final String TABLE3_COLUMNS = " text_1 TEXT, number_3 INTEGER, number_4 REAL";
-    private static final String TABLE2_COLUMN_NAMES = "_id,number_1,number_2";
-    private static final String TABLE3_COLUMN_NAMES = "_id,text_1,number_3,number_4";
-    private static final String TEXT_COLUMN_NAME = "text_1";
-    private static final int TABLE2_COLUMN_COUNT = 3;
-    private static final int TABLE3_COLUMN_COUNT = 4;
-    private static final int DEFAULT_TABLE_VALUE_BEGINS = 1;
-    private static final int MAX_VALUE = 10;
-    private static final int HALF_VALUE = MAX_VALUE / 2;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        setupDatabase();
-        mCursors = new Cursor[2];
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        for (int i = 0; i < mCursors.length; i++) {
-            if (null != mCursors[i]) {
-                mCursors[i].close();
-            }
-        }
-        mDatabase.close();
-        mDatabaseFile.delete();
-        super.tearDown();
-    }
-
-    public void testConstructor() {
-        // If each item of mCursors are null, count will be zero.
-        MergeCursor mergeCursor = new MergeCursor(mCursors);
-        assertEquals(0, mergeCursor.getCount());
-
-        createCursors();
-
-        // if the items are not null, getCount() will return the sum of all cursors' count.
-        mergeCursor = new MergeCursor(mCursors);
-        assertEquals(mCursors[0].getCount() + mCursors[1].getCount(), mergeCursor.getCount());
-    }
-
-    public void testOnMove() {
-        createCursors();
-        MergeCursor mergeCursor = new MergeCursor(mCursors);
-        for (int i = 0; i < MAX_VALUE; i++) {
-            mergeCursor.moveToNext();
-            //From 1~5, mCursor should be in mCursors[0], larger than 5, it should be in
-            //mCursors[1].
-            assertEquals(i + 1, mergeCursor.getInt(NUMBER_1_COLUMN_INDEX));
-        }
-    }
-
-    public void testCursorSwiching() {
-        mDatabase.execSQL("CREATE TABLE " + TABLE5_NAME + " (_id INTEGER PRIMARY KEY,"
-                + TABLE3_COLUMNS + ");");
-        String sql = "INSERT INTO " + TABLE5_NAME + " (" + TEXT_COLUMN_NAME + ") VALUES ('TEXT')";
-        mDatabase.execSQL(sql);
-
-        Cursor[] cursors = new Cursor[2];
-        cursors[0] = mDatabase.query(TABLE5_NAME, null, null, null, null, null, null);
-        assertEquals(1, cursors[0].getCount());
-        createCursors();
-        cursors[1] = mCursors[1];
-        assertTrue(cursors[1].getCount() > 0);
-        MergeCursor mergeCursor = new MergeCursor(cursors);
-        // MergeCursor should points to cursors[0] after moveToFirst.
-        mergeCursor.moveToFirst();
-
-        String[] tableColumns = TABLE3_COLUMN_NAMES.split("[,]");
-        assertEquals(TABLE3_COLUMN_COUNT, mergeCursor.getColumnCount());
-        assertTrue(Arrays.equals(tableColumns, mergeCursor.getColumnNames()));
-
-        // MergeCursor should points to cursors[1] moveToNext.
-        mergeCursor.moveToNext();
-        tableColumns = TABLE2_COLUMN_NAMES.split("[,]");
-        assertEquals(TABLE2_COLUMN_COUNT, mergeCursor.getColumnCount());
-        assertTrue(Arrays.equals(tableColumns, mergeCursor.getColumnNames()));
-    }
-
-    public void testGetValues() {
-        byte NUMBER_BLOB_UNIT = 99;
-        String[] TEST_STRING = new String[] {"Test String1", "Test String2"};
-        String[] tableNames = new String[] {TABLE3_NAME, TABLE4_NAME};
-
-        final double NUMBER_DOUBLE = Double.MAX_VALUE;
-        final double NUMBER_FLOAT = (float) NUMBER_DOUBLE;
-        final long NUMBER_LONG_INTEGER = (long) 0xaabbccddffL;
-        final long NUMBER_INTEGER = (int) NUMBER_LONG_INTEGER;
-        final long NUMBER_SHORT = (short) NUMBER_INTEGER;
-
-        // create tables
-        byte[][] originalBlobs = new byte[2][];
-        for (int i = 0; i < 2; i++) {
-            // insert blob and other values
-            originalBlobs[i] = new byte[1000];
-            Arrays.fill(originalBlobs[i], (byte) (NUMBER_BLOB_UNIT - i));
-            buildDatabaseWithTestValues(TEST_STRING[i], NUMBER_DOUBLE - i, NUMBER_LONG_INTEGER - i,
-                    originalBlobs[i], tableNames[i]);
-            // Get cursors.
-            mCursors[i] = mDatabase.query(tableNames[i], null, null, null, null, null, null);
-        }
-
-        MergeCursor mergeCursor = new MergeCursor(mCursors);
-        assertEquals(4, mergeCursor.getCount());
-        String[] testColumns = new String[] {"_id", "string_text", "double_number", "int_number",
-                    "blob_data"};
-        // Test getColumnNames().
-        assertTrue(Arrays.equals(testColumns, mergeCursor.getColumnNames()));
-
-        int columnBlob = mCursors[0].getColumnIndexOrThrow("blob_data");
-        int columnString = mCursors[0].getColumnIndexOrThrow("string_text");
-        int columnDouble = mCursors[0].getColumnIndexOrThrow("double_number");
-        int columnInteger = mCursors[0].getColumnIndexOrThrow("int_number");
-
-        // Test values.
-        for (int i = 0; i < 2; i++) {
-            mergeCursor.moveToNext();
-            assertEquals(5, mergeCursor.getColumnCount());
-
-            // Test getting value methods.
-            byte[] targetBlob = mergeCursor.getBlob(columnBlob);
-            assertTrue(Arrays.equals(originalBlobs[i], targetBlob));
-
-            assertEquals(TEST_STRING[i], mergeCursor.getString(columnString));
-            assertEquals(NUMBER_DOUBLE - i, mergeCursor.getDouble(columnDouble), 0.000000000001);
-            assertEquals(NUMBER_FLOAT - i, mergeCursor.getFloat(columnDouble), 0.000000000001f);
-            assertEquals(NUMBER_LONG_INTEGER - i, mergeCursor.getLong(columnInteger));
-            assertEquals(NUMBER_INTEGER - i, mergeCursor.getInt(columnInteger));
-            assertEquals(NUMBER_SHORT - i, mergeCursor.getShort(columnInteger));
-
-            // Test isNull(int).
-            assertFalse(mergeCursor.isNull(columnBlob));
-            mergeCursor.moveToNext();
-            assertEquals(COLUMN_FOR_NULL_TEST, mergeCursor.getString(columnString));
-            assertTrue(mergeCursor.isNull(columnBlob));
-        }
-    }
-
-    public void testContentObsererOperations() throws IllegalStateException {
-        createCursors();
-        MergeCursor mergeCursor = new MergeCursor(mCursors);
-        ContentObserver observer = new ContentObserver(null) { };
-
-        // Can't unregister a Observer before it has been registered.
-        try {
-            mergeCursor.unregisterContentObserver(observer);
-            fail("testUnregisterContentObserver failed");
-        } catch (IllegalStateException e) {
-            // expected
-        }
-
-        mergeCursor.registerContentObserver(observer);
-
-        // Can't register a same observer twice before unregister it.
-        try {
-            mergeCursor.registerContentObserver(observer);
-            fail("testRegisterContentObserver failed");
-        } catch (IllegalStateException e) {
-            // expected
-        }
-
-        mergeCursor.unregisterContentObserver(observer);
-        // one Observer can be registered again after it has been unregistered.
-        mergeCursor.registerContentObserver(observer);
-
-        mergeCursor.unregisterContentObserver(observer);
-
-        try {
-            mergeCursor.unregisterContentObserver(observer);
-            fail("testUnregisterContentObserver failed");
-        } catch (IllegalStateException e) {
-            // expected
-        }
-    }
-
-    public void testDeactivate() throws IllegalStateException {
-        createCursors();
-        MergeCursor mergeCursor = new MergeCursor(mCursors);
-        MockObserver observer = new MockObserver();
-
-        // one DataSetObserver can't unregistered before it had been registered.
-        try {
-            mergeCursor.unregisterDataSetObserver(observer);
-            fail("testUnregisterDataSetObserver failed");
-        } catch (IllegalStateException e) {
-            // expected
-        }
-
-        // Before registering, observer can't be notified.
-        assertFalse(observer.hasInvalidated());
-        mergeCursor.moveToLast();
-        mergeCursor.deactivate();
-        assertFalse(observer.hasInvalidated());
-
-        // Test with registering DataSetObserver
-        assertTrue(mergeCursor.requery());
-        mergeCursor.registerDataSetObserver(observer);
-        assertFalse(observer.hasInvalidated());
-        mergeCursor.moveToLast();
-        assertEquals(MAX_VALUE, mergeCursor.getInt(NUMBER_1_COLUMN_INDEX));
-        mergeCursor.deactivate();
-        // deactivate method can invoke invalidate() method, can be observed by DataSetObserver.
-        assertTrue(observer.hasInvalidated());
-        // After deactivating, the cursor can not provide values from database record.
-        try {
-            mergeCursor.getInt(NUMBER_1_COLUMN_INDEX);
-            fail("After deactivating, cursor cannot execute getting value operations.");
-        } catch (StaleDataException e) {
-            // expected
-        }
-
-        // Can't register a same observer twice before unregister it.
-        try {
-            mergeCursor.registerDataSetObserver(observer);
-            fail("testRegisterDataSetObserver failed");
-        } catch (IllegalStateException e) {
-            // expected
-        }
-
-        // After runegistering, observer can't be notified.
-        mergeCursor.unregisterDataSetObserver(observer);
-        observer.resetStatus();
-        assertFalse(observer.hasInvalidated());
-        mergeCursor.moveToLast();
-        mergeCursor.deactivate();
-        assertFalse(observer.hasInvalidated());
-
-        // one DataSetObserver can't be unregistered twice continuously.
-        try {
-            mergeCursor.unregisterDataSetObserver(observer);
-            fail("testUnregisterDataSetObserver failed");
-        } catch (IllegalStateException e) {
-            // expected
-        }
-    }
-
-    public void testRequery() {
-        final String TEST_VALUE1 = Integer.toString(MAX_VALUE + 1);
-        final String TEST_VALUE2 = Integer.toString(MAX_VALUE + 2);
-        createCursors();
-        MergeCursor mergeCursor = new MergeCursor(mCursors);
-        int cursor1Count = mCursors[0].getCount();
-        int cursor2Count = mCursors[0].getCount();
-
-        mDatabase.execSQL("INSERT INTO " + TABLE1_NAME + " (number_1) VALUES ('" + TEST_VALUE1
-                + "');");
-        assertEquals(cursor1Count + cursor2Count, mergeCursor.getCount());
-        assertTrue(mergeCursor.requery());
-        cursor1Count += 1;
-        assertEquals(cursor1Count + cursor2Count, mergeCursor.getCount());
-        mDatabase.execSQL("INSERT INTO " + TABLE2_NAME + " (number_1) VALUES ('" + TEST_VALUE2
-                + "');");
-        cursor2Count += 1;
-        assertTrue(mergeCursor.requery());
-        assertEquals(cursor1Count + cursor2Count, mergeCursor.getCount());
-
-        mergeCursor.close();
-        assertFalse(mergeCursor.requery());
-    }
-
-    private void buildDatabaseWithTestValues(String text, double doubleNumber, long intNumber,
-            byte[] blob, String tablename) {
-        Object[] args = new Object[4];
-        args[0] = text;
-        args[1] = doubleNumber;
-        args[2] = intNumber;
-        args[3] = blob;
-        mDatabase.execSQL("CREATE TABLE " + tablename + " (_id INTEGER PRIMARY KEY,"
-                + "string_text TEXT, double_number REAL, int_number INTEGER, blob_data BLOB);");
-
-        // Insert record in giving table.
-        String sql = "INSERT INTO " + tablename + " (string_text, double_number, int_number,"
-                + " blob_data) VALUES (?,?,?,?)";
-        mDatabase.execSQL(sql, args);
-        // insert null blob.
-        sql = "INSERT INTO " + tablename + " (string_text) VALUES ('" + COLUMN_FOR_NULL_TEST + "')";
-        mDatabase.execSQL(sql);
-    }
-
-    private void setupDatabase() {
-        File dbDir = getContext().getDir("tests", Context.MODE_PRIVATE);
-        mDatabaseFile = new File(dbDir, "database_test.db");
-        if (mDatabaseFile.exists()) {
-            mDatabaseFile.delete();
-        }
-        mDatabase = SQLiteDatabase.openOrCreateDatabase(mDatabaseFile.getPath(), null);
-        assertNotNull(mDatabaseFile);
-        createTable(TABLE1_NAME, TABLE1_COLUMNS);
-        createTable(TABLE2_NAME, TABLE2_COLUMNS);
-        addValuesIntoTable(TABLE1_NAME, DEFAULT_TABLE_VALUE_BEGINS, HALF_VALUE);
-        addValuesIntoTable(TABLE2_NAME, HALF_VALUE + 1, MAX_VALUE);
-    }
-
-    private void createTable(String tableName, String columnNames) {
-        String sql = "Create TABLE " + tableName + " (_id INTEGER PRIMARY KEY, " + columnNames
-                + " );";
-        mDatabase.execSQL(sql);
-    }
-
-    private void addValuesIntoTable(String tableName, int start, int end) {
-        for (int i = start; i <= end; i++) {
-            mDatabase.execSQL("INSERT INTO " + tableName + "(number_1) VALUES ('"
-                    + i + "');");
-        }
-    }
-
-    private Cursor getCursor(String tableName, String selection, String[] columnNames) {
-        return mDatabase.query(tableName, columnNames, selection, null, null, null, "number_1");
-    }
-
-    private void createCursors() {
-        mCursors[0] = getCursor(TABLE1_NAME, null, null);
-        mCursors[1] = getCursor(TABLE2_NAME, null, null);
-    }
-
-    private class MockObserver extends DataSetObserver {
-        private boolean mHasChanged = false;
-        private boolean mHasInvalidated = false;
-
-        @Override
-        public void onChanged() {
-            super.onChanged();
-            mHasChanged = true;
-        }
-
-        @Override
-        public void onInvalidated() {
-            super.onInvalidated();
-            mHasInvalidated = true;
-        }
-
-        public void resetStatus() {
-            mHasChanged = false;
-            mHasInvalidated = false;
-        }
-
-        public boolean hasChanged() {
-            return mHasChanged;
-        }
-
-        public boolean hasInvalidated() {
-            return mHasInvalidated;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/cts/ObservableTest.java b/proprietary/frameworks/base/tests/database/src/android/database/cts/ObservableTest.java
deleted file mode 100755
index 445f09f06abaaeb7ec300f3ad8eb209cb987ffd5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/cts/ObservableTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.cts;
-
-import android.database.Observable;
-import android.test.AndroidTestCase;
-
-public class ObservableTest extends AndroidTestCase {
-    public void testRegisterUnRegisterObserver() {
-        MockObservable observable = new MockObservable();
-
-        // Test register a null observer object
-        try {
-            observable.registerObserver((null));
-            fail("registerObserver should throw a IllegalArgumentException here.");
-        } catch (IllegalArgumentException e) {
-        }
-
-        Object observer = new Object();
-        // In the beginning, Observable has no observer object, nothing to be unregistered.
-        try {
-            observable.unregisterObserver(observer);
-            fail("unregisterObserver should throw a IllegalStateException here.");
-        } catch (IllegalStateException e) {
-        }
-
-        // Test unregister a null object, the Observable will unregister nothing.
-        try {
-            observable.unregisterObserver(null);
-            fail("unregisterObserver should throw a IllegalArgumentException here.");
-        } catch (IllegalArgumentException e) {
-        }
-
-        // Test register a observer object
-        observable.registerObserver(observer);
-        // If previous registerObserver was executed successfully, the object can't be registered
-        // twice.
-        try {
-            observable.registerObserver(observer);
-            fail("registerObserver should throw a IllegalStateException here.");
-        } catch (IllegalStateException e) {
-        }
-
-        // Test unregister a observer object
-        observable.unregisterObserver(observer);
-        // If unregister function was executed successfully, the input observer object will be
-        // removed, so it can not be unregistered anymore, and it can be registered again.
-        try {
-            observable.unregisterObserver(observer);
-            fail("unregisterObserver should throw a IllegalStateException here.");
-        } catch (IllegalStateException e) {
-        }
-        observable.registerObserver(observer);
-    }
-
-    public void testUnregisterAll() {
-        MockObservable observable = new MockObservable();
-        Object observer1 = new Object();
-        Object observer2 = new Object();
-
-        observable.registerObserver(observer1);
-        observable.registerObserver(observer2);
-
-        // If a observer was registered, it can't be registered again.
-        try {
-            observable.registerObserver(observer1);
-            fail("registerObserver should throw a IllegalStateException here.");
-        } catch (IllegalStateException e) {
-        }
-        try {
-            observable.registerObserver(observer2);
-            fail("registerObserver should throw a IllegalStateException here.");
-        } catch (IllegalStateException e) {
-        }
-
-        // unregisterAll will unregister all the registered observers.
-        observable.unregisterAll();
-        // The Observable will be empty after unregisterAll, so it can register observers again.
-        observable.registerObserver(observer1);
-        observable.registerObserver(observer2);
-    }
-
-    private class MockObservable extends Observable<Object> {
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/cts/SQLExceptionTest.java b/proprietary/frameworks/base/tests/database/src/android/database/cts/SQLExceptionTest.java
deleted file mode 100755
index c0265616ebe48f2c74bb75f2891b64d41997e7f6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/cts/SQLExceptionTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.cts;
-
-import android.database.SQLException;
-import android.test.AndroidTestCase;
-
-public class SQLExceptionTest extends AndroidTestCase {
-
-    public void testConstructors() {
-        String expected1 = "Expected exception message";
-
-        // Test SQLException()
-        try {
-            throw new SQLException();
-        } catch (SQLException e) {
-            assertNull(e.getMessage());
-        }
-
-        // Test SQLException(String)
-        try {
-            throw new SQLException(expected1);
-        } catch (SQLException e) {
-            assertEquals(expected1, e.getMessage());
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/cts/StaleDataExceptionTest.java b/proprietary/frameworks/base/tests/database/src/android/database/cts/StaleDataExceptionTest.java
deleted file mode 100755
index cffed5339ae0ed4da0fed1a27159b1babbe34278..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/cts/StaleDataExceptionTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.cts;
-
-import android.database.StaleDataException;
-import android.test.AndroidTestCase;
-
-public class StaleDataExceptionTest extends AndroidTestCase {
-    public void testConstructors() {
-        String expected1 = "Expected exception message";
-
-        // Test StaleDataException()
-        try {
-            throw new StaleDataException();
-        } catch (StaleDataException e) {
-            assertNull(e.getMessage());
-        }
-
-        // Test StaleDataException(String)
-        try {
-            throw new StaleDataException(expected1);
-        } catch (StaleDataException e) {
-            assertEquals(expected1, e.getMessage());
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/DatabaseStatementTest.java b/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/DatabaseStatementTest.java
deleted file mode 100755
index 247039aea30d6027441c542b4f1004808083e6be..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/DatabaseStatementTest.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.sqlite.cts;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteConstraintException;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteDoneException;
-import android.database.sqlite.SQLiteStatement;
-import android.test.AndroidTestCase;
-import android.test.PerformanceTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-
-/*
- * These tests were taken from
- * frameworks/base/tests/AndroidTests/src/com/android/unit_tests/DatabaseStatementTest.java
- * Modifications:
- * - use Context to create and delete the DB to avoid hard-coded paths
- */
-public class DatabaseStatementTest extends AndroidTestCase implements PerformanceTestCase {
-
-    private static final String sString1 = "this is a test";
-    private static final String sString2 = "and yet another test";
-    private static final String sString3 = "this string is a little longer, but still a test";
-
-    private static final String DATABASE_NAME = "database_test.db";
-
-    private static final int CURRENT_DATABASE_VERSION = 42;
-    private SQLiteDatabase mDatabase;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        getContext().deleteDatabase(DATABASE_NAME);
-        mDatabase = getContext().openOrCreateDatabase(DATABASE_NAME, Context.MODE_PRIVATE, null);
-        assertNotNull(mDatabase);
-        mDatabase.setVersion(CURRENT_DATABASE_VERSION);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mDatabase.close();
-        getContext().deleteDatabase(DATABASE_NAME);
-        super.tearDown();
-    }
-
-    public boolean isPerformanceOnly() {
-        return false;
-    }
-
-    // These test can only be run once.
-    public int startPerformance(Intermediates intermediates) {
-        return 1;
-    }
-
-    private void populateDefaultTable() {
-        mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, data TEXT);");
-
-        mDatabase.execSQL("INSERT INTO test (data) VALUES ('" + sString1 + "');");
-        mDatabase.execSQL("INSERT INTO test (data) VALUES ('" + sString2 + "');");
-        mDatabase.execSQL("INSERT INTO test (data) VALUES ('" + sString3 + "');");
-    }
-
-    @MediumTest
-    public void testExecuteStatement() throws Exception {
-        populateDefaultTable();
-        SQLiteStatement statement = mDatabase.compileStatement("DELETE FROM test");
-        statement.execute();
-
-        Cursor c = mDatabase.query("test", null, null, null, null, null, null);
-        assertEquals(0, c.getCount());
-        c.deactivate();
-        statement.close();
-    }
-
-    @MediumTest
-    public void testSimpleQuery() throws Exception {
-        mDatabase.execSQL("CREATE TABLE test (num INTEGER NOT NULL, str TEXT NOT NULL);");
-        mDatabase.execSQL("INSERT INTO test VALUES (1234, 'hello');");
-        SQLiteStatement statement1 =
-                mDatabase.compileStatement("SELECT num FROM test WHERE str = ?");
-        SQLiteStatement statement2 =
-                mDatabase.compileStatement("SELECT str FROM test WHERE num = ?");
-
-        try {
-            statement1.bindString(1, "hello");
-            long value = statement1.simpleQueryForLong();
-            assertEquals(1234, value);
-
-            statement1.bindString(1, "world");
-            statement1.simpleQueryForLong();
-            fail("shouldn't get here");
-        } catch (SQLiteDoneException e) {
-            // expected
-        }
-
-        try {
-            statement2.bindLong(1, 1234);
-            String value = statement1.simpleQueryForString();
-            assertEquals("hello", value);
-
-            statement2.bindLong(1, 5678);
-            statement1.simpleQueryForString();
-            fail("shouldn't get here");
-        } catch (SQLiteDoneException e) {
-            // expected
-        }
-
-        statement1.close();
-        statement2.close();
-    }
-
-    @MediumTest
-    public void testStatementLongBinding() throws Exception {
-        mDatabase.execSQL("CREATE TABLE test (num INTEGER);");
-        SQLiteStatement statement = mDatabase.compileStatement("INSERT INTO test (num) VALUES (?)");
-
-        for (int i = 0; i < 10; i++) {
-            statement.bindLong(1, i);
-            statement.execute();
-        }
-        statement.close();
-
-        Cursor c = mDatabase.query("test", null, null, null, null, null, null);
-        int numCol = c.getColumnIndexOrThrow("num");
-        c.moveToFirst();
-        for (long i = 0; i < 10; i++) {
-            long num = c.getLong(numCol);
-            assertEquals(i, num);
-            c.moveToNext();
-        }
-        c.close();
-    }
-
-    @MediumTest
-    public void testStatementStringBinding() throws Exception {
-        mDatabase.execSQL("CREATE TABLE test (num TEXT);");
-        SQLiteStatement statement = mDatabase.compileStatement("INSERT INTO test (num) VALUES (?)");
-
-        for (long i = 0; i < 10; i++) {
-            statement.bindString(1, Long.toHexString(i));
-            statement.execute();
-        }
-        statement.close();
-
-        Cursor c = mDatabase.query("test", null, null, null, null, null, null);
-        int numCol = c.getColumnIndexOrThrow("num");
-        c.moveToFirst();
-        for (long i = 0; i < 10; i++) {
-            String num = c.getString(numCol);
-            assertEquals(Long.toHexString(i), num);
-            c.moveToNext();
-        }
-        c.close();
-    }
-
-    @MediumTest
-    public void testStatementClearBindings() throws Exception {
-        mDatabase.execSQL("CREATE TABLE test (num INTEGER);");
-        SQLiteStatement statement = mDatabase.compileStatement("INSERT INTO test (num) VALUES (?)");
-
-        for (long i = 0; i < 10; i++) {
-            statement.bindLong(1, i);
-            statement.clearBindings();
-            statement.execute();
-        }
-        statement.close();
-
-        Cursor c = mDatabase.query("test", null, null, null, null, null, "ROWID");
-        int numCol = c.getColumnIndexOrThrow("num");
-        assertTrue(c.moveToFirst());
-        for (long i = 0; i < 10; i++) {
-            assertTrue(c.isNull(numCol));
-            c.moveToNext();
-        }
-        c.close();
-    }
-
-    @MediumTest
-    public void testSimpleStringBinding() throws Exception {
-        mDatabase.execSQL("CREATE TABLE test (num TEXT, value TEXT);");
-        String statement = "INSERT INTO test (num, value) VALUES (?,?)";
-
-        String[] args = new String[2];
-        for (int i = 0; i < 2; i++) {
-            args[i] = Integer.toHexString(i);
-        }
-
-        mDatabase.execSQL(statement, args);
-
-        Cursor c = mDatabase.query("test", null, null, null, null, null, null);
-        int numCol = c.getColumnIndexOrThrow("num");
-        int valCol = c.getColumnIndexOrThrow("value");
-        c.moveToFirst();
-        String num = c.getString(numCol);
-        assertEquals(Integer.toHexString(0), num);
-
-        String val = c.getString(valCol);
-        assertEquals(Integer.toHexString(1), val);
-        c.close();
-    }
-
-    @MediumTest
-    public void testStatementMultipleBindings() throws Exception {
-        mDatabase.execSQL("CREATE TABLE test (num INTEGER, str TEXT);");
-        SQLiteStatement statement =
-                mDatabase.compileStatement("INSERT INTO test (num, str) VALUES (?, ?)");
-
-        for (long i = 0; i < 10; i++) {
-            statement.bindLong(1, i);
-            statement.bindString(2, Long.toHexString(i));
-            statement.execute();
-        }
-        statement.close();
-
-        Cursor c = mDatabase.query("test", null, null, null, null, null, "ROWID");
-        int numCol = c.getColumnIndexOrThrow("num");
-        int strCol = c.getColumnIndexOrThrow("str");
-        assertTrue(c.moveToFirst());
-        for (long i = 0; i < 10; i++) {
-            long num = c.getLong(numCol);
-            String str = c.getString(strCol);
-            assertEquals(i, num);
-            assertEquals(Long.toHexString(i), str);
-            c.moveToNext();
-        }
-        c.close();
-    }
-
-    private static class StatementTestThread extends Thread {
-        private SQLiteDatabase mDatabase;
-        private SQLiteStatement mStatement;
-
-        public StatementTestThread(SQLiteDatabase db, SQLiteStatement statement) {
-            super();
-            mDatabase = db;
-            mStatement = statement;
-        }
-
-        @Override
-        public void run() {
-            mDatabase.beginTransaction();
-            for (long i = 0; i < 10; i++) {
-                mStatement.bindLong(1, i);
-                mStatement.bindString(2, Long.toHexString(i));
-                mStatement.execute();
-            }
-            mDatabase.setTransactionSuccessful();
-            mDatabase.endTransaction();
-
-            Cursor c = mDatabase.query("test", null, null, null, null, null, "ROWID");
-            int numCol = c.getColumnIndexOrThrow("num");
-            int strCol = c.getColumnIndexOrThrow("str");
-            assertTrue(c.moveToFirst());
-            for (long i = 0; i < 10; i++) {
-                long num = c.getLong(numCol);
-                String str = c.getString(strCol);
-                assertEquals(i, num);
-                assertEquals(Long.toHexString(i), str);
-                c.moveToNext();
-            }
-            c.close();
-        }
-    }
-
-    @MediumTest
-    public void testStatementMultiThreaded() throws Exception {
-        mDatabase.execSQL("CREATE TABLE test (num INTEGER, str TEXT);");
-        SQLiteStatement statement =
-                mDatabase.compileStatement("INSERT INTO test (num, str) VALUES (?, ?)");
-
-        StatementTestThread thread = new StatementTestThread(mDatabase, statement);
-        thread.start();
-        try {
-            thread.join();
-        } finally {
-            statement.close();
-        }
-    }
-
-    @MediumTest
-    public void testStatementConstraint() throws Exception {
-        mDatabase.execSQL("CREATE TABLE test (num INTEGER NOT NULL);");
-        SQLiteStatement statement = mDatabase.compileStatement("INSERT INTO test (num) VALUES (?)");
-
-        // Try to insert NULL, which violates the constraint
-        try {
-            statement.clearBindings();
-            statement.execute();
-            fail("expected exception not thrown");
-        } catch (SQLiteConstraintException e) {
-            // expected
-        }
-
-        // Make sure the statement can still be used
-        statement.bindLong(1, 1);
-        statement.execute();
-        statement.close();
-
-        Cursor c = mDatabase.query("test", null, null, null, null, null, null);
-        int numCol = c.getColumnIndexOrThrow("num");
-        c.moveToFirst();
-        long num = c.getLong(numCol);
-        assertEquals(1, num);
-        c.close();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteAbortExceptionTest.java b/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteAbortExceptionTest.java
deleted file mode 100755
index ccf344a4e1ba278956f322a6ca02dec9acbecaea..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteAbortExceptionTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.sqlite.cts;
-
-import android.database.sqlite.SQLiteAbortException;
-import android.test.AndroidTestCase;
-
-public class SQLiteAbortExceptionTest extends AndroidTestCase {
-    public void testConstructor() {
-        new SQLiteAbortException();
-
-        new SQLiteAbortException("error");
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteClosableTest.java b/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteClosableTest.java
deleted file mode 100755
index 4f5c60a02b3c8b37a9b30a90aa630e614b460f6e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteClosableTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.sqlite.cts;
-
-import android.database.sqlite.SQLiteClosable;
-import android.test.AndroidTestCase;
-
-public class SQLiteClosableTest extends AndroidTestCase {
-    private class MockSQLiteClosable extends SQLiteClosable {
-        private boolean mOnAllReferencesReleasedCalled = false;
-        private boolean mOnAllReferencesReleasedFromContainerCalled = false;
-
-        @Override
-        protected void onAllReferencesReleased() {
-            mOnAllReferencesReleasedCalled = true;
-        }
-
-        protected void onAllReferencesReleasedFromContainer() {
-            mOnAllReferencesReleasedFromContainerCalled = true;
-        }
-
-        public boolean isOnAllReferencesReleasedCalled() {
-            return mOnAllReferencesReleasedCalled;
-        }
-
-        public boolean isOnAllReferencesReleasedFromContainerCalled() {
-            return mOnAllReferencesReleasedFromContainerCalled;
-        }
-    }
-
-    public void testAcquireReference() {
-        MockSQLiteClosable closable = new MockSQLiteClosable();
-
-        closable.acquireReference();
-        closable.releaseReference();
-
-        assertFalse(closable.isOnAllReferencesReleasedCalled());
-        closable.releaseReference();
-        // the reference count is 0 now.
-        assertTrue(closable.isOnAllReferencesReleasedCalled());
-
-        try {
-            closable.acquireReference();
-            fail("should throw IllegalStateException.");
-        } catch (IllegalStateException e) {
-        }
-    }
-
-    public void testReleaseReferenceFromContainer() {
-        MockSQLiteClosable closable = new MockSQLiteClosable();
-
-        closable.acquireReference();
-        closable.releaseReferenceFromContainer();
-
-        // the reference count is 1 now.
-        assertFalse(closable.isOnAllReferencesReleasedFromContainerCalled());
-        closable.releaseReferenceFromContainer();
-        // the reference count is 0 now.
-        assertTrue(closable.isOnAllReferencesReleasedFromContainerCalled());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteConstraintExceptionTest.java b/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteConstraintExceptionTest.java
deleted file mode 100755
index cce4d02cb922380f3dcbf105f9308c8fd47ee4c0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteConstraintExceptionTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.sqlite.cts;
-
-import android.database.sqlite.SQLiteConstraintException;
-import android.test.AndroidTestCase;
-
-public class SQLiteConstraintExceptionTest extends AndroidTestCase {
-    public void testConstructor() {
-        new SQLiteConstraintException();
-
-        new SQLiteConstraintException("error");
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteCursorTest.java b/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteCursorTest.java
deleted file mode 100755
index f81de90e8f631310085336432674e860059cdbf5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteCursorTest.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.sqlite.cts;
-
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.CursorWindow;
-import android.database.DataSetObserver;
-import android.database.StaleDataException;
-import android.database.sqlite.SQLiteCursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteDirectCursorDriver;
-import android.test.AndroidTestCase;
-
-import java.util.Arrays;
-
-/**
- * Test {@link AbstractCursor}.
- */
-public class SQLiteCursorTest extends AndroidTestCase {
-    private SQLiteDatabase mDatabase;
-    private static final String[] COLUMNS = new String[] { "_id", "number_1", "number_2" };
-    private static final String TABLE_NAME = "test";
-    private static final String TABLE_COLUMNS = " number_1 INTEGER, number_2 INTEGER";
-    private static final int DEFAULT_TABLE_VALUE_BEGINS = 1;
-    private static final int TEST_COUNT = 10;
-    private static final String TEST_SQL = "SELECT * FROM test ORDER BY number_1";
-    private static final String DATABASE_FILE = "database_test.db";
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        getContext().deleteDatabase(DATABASE_FILE);
-        mDatabase = getContext().openOrCreateDatabase(DATABASE_FILE, Context.MODE_PRIVATE, null);
-        createTable(TABLE_NAME, TABLE_COLUMNS);
-        addValuesIntoTable(TABLE_NAME, DEFAULT_TABLE_VALUE_BEGINS, TEST_COUNT);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mDatabase.close();
-        getContext().deleteDatabase(DATABASE_FILE);
-        super.tearDown();
-    }
-
-    public void testConstructor() {
-        SQLiteDirectCursorDriver cursorDriver = new SQLiteDirectCursorDriver(mDatabase,
-                TEST_SQL, TABLE_NAME, null);
-        try {
-            new SQLiteCursor(mDatabase, cursorDriver, TABLE_NAME, null);
-            fail("constructor didn't throw IllegalArgumentException when SQLiteQuery is null");
-        } catch (IllegalArgumentException e) {
-        }
-
-        // get SQLiteCursor by querying database
-        SQLiteCursor cursor = getCursor();
-        assertNotNull(cursor);
-    }
-
-    public void testClose() {
-        SQLiteCursor cursor = getCursor();
-        assertTrue(cursor.moveToFirst());
-        assertFalse(cursor.isClosed());
-        assertTrue(cursor.requery());
-        cursor.close();
-        assertFalse(cursor.requery());
-        try {
-            cursor.moveToFirst();
-            fail("moveToFirst didn't throw IllegalStateException after closed.");
-        } catch (IllegalStateException e) {
-        }
-        assertTrue(cursor.isClosed());
-    }
-
-    public void testRegisterDataSetObserver() {
-        SQLiteCursor cursor = getCursor();
-        MockCursorWindow cursorWindow = new MockCursorWindow(false);
-
-        MockObserver observer = new MockObserver();
-
-        cursor.setWindow(cursorWindow);
-        // Before registering, observer can't be notified.
-        assertFalse(observer.hasInvalidated());
-        cursor.moveToLast();
-        assertFalse(cursorWindow.isClosed());
-        cursor.deactivate();
-        assertFalse(observer.hasInvalidated());
-        // deactivate() will close the CursorWindow
-        assertTrue(cursorWindow.isClosed());
-
-        // test registering DataSetObserver
-        assertTrue(cursor.requery());
-        cursor.registerDataSetObserver(observer);
-        assertFalse(observer.hasInvalidated());
-        cursor.moveToLast();
-        assertEquals(TEST_COUNT, cursor.getInt(1));
-        cursor.deactivate();
-        // deactivate method can invoke invalidate() method, can be observed by DataSetObserver.
-        assertTrue(observer.hasInvalidated());
-
-        try {
-            cursor.getInt(1);
-            fail("After deactivating, cursor cannot execute getting value operations.");
-        } catch (StaleDataException e) {
-        }
-
-        assertTrue(cursor.requery());
-        cursor.moveToLast();
-        assertEquals(TEST_COUNT, cursor.getInt(1));
-
-        // can't register a same observer twice.
-        try {
-            cursor.registerDataSetObserver(observer);
-            fail("didn't throw IllegalStateException when register existed observer");
-        } catch (IllegalStateException e) {
-        }
-
-        // after unregistering, observer can't be notified.
-        cursor.unregisterDataSetObserver(observer);
-        observer.resetStatus();
-        assertFalse(observer.hasInvalidated());
-        cursor.deactivate();
-        assertFalse(observer.hasInvalidated());
-    }
-
-    public void testRequery() {
-        final String DELETE = "DELETE FROM " + TABLE_NAME + " WHERE number_1 =";
-        final String DELETE_1 = DELETE + "1;";
-        final String DELETE_2 = DELETE + "2;";
-
-        mDatabase.execSQL(DELETE_1);
-        // when cursor is created, it refreshes CursorWindow and populates cursor count
-        SQLiteCursor cursor = getCursor();
-        MockObserver observer = new MockObserver();
-        cursor.registerDataSetObserver(observer);
-        assertEquals(TEST_COUNT - 1, cursor.getCount());
-        assertFalse(observer.hasChanged());
-
-        mDatabase.execSQL(DELETE_2);
-        // when getCount() has invoked once, it can no longer refresh CursorWindow.
-        assertEquals(TEST_COUNT - 1, cursor.getCount());
-
-        assertTrue(cursor.requery());
-        // only after requery, getCount can get most up-to-date counting info now.
-        assertEquals(TEST_COUNT - 2, cursor.getCount());
-        assertTrue(observer.hasChanged());
-    }
-
-    public void testRequery2() {
-        mDatabase.disableWriteAheadLogging();
-        mDatabase.execSQL("create table testRequery2 (i int);");
-        mDatabase.execSQL("insert into testRequery2 values(1);");
-        mDatabase.execSQL("insert into testRequery2 values(2);");
-        Cursor c = mDatabase.rawQuery("select * from testRequery2 order by i", null);
-        assertEquals(2, c.getCount());
-        assertTrue(c.moveToFirst());
-        assertEquals(1, c.getInt(0));
-        assertTrue(c.moveToNext());
-        assertEquals(2, c.getInt(0));
-        // add more data to the table and requery
-        mDatabase.execSQL("insert into testRequery2 values(3);");
-        assertTrue(c.requery());
-        assertEquals(3, c.getCount());
-        assertTrue(c.moveToFirst());
-        assertEquals(1, c.getInt(0));
-        assertTrue(c.moveToNext());
-        assertEquals(2, c.getInt(0));
-        assertTrue(c.moveToNext());
-        assertEquals(3, c.getInt(0));
-        // close the database and see if requery throws an exception
-        mDatabase.close();
-        assertFalse(c.requery());
-    }
-
-    public void testGetColumnIndex() {
-        SQLiteCursor cursor = getCursor();
-
-        for (int i = 0; i < COLUMNS.length; i++) {
-            assertEquals(i, cursor.getColumnIndex(COLUMNS[i]));
-        }
-
-        assertTrue(Arrays.equals(COLUMNS, cursor.getColumnNames()));
-    }
-
-    public void testSetSelectionArguments() {
-        final String SELECTION = "_id > ?";
-        int TEST_ARG1 = 2;
-        int TEST_ARG2 = 5;
-        SQLiteCursor cursor = (SQLiteCursor) mDatabase.query(TABLE_NAME, null, SELECTION,
-                new String[] { Integer.toString(TEST_ARG1) }, null, null, null);
-        assertEquals(TEST_COUNT - TEST_ARG1, cursor.getCount());
-        cursor.setSelectionArguments(new String[] { Integer.toString(TEST_ARG2) });
-        cursor.requery();
-        assertEquals(TEST_COUNT - TEST_ARG2, cursor.getCount());
-    }
-
-    public void testOnMove() {
-        // Do not test this API. It is callback which:
-        // 1. The callback mechanism has been tested in super class
-        // 2. The functionality is implementation details, no need to test
-    }
-
-    private void createTable(String tableName, String columnNames) {
-        String sql = "Create TABLE " + tableName + " (_id INTEGER PRIMARY KEY, "
-                + columnNames + " );";
-        mDatabase.execSQL(sql);
-    }
-
-    private void addValuesIntoTable(String tableName, int start, int end) {
-        for (int i = start; i <= end; i++) {
-            mDatabase.execSQL("INSERT INTO " + tableName + "(number_1) VALUES ('" + i + "');");
-        }
-    }
-
-    private SQLiteCursor getCursor() {
-        SQLiteCursor cursor = (SQLiteCursor) mDatabase.query(TABLE_NAME, null, null,
-                null, null, null, null);
-        return cursor;
-    }
-
-    private class MockObserver extends DataSetObserver {
-        private boolean mHasChanged = false;
-        private boolean mHasInvalidated = false;
-
-        @Override
-        public void onChanged() {
-            super.onChanged();
-            mHasChanged = true;
-        }
-
-        @Override
-        public void onInvalidated() {
-            super.onInvalidated();
-            mHasInvalidated = true;
-        }
-
-        protected void resetStatus() {
-            mHasChanged = false;
-            mHasInvalidated = false;
-        }
-
-        protected boolean hasChanged() {
-            return mHasChanged;
-        }
-
-        protected boolean hasInvalidated() {
-            return mHasInvalidated;
-        }
-    }
-
-    private class MockCursorWindow extends CursorWindow {
-        private boolean mIsClosed = false;
-
-        public MockCursorWindow(boolean localWindow) {
-            super(localWindow);
-        }
-
-        @Override
-        public void close() {
-            super.close();
-            mIsClosed = true;
-        }
-
-        public boolean isClosed() {
-            return mIsClosed;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteDatabaseCorruptExceptionTest.java b/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteDatabaseCorruptExceptionTest.java
deleted file mode 100755
index 3d8f56aa7c8ec2fc9e3d6db14fa704b43a796dd8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteDatabaseCorruptExceptionTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.sqlite.cts;
-
-import android.database.sqlite.SQLiteDatabaseCorruptException;
-import android.test.AndroidTestCase;
-
-public class SQLiteDatabaseCorruptExceptionTest extends AndroidTestCase {
-    public void testConstructor() {
-        new SQLiteDatabaseCorruptException();
-
-        new SQLiteDatabaseCorruptException("error");
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteDatabaseTest.java b/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteDatabaseTest.java
deleted file mode 100755
index 29ed9868e946a4e2b44bee2c2fd48aaec674d6b9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteDatabaseTest.java
+++ /dev/null
@@ -1,1494 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.sqlite.cts;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Locale;
-import java.util.concurrent.Semaphore;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.DatabaseUtils;
-import android.database.SQLException;
-import android.database.sqlite.SQLiteCursor;
-import android.database.sqlite.SQLiteCursorDriver;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteDatabase.CursorFactory;
-import android.database.sqlite.SQLiteQuery;
-import android.database.sqlite.SQLiteStatement;
-import android.database.sqlite.SQLiteTransactionListener;
-import android.test.AndroidTestCase;
-import android.test.MoreAsserts;
-import android.test.suitebuilder.annotation.LargeTest;
-
-public class SQLiteDatabaseTest extends AndroidTestCase {
-    private SQLiteDatabase mDatabase;
-    private File mDatabaseFile;
-    private String mDatabaseFilePath;
-    private String mDatabaseDir;
-
-    private boolean mTransactionListenerOnBeginCalled;
-    private boolean mTransactionListenerOnCommitCalled;
-    private boolean mTransactionListenerOnRollbackCalled;
-
-    private static final String DATABASE_FILE_NAME = "database_test.db";
-    private static final String TABLE_NAME = "test";
-    private static final int COLUMN_ID_INDEX = 0;
-    private static final int COLUMN_NAME_INDEX = 1;
-    private static final int COLUMN_AGE_INDEX = 2;
-    private static final int COLUMN_ADDR_INDEX = 3;
-    private static final String[] TEST_PROJECTION = new String[] {
-            "_id",      // 0
-            "name",     // 1
-            "age",      // 2
-            "address"   // 3
-    };
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        getContext().deleteDatabase(DATABASE_FILE_NAME);
-        mDatabaseFilePath = getContext().getDatabasePath(DATABASE_FILE_NAME).getPath();
-        mDatabaseFile = getContext().getDatabasePath(DATABASE_FILE_NAME);
-        mDatabaseDir = mDatabaseFile.getParent();
-        mDatabaseFile.getParentFile().mkdirs(); // directory may not exist
-        mDatabase = SQLiteDatabase.openOrCreateDatabase(mDatabaseFile, null);
-        assertNotNull(mDatabase);
-
-        mTransactionListenerOnBeginCalled = false;
-        mTransactionListenerOnCommitCalled = false;
-        mTransactionListenerOnRollbackCalled = false;
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mDatabase.close();
-        mDatabaseFile.delete();
-        super.tearDown();
-    }
-
-    public void testOpenDatabase() {
-        CursorFactory factory = new CursorFactory() {
-            public Cursor newCursor(SQLiteDatabase db, SQLiteCursorDriver masterQuery,
-                    String editTable, SQLiteQuery query) {
-                return new MockSQLiteCursor(db, masterQuery, editTable, query);
-            }
-        };
-
-        SQLiteDatabase db = SQLiteDatabase.openDatabase(mDatabaseFilePath,
-                factory, SQLiteDatabase.CREATE_IF_NECESSARY);
-        assertNotNull(db);
-        db.close();
-
-        File dbFile = new File(mDatabaseDir, "database_test12345678.db");
-        dbFile.delete();
-        assertFalse(dbFile.exists());
-        db = SQLiteDatabase.openOrCreateDatabase(dbFile.getPath(), factory);
-        assertNotNull(db);
-        db.close();
-        dbFile.delete();
-
-        dbFile = new File(mDatabaseDir, DATABASE_FILE_NAME);
-        db = SQLiteDatabase.openOrCreateDatabase(dbFile, factory);
-        assertNotNull(db);
-        db.close();
-        dbFile.delete();
-
-        db = SQLiteDatabase.create(factory);
-        assertNotNull(db);
-        db.close();
-    }
-
-    public void testDeleteDatabase() throws IOException {
-        File dbFile = new File(mDatabaseDir, "database_test12345678.db");
-        File journalFile = new File(dbFile.getPath() + "-journal");
-        File shmFile = new File(dbFile.getPath() + "-shm");
-        File walFile = new File(dbFile.getPath() + "-wal");
-        File mjFile1 = new File(dbFile.getPath() + "-mj00000000");
-        File mjFile2 = new File(dbFile.getPath() + "-mj00000001");
-        File innocentFile = new File(dbFile.getPath() + "-innocent");
-
-        dbFile.createNewFile();
-        journalFile.createNewFile();
-        shmFile.createNewFile();
-        walFile.createNewFile();
-        mjFile1.createNewFile();
-        mjFile2.createNewFile();
-        innocentFile.createNewFile();
-
-        boolean deleted = SQLiteDatabase.deleteDatabase(dbFile);
-        assertTrue(deleted);
-
-        assertFalse(dbFile.exists());
-        assertFalse(journalFile.exists());
-        assertFalse(shmFile.exists());
-        assertFalse(walFile.exists());
-        assertFalse(mjFile1.exists());
-        assertFalse(mjFile2.exists());
-        assertTrue(innocentFile.exists());
-
-        innocentFile.delete();
-
-        boolean deletedAgain = SQLiteDatabase.deleteDatabase(dbFile);
-        assertFalse(deletedAgain);
-    }
-
-    private class MockSQLiteCursor extends SQLiteCursor {
-        public MockSQLiteCursor(SQLiteDatabase db, SQLiteCursorDriver driver,
-                String editTable, SQLiteQuery query) {
-            super(db, driver, editTable, query);
-        }
-    }
-
-    public void testTransaction() {
-        mDatabase.execSQL("CREATE TABLE test (num INTEGER);");
-        mDatabase.execSQL("INSERT INTO test (num) VALUES (0)");
-
-        // test execSQL without any explicit transactions.
-        setNum(1);
-        assertNum(1);
-
-        // Test a single-level transaction.
-        setNum(0);
-        assertFalse(mDatabase.inTransaction());
-        mDatabase.beginTransaction();
-        assertTrue(mDatabase.inTransaction());
-        setNum(1);
-        mDatabase.setTransactionSuccessful();
-        mDatabase.endTransaction();
-        assertFalse(mDatabase.inTransaction());
-        assertNum(1);
-        assertFalse(mDatabase.isDbLockedByCurrentThread());
-        assertFalse(mDatabase.isDbLockedByOtherThreads());
-
-        // Test a rolled-back transaction.
-        setNum(0);
-        assertFalse(mDatabase.inTransaction());
-        mDatabase.beginTransaction();
-        setNum(1);
-        assertTrue(mDatabase.inTransaction());
-        mDatabase.endTransaction();
-        assertFalse(mDatabase.inTransaction());
-        assertNum(0);
-        assertFalse(mDatabase.isDbLockedByCurrentThread());
-        assertFalse(mDatabase.isDbLockedByOtherThreads());
-
-        // it should throw IllegalStateException if we end a non-existent transaction.
-        assertThrowsIllegalState(new Runnable() {
-            public void run() {
-                mDatabase.endTransaction();
-            }
-        });
-
-        // it should throw IllegalStateException if a set a non-existent transaction as clean.
-        assertThrowsIllegalState(new Runnable() {
-            public void run() {
-                mDatabase.setTransactionSuccessful();
-            }
-        });
-
-        mDatabase.beginTransaction();
-        mDatabase.setTransactionSuccessful();
-        // it should throw IllegalStateException if we mark a transaction as clean twice.
-        assertThrowsIllegalState(new Runnable() {
-            public void run() {
-                mDatabase.setTransactionSuccessful();
-            }
-        });
-        // it should throw IllegalStateException if we begin a transaction after marking the
-        // parent as clean.
-        assertThrowsIllegalState(new Runnable() {
-            public void run() {
-                mDatabase.beginTransaction();
-            }
-        });
-        mDatabase.endTransaction();
-        assertFalse(mDatabase.isDbLockedByCurrentThread());
-        assertFalse(mDatabase.isDbLockedByOtherThreads());
-
-        assertFalse(mDatabase.inTransaction());
-        // Test a two-level transaction.
-        setNum(0);
-        mDatabase.beginTransaction();
-        assertTrue(mDatabase.inTransaction());
-        mDatabase.beginTransaction();
-        assertTrue(mDatabase.inTransaction());
-        setNum(1);
-        mDatabase.setTransactionSuccessful();
-        mDatabase.endTransaction();
-        assertTrue(mDatabase.inTransaction());
-        mDatabase.setTransactionSuccessful();
-        mDatabase.endTransaction();
-        assertFalse(mDatabase.inTransaction());
-        assertNum(1);
-        assertFalse(mDatabase.isDbLockedByCurrentThread());
-        assertFalse(mDatabase.isDbLockedByOtherThreads());
-
-        // Test rolling back an inner transaction.
-        setNum(0);
-        mDatabase.beginTransaction();
-        mDatabase.beginTransaction();
-        setNum(1);
-        mDatabase.endTransaction();
-        mDatabase.setTransactionSuccessful();
-        mDatabase.endTransaction();
-        assertNum(0);
-        assertFalse(mDatabase.isDbLockedByCurrentThread());
-        assertFalse(mDatabase.isDbLockedByOtherThreads());
-
-        // Test rolling back an outer transaction.
-        setNum(0);
-        mDatabase.beginTransaction();
-        mDatabase.beginTransaction();
-        setNum(1);
-        mDatabase.setTransactionSuccessful();
-        mDatabase.endTransaction();
-        mDatabase.endTransaction();
-        assertNum(0);
-        assertFalse(mDatabase.isDbLockedByCurrentThread());
-        assertFalse(mDatabase.isDbLockedByOtherThreads());
-    }
-
-    private void setNum(int num) {
-        mDatabase.execSQL("UPDATE test SET num = " + num);
-    }
-
-    private void assertNum(int num) {
-        assertEquals(num, DatabaseUtils.longForQuery(mDatabase,
-                "SELECT num FROM test", null));
-    }
-
-    private void assertThrowsIllegalState(Runnable r) {
-        try {
-            r.run();
-            fail("did not throw expected IllegalStateException");
-        } catch (IllegalStateException e) {
-        }
-    }
-
-    public void testAccessMaximumSize() {
-        long curMaximumSize = mDatabase.getMaximumSize();
-
-        // the new maximum size is less than the current size.
-        mDatabase.setMaximumSize(curMaximumSize - 1);
-        assertEquals(curMaximumSize, mDatabase.getMaximumSize());
-
-        // the new maximum size is more than the current size.
-        mDatabase.setMaximumSize(curMaximumSize + 1);
-        assertEquals(curMaximumSize + mDatabase.getPageSize(), mDatabase.getMaximumSize());
-        assertTrue(mDatabase.getMaximumSize() > curMaximumSize);
-    }
-
-    public void testAccessPageSize() {
-        File databaseFile = new File(mDatabaseDir, "database.db");
-        if (databaseFile.exists()) {
-            databaseFile.delete();
-        }
-        SQLiteDatabase database = null;
-        try {
-            database = SQLiteDatabase.openOrCreateDatabase(databaseFile.getPath(), null);
-
-            long initialValue = database.getPageSize();
-            // check that this does not throw an exception
-            // setting a different page size may not be supported after the DB has been created
-            database.setPageSize(initialValue);
-            assertEquals(initialValue, database.getPageSize());
-
-        } finally {
-            if (database != null) {
-                database.close();
-                databaseFile.delete();
-            }
-        }
-    }
-
-    public void testCompileStatement() {
-        mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, "
-                + "name TEXT, age INTEGER, address TEXT);");
-
-        String name = "Mike";
-        int age = 21;
-        String address = "LA";
-
-        // at the beginning, there is no record in the database.
-        Cursor cursor = mDatabase.query("test", TEST_PROJECTION, null, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(0, cursor.getCount());
-
-        String sql = "INSERT INTO test (name, age, address) VALUES (?, ?, ?);";
-        SQLiteStatement insertStatement = mDatabase.compileStatement(sql);
-        DatabaseUtils.bindObjectToProgram(insertStatement, 1, name);
-        DatabaseUtils.bindObjectToProgram(insertStatement, 2, age);
-        DatabaseUtils.bindObjectToProgram(insertStatement, 3, address);
-        insertStatement.execute();
-        insertStatement.close();
-        cursor.close();
-
-        cursor = mDatabase.query("test", TEST_PROJECTION, null, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToNext();
-        assertEquals(name, cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(age, cursor.getInt(COLUMN_AGE_INDEX));
-        assertEquals(address, cursor.getString(COLUMN_ADDR_INDEX));
-        cursor.close();
-
-        SQLiteStatement deleteStatement = mDatabase.compileStatement("DELETE FROM test");
-        deleteStatement.execute();
-
-        cursor = mDatabase.query("test", null, null, null, null, null, null);
-        assertEquals(0, cursor.getCount());
-        cursor.deactivate();
-        deleteStatement.close();
-        cursor.close();
-    }
-
-    public void testDelete() {
-        mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, "
-                + "name TEXT, age INTEGER, address TEXT);");
-        mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Mike', 20, 'LA');");
-        mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Jack', 30, 'London');");
-        mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Jim', 35, 'Chicago');");
-
-        // delete one record.
-        int count = mDatabase.delete(TABLE_NAME, "name = 'Mike'", null);
-        assertEquals(1, count);
-
-        Cursor cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null,
-                null, null, null, null);
-        assertNotNull(cursor);
-        // there are 2 records here.
-        assertEquals(2, cursor.getCount());
-        cursor.moveToFirst();
-        assertEquals("Jack", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(30, cursor.getInt(COLUMN_AGE_INDEX));
-        assertEquals("London", cursor.getString(COLUMN_ADDR_INDEX));
-        cursor.moveToNext();
-        assertEquals("Jim", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(35, cursor.getInt(COLUMN_AGE_INDEX));
-        assertEquals("Chicago", cursor.getString(COLUMN_ADDR_INDEX));
-        cursor.close();
-
-        // delete another record.
-        count = mDatabase.delete(TABLE_NAME, "name = ?", new String[] { "Jack" });
-        assertEquals(1, count);
-
-        cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null, null, null,
-                null, null);
-        assertNotNull(cursor);
-        // there are 1 records here.
-        assertEquals(1, cursor.getCount());
-        cursor.moveToFirst();
-        assertEquals("Jim", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(35, cursor.getInt(COLUMN_AGE_INDEX));
-        assertEquals("Chicago", cursor.getString(COLUMN_ADDR_INDEX));
-        cursor.close();
-
-        mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Mike', 20, 'LA');");
-        mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Jack', 30, 'London');");
-
-        // delete all records.
-        count = mDatabase.delete(TABLE_NAME, null, null);
-        assertEquals(3, count);
-
-        cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(0, cursor.getCount());
-        cursor.close();
-    }
-
-    public void testExecSQL() {
-        mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, "
-                + "name TEXT, age INTEGER, address TEXT);");
-
-        // add a new record.
-        mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Mike', 20, 'LA');");
-
-        Cursor cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null,
-                null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToFirst();
-        assertEquals("Mike", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(20, cursor.getInt(COLUMN_AGE_INDEX));
-        assertEquals("LA", cursor.getString(COLUMN_ADDR_INDEX));
-        cursor.close();
-
-        // add other new record.
-        mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Jack', 30, 'London');");
-
-        cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(2, cursor.getCount());
-        cursor.moveToFirst();
-        assertEquals("Mike", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(20, cursor.getInt(COLUMN_AGE_INDEX));
-        assertEquals("LA", cursor.getString(COLUMN_ADDR_INDEX));
-        cursor.moveToNext();
-        assertEquals("Jack", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(30, cursor.getInt(COLUMN_AGE_INDEX));
-        assertEquals("London", cursor.getString(COLUMN_ADDR_INDEX));
-        cursor.close();
-
-        // delete a record.
-        mDatabase.execSQL("DELETE FROM test WHERE name = ?;", new String[] { "Jack" });
-
-        cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToFirst();
-        assertEquals("Mike", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(20, cursor.getInt(COLUMN_AGE_INDEX));
-        assertEquals("LA", cursor.getString(COLUMN_ADDR_INDEX));
-        cursor.close();
-
-        // delete a non-exist record.
-        mDatabase.execSQL("DELETE FROM test WHERE name = ?;", new String[] { "Wrong Name" });
-
-        cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToFirst();
-        assertEquals("Mike", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(20, cursor.getInt(COLUMN_AGE_INDEX));
-        assertEquals("LA", cursor.getString(COLUMN_ADDR_INDEX));
-        cursor.close();
-
-        try {
-            // execSQL can not use for query.
-            mDatabase.execSQL("SELECT * FROM test;");
-            fail("should throw SQLException.");
-        } catch (SQLException e) {
-        }
-
-        // make sure execSQL can't be used to execute more than 1 sql statement at a time
-        mDatabase.execSQL("UPDATE test SET age = 40 WHERE name = 'Mike';" +
-                "UPDATE test SET age = 50 WHERE name = 'Mike';");
-        // age should be updated to 40 not to 50
-        cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToFirst();
-        assertEquals("Mike", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(40, cursor.getInt(COLUMN_AGE_INDEX));
-        assertEquals("LA", cursor.getString(COLUMN_ADDR_INDEX));
-        cursor.close();
-
-        // make sure sql injection is NOT allowed or has no effect when using query()
-        String harmfulQuery = "name = 'Mike';UPDATE test SET age = 50 WHERE name = 'Mike'";
-        cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, harmfulQuery, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToFirst();
-        assertEquals("Mike", cursor.getString(COLUMN_NAME_INDEX));
-        // row's age column SHOULD NOT be 50
-        assertEquals(40, cursor.getInt(COLUMN_AGE_INDEX));
-        assertEquals("LA", cursor.getString(COLUMN_ADDR_INDEX));
-        cursor.close();;
-    }
-
-    public void testFindEditTable() {
-        String tables = "table1 table2 table3";
-        assertEquals("table1", SQLiteDatabase.findEditTable(tables));
-
-        tables = "table1,table2,table3";
-        assertEquals("table1", SQLiteDatabase.findEditTable(tables));
-
-        tables = "table1";
-        assertEquals("table1", SQLiteDatabase.findEditTable(tables));
-
-        try {
-            SQLiteDatabase.findEditTable("");
-            fail("should throw IllegalStateException.");
-        } catch (IllegalStateException e) {
-        }
-    }
-
-    public void testGetPath() {
-        assertEquals(mDatabaseFilePath, mDatabase.getPath());
-    }
-
-    public void testAccessVersion() {
-        mDatabase.setVersion(1);
-        assertEquals(1, mDatabase.getVersion());
-
-        mDatabase.setVersion(3);
-        assertEquals(3, mDatabase.getVersion());
-    }
-
-    public void testInsert() {
-        mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, "
-                + "name TEXT, age INTEGER, address TEXT);");
-
-        ContentValues values = new ContentValues();
-        values.put("name", "Jack");
-        values.put("age", 20);
-        values.put("address", "LA");
-        mDatabase.insert(TABLE_NAME, "name", values);
-
-        Cursor cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null,
-                null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToFirst();
-        assertEquals("Jack", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(20, cursor.getInt(COLUMN_AGE_INDEX));
-        assertEquals("LA", cursor.getString(COLUMN_ADDR_INDEX));
-        cursor.close();
-
-        mDatabase.insert(TABLE_NAME, "name", null);
-        cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null, null, null,
-                null, null);
-        assertNotNull(cursor);
-        assertEquals(2, cursor.getCount());
-        cursor.moveToFirst();
-        assertEquals("Jack", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(20, cursor.getInt(COLUMN_AGE_INDEX));
-        assertEquals("LA", cursor.getString(COLUMN_ADDR_INDEX));
-        cursor.moveToNext();
-        assertNull(cursor.getString(COLUMN_NAME_INDEX));
-        cursor.close();
-
-        values = new ContentValues();
-        values.put("Wrong Key", "Wrong value");
-        mDatabase.insert(TABLE_NAME, "name", values);
-        // there are still 2 records.
-        cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null, null, null,
-                null, null);
-        assertNotNull(cursor);
-        assertEquals(2, cursor.getCount());
-        cursor.close();
-
-        // delete all record.
-        mDatabase.execSQL("DELETE FROM test;");
-
-        values = new ContentValues();
-        values.put("name", "Mike");
-        values.put("age", 30);
-        values.put("address", "London");
-        mDatabase.insertOrThrow(TABLE_NAME, "name", values);
-
-        cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null, null, null,
-                null, null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToFirst();
-        assertEquals("Mike", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(30, cursor.getInt(COLUMN_AGE_INDEX));
-        assertEquals("London", cursor.getString(COLUMN_ADDR_INDEX));
-        cursor.close();
-
-        mDatabase.insertOrThrow(TABLE_NAME, "name", null);
-        cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null, null, null,
-                null, null);
-        assertNotNull(cursor);
-        assertEquals(2, cursor.getCount());
-        cursor.moveToFirst();
-        assertEquals("Mike", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(30, cursor.getInt(COLUMN_AGE_INDEX));
-        assertEquals("London", cursor.getString(COLUMN_ADDR_INDEX));
-        cursor.moveToNext();
-        assertNull(cursor.getString(COLUMN_NAME_INDEX));
-        cursor.close();
-
-        values = new ContentValues();
-        values.put("Wrong Key", "Wrong value");
-        try {
-            mDatabase.insertOrThrow(TABLE_NAME, "name", values);
-            fail("should throw SQLException.");
-        } catch (SQLException e) {
-        }
-    }
-
-    public void testIsOpen() {
-        assertTrue(mDatabase.isOpen());
-
-        mDatabase.close();
-        assertFalse(mDatabase.isOpen());
-    }
-
-    public void testIsReadOnly() {
-        assertFalse(mDatabase.isReadOnly());
-
-        SQLiteDatabase database = null;
-        try {
-            database = SQLiteDatabase.openDatabase(mDatabaseFilePath, null,
-                    SQLiteDatabase.OPEN_READONLY);
-            assertTrue(database.isReadOnly());
-        } finally {
-            if (database != null) {
-                database.close();
-            }
-        }
-    }
-
-    public void testReleaseMemory() {
-        SQLiteDatabase.releaseMemory();
-    }
-
-    public void testSetLockingEnabled() {
-        mDatabase.execSQL("CREATE TABLE test (num INTEGER);");
-        mDatabase.execSQL("INSERT INTO test (num) VALUES (0)");
-
-        mDatabase.setLockingEnabled(false);
-
-        mDatabase.beginTransaction();
-        setNum(1);
-        assertNum(1);
-        mDatabase.setTransactionSuccessful();
-        mDatabase.endTransaction();
-    }
-
-    @SuppressWarnings("deprecation")
-    public void testYieldIfContendedWhenNotContended() {
-        assertFalse(mDatabase.yieldIfContended());
-
-        mDatabase.execSQL("CREATE TABLE test (num INTEGER);");
-        mDatabase.execSQL("INSERT INTO test (num) VALUES (0)");
-
-        // Make sure that things work outside an explicit transaction.
-        setNum(1);
-        assertNum(1);
-
-        setNum(0);
-        assertFalse(mDatabase.inTransaction());
-        mDatabase.beginTransaction();
-        assertTrue(mDatabase.inTransaction());
-        assertFalse(mDatabase.yieldIfContended());
-        setNum(1);
-        mDatabase.setTransactionSuccessful();
-        mDatabase.endTransaction();
-
-        mDatabase.beginTransaction();
-        assertTrue(mDatabase.inTransaction());
-        assertFalse(mDatabase.yieldIfContendedSafely());
-        setNum(1);
-        mDatabase.setTransactionSuccessful();
-        mDatabase.endTransaction();
-    }
-
-    @SuppressWarnings("deprecation")
-    public void testYieldIfContendedWhenContended() throws Exception {
-        mDatabase.execSQL("CREATE TABLE test (num INTEGER);");
-        mDatabase.execSQL("INSERT INTO test (num) VALUES (0)");
-
-        // Begin a transaction and update a value.
-        mDatabase.beginTransaction();
-        setNum(1);
-        assertNum(1);
-
-        // On another thread, begin a transaction there.  This causes contention
-        // for use of the database.  When the main thread yields, the second thread
-        // begin its own transaction.  It should perceive the new state that was
-        // committed by the main thread when it yielded.
-        final Semaphore s = new Semaphore(0);
-        Thread t = new Thread() {
-            @Override
-            public void run() {
-                s.release(); // let main thread continue
-
-                mDatabase.beginTransaction();
-                assertNum(1);
-                setNum(2);
-                assertNum(2);
-                mDatabase.setTransactionSuccessful();
-                mDatabase.endTransaction();
-            }
-        };
-        t.start();
-
-        // Wait for thread to try to begin its transaction.
-        s.acquire();
-        Thread.sleep(500);
-
-        // Yield.  There should be contention for the database now, so yield will
-        // return true.
-        assertTrue(mDatabase.yieldIfContendedSafely());
-
-        // Since we reacquired the transaction, the other thread must have finished
-        // its transaction.  We should observe its changes and our own within this transaction.
-        assertNum(2);
-        setNum(3);
-        assertNum(3);
-
-        // Go ahead and finish the transaction.
-        mDatabase.setTransactionSuccessful();
-        mDatabase.endTransaction();
-        assertNum(3);
-
-        t.join();
-    }
-
-    public void testQuery() {
-        mDatabase.execSQL("CREATE TABLE employee (_id INTEGER PRIMARY KEY, " +
-                "name TEXT, month INTEGER, salary INTEGER);");
-        mDatabase.execSQL("INSERT INTO employee (name, month, salary) " +
-                "VALUES ('Mike', '1', '1000');");
-        mDatabase.execSQL("INSERT INTO employee (name, month, salary) " +
-                "VALUES ('Mike', '2', '3000');");
-        mDatabase.execSQL("INSERT INTO employee (name, month, salary) " +
-                "VALUES ('jack', '1', '2000');");
-        mDatabase.execSQL("INSERT INTO employee (name, month, salary) " +
-                "VALUES ('jack', '3', '1500');");
-        mDatabase.execSQL("INSERT INTO employee (name, month, salary) " +
-                "VALUES ('Jim', '1', '1000');");
-        mDatabase.execSQL("INSERT INTO employee (name, month, salary) " +
-                "VALUES ('Jim', '3', '3500');");
-
-        Cursor cursor = mDatabase.query(true, "employee", new String[] { "name", "sum(salary)" },
-                null, null, "name", "sum(salary)>1000", "name", null);
-        assertNotNull(cursor);
-        assertEquals(3, cursor.getCount());
-
-        final int COLUMN_NAME_INDEX = 0;
-        final int COLUMN_SALARY_INDEX = 1;
-        cursor.moveToFirst();
-        assertEquals("Jim", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(4500, cursor.getInt(COLUMN_SALARY_INDEX));
-        cursor.moveToNext();
-        assertEquals("Mike", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(4000, cursor.getInt(COLUMN_SALARY_INDEX));
-        cursor.moveToNext();
-        assertEquals("jack", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(3500, cursor.getInt(COLUMN_SALARY_INDEX));
-        cursor.close();
-
-        CursorFactory factory = new CursorFactory() {
-            public Cursor newCursor(SQLiteDatabase db, SQLiteCursorDriver masterQuery,
-                    String editTable, SQLiteQuery query) {
-                return new MockSQLiteCursor(db, masterQuery, editTable, query);
-            }
-        };
-        cursor = mDatabase.queryWithFactory(factory, true, "employee",
-                new String[] { "name", "sum(salary)" },
-                null, null, "name", "sum(salary) > 1000", "name", null);
-        assertNotNull(cursor);
-        assertTrue(cursor instanceof MockSQLiteCursor);
-        cursor.moveToFirst();
-        assertEquals("Jim", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(4500, cursor.getInt(COLUMN_SALARY_INDEX));
-        cursor.moveToNext();
-        assertEquals("Mike", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(4000, cursor.getInt(COLUMN_SALARY_INDEX));
-        cursor.moveToNext();
-        assertEquals("jack", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(3500, cursor.getInt(COLUMN_SALARY_INDEX));
-        cursor.close();
-
-        cursor = mDatabase.query("employee", new String[] { "name", "sum(salary)" },
-                null, null, "name", "sum(salary) <= 4000", "name");
-        assertNotNull(cursor);
-        assertEquals(2, cursor.getCount());
-
-        cursor.moveToFirst();
-        assertEquals("Mike", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(4000, cursor.getInt(COLUMN_SALARY_INDEX));
-        cursor.moveToNext();
-        assertEquals("jack", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(3500, cursor.getInt(COLUMN_SALARY_INDEX));
-        cursor.close();
-
-        cursor = mDatabase.query("employee", new String[] { "name", "sum(salary)" },
-                null, null, "name", "sum(salary) > 1000", "name", "2");
-        assertNotNull(cursor);
-        assertEquals(2, cursor.getCount());
-
-        cursor.moveToFirst();
-        assertEquals("Jim", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(4500, cursor.getInt(COLUMN_SALARY_INDEX));
-        cursor.moveToNext();
-        assertEquals("Mike", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(4000, cursor.getInt(COLUMN_SALARY_INDEX));
-        cursor.close();
-
-        String sql = "SELECT name, month FROM employee WHERE salary > ?;";
-        cursor = mDatabase.rawQuery(sql, new String[] { "2000" });
-        assertNotNull(cursor);
-        assertEquals(2, cursor.getCount());
-
-        final int COLUMN_MONTH_INDEX = 1;
-        cursor.moveToFirst();
-        assertEquals("Mike", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(2, cursor.getInt(COLUMN_MONTH_INDEX));
-        cursor.moveToNext();
-        assertEquals("Jim", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(3, cursor.getInt(COLUMN_MONTH_INDEX));
-        cursor.close();
-
-        cursor = mDatabase.rawQueryWithFactory(factory, sql, new String[] { "2000" }, null);
-        assertNotNull(cursor);
-        assertEquals(2, cursor.getCount());
-        assertTrue(cursor instanceof MockSQLiteCursor);
-        cursor.moveToFirst();
-        assertEquals("Mike", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(2, cursor.getInt(COLUMN_MONTH_INDEX));
-        cursor.moveToNext();
-        assertEquals("Jim", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(3, cursor.getInt(COLUMN_MONTH_INDEX));
-        cursor.close();
-    }
-
-    public void testReplace() {
-        mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, "
-                + "name TEXT, age INTEGER, address TEXT);");
-
-        ContentValues values = new ContentValues();
-        values.put("name", "Jack");
-        values.put("age", 20);
-        values.put("address", "LA");
-        mDatabase.replace(TABLE_NAME, "name", values);
-
-        Cursor cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION,
-                null, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToFirst();
-        int id = cursor.getInt(COLUMN_ID_INDEX);
-        assertEquals("Jack", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(20, cursor.getInt(COLUMN_AGE_INDEX));
-        assertEquals("LA", cursor.getString(COLUMN_ADDR_INDEX));
-        cursor.close();
-
-        values = new ContentValues();
-        values.put("_id", id);
-        values.put("name", "Mike");
-        values.put("age", 40);
-        values.put("address", "London");
-        mDatabase.replace(TABLE_NAME, "name", values);
-
-        cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount()); // there is still ONLY 1 record.
-        cursor.moveToFirst();
-        assertEquals("Mike", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(40, cursor.getInt(COLUMN_AGE_INDEX));
-        assertEquals("London", cursor.getString(COLUMN_ADDR_INDEX));
-        cursor.close();
-
-        values = new ContentValues();
-        values.put("name", "Jack");
-        values.put("age", 20);
-        values.put("address", "LA");
-        mDatabase.replaceOrThrow(TABLE_NAME, "name", values);
-
-        cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(2, cursor.getCount());
-        cursor.moveToFirst();
-        assertEquals("Mike", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(40, cursor.getInt(COLUMN_AGE_INDEX));
-        assertEquals("London", cursor.getString(COLUMN_ADDR_INDEX));
-        cursor.moveToNext();
-        assertEquals("Jack", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(20, cursor.getInt(COLUMN_AGE_INDEX));
-        assertEquals("LA", cursor.getString(COLUMN_ADDR_INDEX));
-        cursor.close();
-
-        values = new ContentValues();
-        values.put("Wrong Key", "Wrong value");
-        try {
-            mDatabase.replaceOrThrow(TABLE_NAME, "name", values);
-            fail("should throw SQLException.");
-        } catch (SQLException e) {
-        }
-    }
-
-    public void testUpdate() {
-        mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, data TEXT);");
-
-        mDatabase.execSQL("INSERT INTO test (data) VALUES ('string1');");
-        mDatabase.execSQL("INSERT INTO test (data) VALUES ('string2');");
-        mDatabase.execSQL("INSERT INTO test (data) VALUES ('string3');");
-
-        String updatedString = "this is an updated test";
-        ContentValues values = new ContentValues(1);
-        values.put("data", updatedString);
-        assertEquals(1, mDatabase.update("test", values, "_id=1", null));
-        Cursor cursor = mDatabase.query("test", null, "_id=1", null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToFirst();
-        String value = cursor.getString(cursor.getColumnIndexOrThrow("data"));
-        assertEquals(updatedString, value);
-        cursor.close();
-    }
-
-    public void testNeedUpgrade() {
-        mDatabase.setVersion(0);
-        assertTrue(mDatabase.needUpgrade(1));
-        mDatabase.setVersion(1);
-        assertFalse(mDatabase.needUpgrade(1));
-    }
-
-    public void testSetLocale() {
-        final String[] STRINGS = {
-                "c\u00f4t\u00e9",
-                "cote",
-                "c\u00f4te",
-                "cot\u00e9",
-                "boy",
-                "dog",
-                "COTE",
-        };
-
-        mDatabase.execSQL("CREATE TABLE test (data TEXT COLLATE LOCALIZED);");
-        for (String s : STRINGS) {
-            mDatabase.execSQL("INSERT INTO test VALUES('" + s + "');");
-        }
-
-        mDatabase.setLocale(new Locale("en", "US"));
-
-        String sql = "SELECT data FROM test ORDER BY data COLLATE LOCALIZED ASC";
-        Cursor cursor = mDatabase.rawQuery(sql, null);
-        assertNotNull(cursor);
-        ArrayList<String> items = new ArrayList<String>();
-        while (cursor.moveToNext()) {
-            items.add(cursor.getString(0));
-        }
-        String[] results = items.toArray(new String[items.size()]);
-        assertEquals(STRINGS.length, results.length);
-        cursor.close();
-
-        // The database code currently uses PRIMARY collation strength,
-        // meaning that all versions of a character compare equal (regardless
-        // of case or accents), leaving the "cote" flavors in database order.
-        MoreAsserts.assertEquals(results, new String[] {
-                STRINGS[4],  // "boy"
-                STRINGS[0],  // sundry forms of "cote"
-                STRINGS[1],
-                STRINGS[2],
-                STRINGS[3],
-                STRINGS[6],  // "COTE"
-                STRINGS[5],  // "dog"
-        });
-    }
-
-    public void testOnAllReferencesReleased() {
-        assertTrue(mDatabase.isOpen());
-        mDatabase.releaseReference();
-        assertFalse(mDatabase.isOpen());
-    }
-
-    public void testTransactionWithSQLiteTransactionListener() {
-        mDatabase.execSQL("CREATE TABLE test (num INTEGER);");
-        mDatabase.execSQL("INSERT INTO test (num) VALUES (0)");
-
-        assertEquals(mTransactionListenerOnBeginCalled, false);
-        assertEquals(mTransactionListenerOnCommitCalled, false);
-        assertEquals(mTransactionListenerOnRollbackCalled, false);
-        mDatabase.beginTransactionWithListener(new TestSQLiteTransactionListener());
-
-        // Assert that the transcation has started
-        assertEquals(mTransactionListenerOnBeginCalled, true);
-        assertEquals(mTransactionListenerOnCommitCalled, false);
-        assertEquals(mTransactionListenerOnRollbackCalled, false);
-
-        setNum(1);
-
-        // State shouldn't have changed
-        assertEquals(mTransactionListenerOnBeginCalled, true);
-        assertEquals(mTransactionListenerOnCommitCalled, false);
-        assertEquals(mTransactionListenerOnRollbackCalled, false);
-
-        // commit the transaction
-        mDatabase.setTransactionSuccessful();
-        mDatabase.endTransaction();
-
-        // the listener should have been told that commit was called
-        assertEquals(mTransactionListenerOnBeginCalled, true);
-        assertEquals(mTransactionListenerOnCommitCalled, true);
-        assertEquals(mTransactionListenerOnRollbackCalled, false);
-    }
-
-    public void testRollbackTransactionWithSQLiteTransactionListener() {
-        mDatabase.execSQL("CREATE TABLE test (num INTEGER);");
-        mDatabase.execSQL("INSERT INTO test (num) VALUES (0)");
-
-        assertEquals(mTransactionListenerOnBeginCalled, false);
-        assertEquals(mTransactionListenerOnCommitCalled, false);
-        assertEquals(mTransactionListenerOnRollbackCalled, false);
-        mDatabase.beginTransactionWithListener(new TestSQLiteTransactionListener());
-
-        // Assert that the transcation has started
-        assertEquals(mTransactionListenerOnBeginCalled, true);
-        assertEquals(mTransactionListenerOnCommitCalled, false);
-        assertEquals(mTransactionListenerOnRollbackCalled, false);
-
-        setNum(1);
-
-        // State shouldn't have changed
-        assertEquals(mTransactionListenerOnBeginCalled, true);
-        assertEquals(mTransactionListenerOnCommitCalled, false);
-        assertEquals(mTransactionListenerOnRollbackCalled, false);
-
-        // commit the transaction
-        mDatabase.endTransaction();
-
-        // the listener should have been told that commit was called
-        assertEquals(mTransactionListenerOnBeginCalled, true);
-        assertEquals(mTransactionListenerOnCommitCalled, false);
-        assertEquals(mTransactionListenerOnRollbackCalled, true);
-    }
-
-    private class TestSQLiteTransactionListener implements SQLiteTransactionListener {
-        public void onBegin() {
-            mTransactionListenerOnBeginCalled = true;
-        }
-
-        public void onCommit() {
-            mTransactionListenerOnCommitCalled = true;
-        }
-
-        public void onRollback() {
-            mTransactionListenerOnRollbackCalled = true;
-        }
-    }
-
-    public void testGroupConcat() {
-        mDatabase.execSQL("CREATE TABLE test (i INT, j TEXT);");
-
-        // insert 2 rows
-        String sql = "INSERT INTO test (i) VALUES (?);";
-        SQLiteStatement insertStatement = mDatabase.compileStatement(sql);
-        DatabaseUtils.bindObjectToProgram(insertStatement, 1, 1);
-        insertStatement.execute();
-        DatabaseUtils.bindObjectToProgram(insertStatement, 1, 2);
-        insertStatement.execute();
-        insertStatement.close();
-
-        // make sure there are 2 rows in the table
-        Cursor cursor = mDatabase.rawQuery("SELECT count(*) FROM test", null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToNext();
-        assertEquals(2, cursor.getInt(0));
-        cursor.close();
-
-        // concatenate column j from all the rows. should return NULL
-        cursor = mDatabase.rawQuery("SELECT group_concat(j, ' ') FROM test", null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToNext();
-        assertNull(cursor.getString(0));
-        cursor.close();
-
-        // drop the table
-        mDatabase.execSQL("DROP TABLE test;");
-        // should get no exceptions
-    }
-
-    public void testSchemaChanges() {
-        mDatabase.execSQL("CREATE TABLE test (i INT, j INT);");
-
-        // at the beginning, there is no record in the database.
-        Cursor cursor = mDatabase.rawQuery("SELECT * FROM test", null);
-        assertNotNull(cursor);
-        assertEquals(0, cursor.getCount());
-        cursor.close();
-
-        String sql = "INSERT INTO test VALUES (?, ?);";
-        SQLiteStatement insertStatement = mDatabase.compileStatement(sql);
-        DatabaseUtils.bindObjectToProgram(insertStatement, 1, 1);
-        DatabaseUtils.bindObjectToProgram(insertStatement, 2, 2);
-        insertStatement.execute();
-        insertStatement.close();
-
-        // read the data from the table and make sure it is correct
-        cursor = mDatabase.rawQuery("SELECT i,j FROM test", null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToNext();
-        assertEquals(1, cursor.getInt(0));
-        assertEquals(2, cursor.getInt(1));
-        cursor.close();
-
-        // alter the table and execute another statement
-        mDatabase.execSQL("ALTER TABLE test ADD COLUMN k int;");
-        sql = "INSERT INTO test VALUES (?, ?, ?);";
-        insertStatement = mDatabase.compileStatement(sql);
-        DatabaseUtils.bindObjectToProgram(insertStatement, 1, 3);
-        DatabaseUtils.bindObjectToProgram(insertStatement, 2, 4);
-        DatabaseUtils.bindObjectToProgram(insertStatement, 3, 5);
-        insertStatement.execute();
-        insertStatement.close();
-
-        // read the data from the table and make sure it is correct
-        cursor = mDatabase.rawQuery("SELECT i,j,k FROM test", null);
-        assertNotNull(cursor);
-        assertEquals(2, cursor.getCount());
-        cursor.moveToNext();
-        assertEquals(1, cursor.getInt(0));
-        assertEquals(2, cursor.getInt(1));
-        assertNull(cursor.getString(2));
-        cursor.moveToNext();
-        assertEquals(3, cursor.getInt(0));
-        assertEquals(4, cursor.getInt(1));
-        assertEquals(5, cursor.getInt(2));
-        cursor.close();
-
-        // make sure the old statement - which should *try to reuse* cached query plan -
-        // still works
-        cursor = mDatabase.rawQuery("SELECT i,j FROM test", null);
-        assertNotNull(cursor);
-        assertEquals(2, cursor.getCount());
-        cursor.moveToNext();
-        assertEquals(1, cursor.getInt(0));
-        assertEquals(2, cursor.getInt(1));
-        cursor.moveToNext();
-        assertEquals(3, cursor.getInt(0));
-        assertEquals(4, cursor.getInt(1));
-        cursor.close();
-
-        SQLiteStatement deleteStatement = mDatabase.compileStatement("DELETE FROM test");
-        deleteStatement.execute();
-        deleteStatement.close();
-    }
-
-    public void testSchemaChangesNewTable() {
-        mDatabase.execSQL("CREATE TABLE test (i INT, j INT);");
-
-        // at the beginning, there is no record in the database.
-        Cursor cursor = mDatabase.rawQuery("SELECT * FROM test", null);
-        assertNotNull(cursor);
-        assertEquals(0, cursor.getCount());
-        cursor.close();
-
-        String sql = "INSERT INTO test VALUES (?, ?);";
-        SQLiteStatement insertStatement = mDatabase.compileStatement(sql);
-        DatabaseUtils.bindObjectToProgram(insertStatement, 1, 1);
-        DatabaseUtils.bindObjectToProgram(insertStatement, 2, 2);
-        insertStatement.execute();
-        insertStatement.close();
-
-        // read the data from the table and make sure it is correct
-        cursor = mDatabase.rawQuery("SELECT i,j FROM test", null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToNext();
-        assertEquals(1, cursor.getInt(0));
-        assertEquals(2, cursor.getInt(1));
-        cursor.close();
-
-        // alter the table and execute another statement
-        mDatabase.execSQL("CREATE TABLE test_new (i INT, j INT, k INT);");
-        sql = "INSERT INTO test_new VALUES (?, ?, ?);";
-        insertStatement = mDatabase.compileStatement(sql);
-        DatabaseUtils.bindObjectToProgram(insertStatement, 1, 3);
-        DatabaseUtils.bindObjectToProgram(insertStatement, 2, 4);
-        DatabaseUtils.bindObjectToProgram(insertStatement, 3, 5);
-        insertStatement.execute();
-        insertStatement.close();
-
-        // read the data from the table and make sure it is correct
-        cursor = mDatabase.rawQuery("SELECT i,j,k FROM test_new", null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToNext();
-        assertEquals(3, cursor.getInt(0));
-        assertEquals(4, cursor.getInt(1));
-        assertEquals(5, cursor.getInt(2));
-        cursor.close();
-
-        // make sure the old statement - which should *try to reuse* cached query plan -
-        // still works
-        cursor = mDatabase.rawQuery("SELECT i,j FROM test", null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToNext();
-        assertEquals(1, cursor.getInt(0));
-        assertEquals(2, cursor.getInt(1));
-        cursor.close();
-
-        SQLiteStatement deleteStatement = mDatabase.compileStatement("DELETE FROM test");
-        deleteStatement.execute();
-        deleteStatement.close();
-
-        SQLiteStatement deleteStatement2 = mDatabase.compileStatement("DELETE FROM test_new");
-        deleteStatement2.execute();
-        deleteStatement2.close();
-    }
-
-    public void testSchemaChangesDropTable() {
-        mDatabase.execSQL("CREATE TABLE test (i INT, j INT);");
-
-        // at the beginning, there is no record in the database.
-        Cursor cursor = mDatabase.rawQuery("SELECT * FROM test", null);
-        assertNotNull(cursor);
-        assertEquals(0, cursor.getCount());
-        cursor.close();
-
-        String sql = "INSERT INTO test VALUES (?, ?);";
-        SQLiteStatement insertStatement = mDatabase.compileStatement(sql);
-        DatabaseUtils.bindObjectToProgram(insertStatement, 1, 1);
-        DatabaseUtils.bindObjectToProgram(insertStatement, 2, 2);
-        insertStatement.execute();
-        insertStatement.close();
-
-        // read the data from the table and make sure it is correct
-        cursor = mDatabase.rawQuery("SELECT i,j FROM test", null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToNext();
-        assertEquals(1, cursor.getInt(0));
-        assertEquals(2, cursor.getInt(1));
-    }
-
-    /**
-     * With sqlite's write-ahead-logging (WAL) enabled, readers get old version of data
-     * from the table that a writer is modifying at the same time.
-     * <p>
-     * This method does the following to test this sqlite3 feature
-     * <ol>
-     *   <li>creates a table in the database and populates it with 5 rows of data</li>
-     *   <li>do "select count(*) from this_table" and expect to receive 5</li>
-     *   <li>start a writer thread who BEGINs a transaction, INSERTs a single row
-     *   into this_table</li>
-     *   <li>writer stops the transaction at this point, kicks off a reader thread - which will
-     *       do  the above SELECT query: "select count(*) from this_table"</li>
-     *   <li>this query should return value 5 - because writer is still in transaction and
-     *    sqlite returns OLD version of the data</li>
-     *   <li>writer ends the transaction, thus making the extra row now visible to everyone</li>
-     *   <li>reader is kicked off again to do the same query. this time query should
-     *   return value = 6 which includes the newly inserted row into this_table.</li>
-     *</p>
-     * @throws InterruptedException
-     */
-    @LargeTest
-    public void testReaderGetsOldVersionOfDataWhenWriterIsInXact() throws InterruptedException {
-        // redo setup to create WAL enabled database
-        mDatabase.close();
-        new File(mDatabase.getPath()).delete();
-        mDatabase = SQLiteDatabase.openOrCreateDatabase(mDatabaseFile.getPath(), null, null);
-        boolean rslt = mDatabase.enableWriteAheadLogging();
-        assertTrue(rslt);
-        assertNotNull(mDatabase);
-
-        // create a new table and insert 5 records into it.
-        mDatabase.execSQL("CREATE TABLE t1 (i int, j int);");
-        mDatabase.beginTransaction();
-        for (int i = 0; i < 5; i++) {
-            mDatabase.execSQL("insert into t1 values(?,?);", new String[] {i + "", i + ""});
-        }
-        mDatabase.setTransactionSuccessful();
-        mDatabase.endTransaction();
-
-        // make sure a reader can read the above data
-        ReaderQueryingData r1 = new ReaderQueryingData(5);
-        r1.start();
-        Thread.yield();
-        try { r1.join(); } catch (Exception e) { }
-
-        WriterDoingSingleTransaction w = new WriterDoingSingleTransaction();
-        w.start();
-        w.join();
-    }
-
-    private class WriterDoingSingleTransaction extends Thread {
-        @Override public void run() {
-            // start a transaction
-            mDatabase.beginTransactionNonExclusive();
-            mDatabase.execSQL("insert into t1 values(?,?);", new String[] {"11", "11"});
-            assertTrue(mDatabase.isOpen());
-
-            // while the writer is in a transaction, start a reader and make sure it can still
-            // read 5 rows of data (= old data prior to the current transaction)
-            ReaderQueryingData r1 = new ReaderQueryingData(5);
-            r1.start();
-            try { r1.join(); } catch (Exception e) { }
-
-            // now, have the writer do the select count(*)
-            // it should execute on the same connection as this transaction
-            // and count(*) should reflect the newly inserted row
-            Long l = DatabaseUtils.longForQuery(mDatabase, "select count(*) from t1", null);
-            assertEquals(6, l.intValue());
-
-            // end transaction
-            mDatabase.setTransactionSuccessful();
-            mDatabase.endTransaction();
-
-            // reader should now be able to read 6 rows = new data AFTER this transaction
-            r1 = new ReaderQueryingData(6);
-            r1.start();
-            try { r1.join(); } catch (Exception e) { }
-        }
-    }
-
-    private class ReaderQueryingData extends Thread {
-        private int count;
-        /**
-         * constructor with a param to indicate the number of rows expected to be read
-         */
-        public ReaderQueryingData(int count) {
-            this.count = count;
-        }
-        @Override public void run() {
-            Long l = DatabaseUtils.longForQuery(mDatabase, "select count(*) from t1", null);
-            assertEquals(count, l.intValue());
-        }
-    }
-
-    public void testExceptionsFromEnableWriteAheadLogging() {
-        // attach a database
-        // redo setup to create WAL enabled database
-        mDatabase.close();
-        new File(mDatabase.getPath()).delete();
-        mDatabase = SQLiteDatabase.openOrCreateDatabase(mDatabaseFile.getPath(), null, null);
-
-        // attach a database and call enableWriteAheadLogging - should not be allowed
-        mDatabase.execSQL("attach database ':memory:' as memoryDb");
-        assertFalse(mDatabase.isWriteAheadLoggingEnabled());
-        assertFalse(mDatabase.enableWriteAheadLogging());
-        assertFalse(mDatabase.isWriteAheadLoggingEnabled());
-
-        // enableWriteAheadLogging on memory database is not allowed
-        SQLiteDatabase db = SQLiteDatabase.create(null);
-        assertFalse(mDatabase.isWriteAheadLoggingEnabled());
-        assertFalse(db.enableWriteAheadLogging());
-        assertFalse(mDatabase.isWriteAheadLoggingEnabled());
-        db.close();
-    }
-
-    public void testEnableThenDisableWriteAheadLogging() {
-        // Enable WAL.
-        assertFalse(mDatabase.isWriteAheadLoggingEnabled());
-        assertTrue(mDatabase.enableWriteAheadLogging());
-        assertTrue(mDatabase.isWriteAheadLoggingEnabled());
-        assertTrue(DatabaseUtils.stringForQuery(mDatabase, "PRAGMA journal_mode", null)
-                .equalsIgnoreCase("WAL"));
-
-        // Enabling when already enabled should have no observable effect.
-        assertTrue(mDatabase.enableWriteAheadLogging());
-        assertTrue(mDatabase.isWriteAheadLoggingEnabled());
-        assertTrue(DatabaseUtils.stringForQuery(mDatabase, "PRAGMA journal_mode", null)
-                .equalsIgnoreCase("WAL"));
-
-        // Disabling when there are no connections should work.
-        mDatabase.disableWriteAheadLogging();
-        assertFalse(mDatabase.isWriteAheadLoggingEnabled());
-    }
-
-    public void testEnableThenDisableWriteAheadLoggingUsingOpenFlag() {
-        new File(mDatabase.getPath()).delete();
-        mDatabase = SQLiteDatabase.openDatabase(mDatabaseFile.getPath(), null,
-                SQLiteDatabase.CREATE_IF_NECESSARY | SQLiteDatabase.ENABLE_WRITE_AHEAD_LOGGING,
-                null);
-        assertTrue(mDatabase.isWriteAheadLoggingEnabled());
-        assertTrue(DatabaseUtils.stringForQuery(mDatabase, "PRAGMA journal_mode", null)
-                .equalsIgnoreCase("WAL"));
-
-        // Enabling when already enabled should have no observable effect.
-        assertTrue(mDatabase.enableWriteAheadLogging());
-        assertTrue(mDatabase.isWriteAheadLoggingEnabled());
-        assertTrue(DatabaseUtils.stringForQuery(mDatabase, "PRAGMA journal_mode", null)
-                .equalsIgnoreCase("WAL"));
-
-        // Disabling when there are no connections should work.
-        mDatabase.disableWriteAheadLogging();
-        assertFalse(mDatabase.isWriteAheadLoggingEnabled());
-    }
-
-    public void testEnableWriteAheadLoggingFromContextUsingModeFlag() {
-        // Without the MODE_ENABLE_WRITE_AHEAD_LOGGING flag, database opens without WAL.
-        getContext().deleteDatabase(DATABASE_FILE_NAME);
-        mDatabase = getContext().openOrCreateDatabase(DATABASE_FILE_NAME,
-                Context.MODE_PRIVATE, null);
-        assertFalse(mDatabase.isWriteAheadLoggingEnabled());
-        mDatabase.close();
-
-        // With the MODE_ENABLE_WRITE_AHEAD_LOGGING flag, database opens with WAL.
-        getContext().deleteDatabase(DATABASE_FILE_NAME);
-        mDatabase = getContext().openOrCreateDatabase(DATABASE_FILE_NAME,
-                Context.MODE_PRIVATE | Context.MODE_ENABLE_WRITE_AHEAD_LOGGING, null);
-        assertTrue(mDatabase.isWriteAheadLoggingEnabled());
-        mDatabase.close();
-    }
-
-    public void testEnableWriteAheadLoggingShouldThrowIfTransactionInProgress() {
-        assertFalse(mDatabase.isWriteAheadLoggingEnabled());
-        String oldJournalMode = DatabaseUtils.stringForQuery(
-                mDatabase, "PRAGMA journal_mode", null);
-
-        // Begin transaction.
-        mDatabase.beginTransaction();
-
-        try {
-            // Attempt to enable WAL should fail.
-            mDatabase.enableWriteAheadLogging();
-            fail("Expected IllegalStateException");
-        } catch (IllegalStateException ex) {
-            // expected
-        }
-
-        assertFalse(mDatabase.isWriteAheadLoggingEnabled());
-        assertTrue(DatabaseUtils.stringForQuery(mDatabase, "PRAGMA journal_mode", null)
-                .equalsIgnoreCase(oldJournalMode));
-    }
-
-    public void testDisableWriteAheadLoggingShouldThrowIfTransactionInProgress() {
-        // Enable WAL.
-        assertFalse(mDatabase.isWriteAheadLoggingEnabled());
-        assertTrue(mDatabase.enableWriteAheadLogging());
-        assertTrue(mDatabase.isWriteAheadLoggingEnabled());
-
-        // Begin transaction.
-        mDatabase.beginTransaction();
-
-        try {
-            // Attempt to disable WAL should fail.
-            mDatabase.disableWriteAheadLogging();
-            fail("Expected IllegalStateException");
-        } catch (IllegalStateException ex) {
-            // expected
-        }
-
-        assertTrue(mDatabase.isWriteAheadLoggingEnabled());
-        assertTrue(DatabaseUtils.stringForQuery(mDatabase, "PRAGMA journal_mode", null)
-                .equalsIgnoreCase("WAL"));
-    }
-
-    public void testEnableAndDisableForeignKeys() {
-        // Initially off.
-        assertEquals(0, DatabaseUtils.longForQuery(mDatabase, "PRAGMA foreign_keys", null));
-
-        // Enable foreign keys.
-        mDatabase.setForeignKeyConstraintsEnabled(true);
-        assertEquals(1, DatabaseUtils.longForQuery(mDatabase, "PRAGMA foreign_keys", null));
-
-        // Disable foreign keys.
-        mDatabase.setForeignKeyConstraintsEnabled(false);
-        assertEquals(0, DatabaseUtils.longForQuery(mDatabase, "PRAGMA foreign_keys", null));
-
-        // Cannot configure foreign keys if there are transactions in progress.
-        mDatabase.beginTransaction();
-        try {
-            mDatabase.setForeignKeyConstraintsEnabled(true);
-            fail("Expected IllegalStateException");
-        } catch (IllegalStateException ex) {
-            // expected
-        }
-        assertEquals(0, DatabaseUtils.longForQuery(mDatabase, "PRAGMA foreign_keys", null));
-        mDatabase.endTransaction();
-
-        // Enable foreign keys should work again after transaction complete.
-        mDatabase.setForeignKeyConstraintsEnabled(true);
-        assertEquals(1, DatabaseUtils.longForQuery(mDatabase, "PRAGMA foreign_keys", null));
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteDiskIOExceptionTest.java b/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteDiskIOExceptionTest.java
deleted file mode 100755
index 503607fdb5aedbbcf3b5851842b104c3de57820a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteDiskIOExceptionTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.sqlite.cts;
-
-import android.database.sqlite.SQLiteDiskIOException;
-import android.test.AndroidTestCase;
-
-public class SQLiteDiskIOExceptionTest extends AndroidTestCase {
-    public void testConstructor() {
-        new SQLiteDiskIOException();
-
-        new SQLiteDiskIOException("error");
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteDoneExceptionTest.java b/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteDoneExceptionTest.java
deleted file mode 100755
index 881d1c812028a165b2544ae0916ad6da68a68737..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteDoneExceptionTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.sqlite.cts;
-
-import android.database.sqlite.SQLiteDoneException;
-import android.test.AndroidTestCase;
-
-public class SQLiteDoneExceptionTest extends AndroidTestCase {
-    public void testConstructor() {
-        new SQLiteDoneException();
-
-        new SQLiteDoneException("error");
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteExceptionTest.java b/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteExceptionTest.java
deleted file mode 100755
index bac8e607f5923eb4315e9e64049b3b3ac4692aa1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteExceptionTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.sqlite.cts;
-
-import android.database.sqlite.SQLiteException;
-import android.test.AndroidTestCase;
-
-public class SQLiteExceptionTest extends AndroidTestCase {
-    public void testConstructor() {
-        new SQLiteException();
-
-        new SQLiteException("error");
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteFtsTest.java b/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteFtsTest.java
deleted file mode 100755
index d291dd70861f553d238980414b186ed557b28160..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteFtsTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.sqlite.cts;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.res.Resources;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.test.AndroidTestCase;
-
-import java.io.File;
-
-/**
- * Tests to verify FTS3/4 SQLite support.
- */
-public class SQLiteFtsTest extends AndroidTestCase {
-
-    private static final String TEST_TABLE = "cts_fts";
-
-    private static final String[] TEST_CONTENT = {
-            "Any sufficiently advanced TECHnology is indistinguishable from magic.",
-            "Those who would give up Essential Liberty to purchase a little Temporary Safety, deserve neither Liberty nor Safety.",
-            "It is poor civic hygiene to install technologies that could someday facilitate a police state.",
-    };
-
-    private SQLiteDatabase mDatabase;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mDatabase = getContext().openOrCreateDatabase("CTS_FTS", Context.MODE_PRIVATE, null);
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        try {
-            final String path = mDatabase.getPath();
-            mDatabase.close();
-            SQLiteDatabase.deleteDatabase(new File(path));
-        } finally {
-            super.tearDown();
-        }
-    }
-
-    public void testFts3Porter() throws Exception {
-        prepareFtsTable(TEST_TABLE, "fts3", "tokenize=porter");
-
-        // Porter should include stemmed words
-        final Cursor cursor = queryFtsTable(TEST_TABLE, "technology");
-        try {
-            assertEquals(2, cursor.getCount());
-            cursor.moveToPosition(0);
-            assertTrue(cursor.getString(0).contains(">TECHnology<"));
-            cursor.moveToPosition(1);
-            assertTrue(cursor.getString(0).contains(">technologies<"));
-        } finally {
-            cursor.close();
-        }
-    }
-
-    public void testFts3Simple() throws Exception {
-        prepareFtsTable(TEST_TABLE, "fts3", "tokenize=simple");
-
-        // Simple shouldn't include stemmed words
-        final Cursor cursor = queryFtsTable(TEST_TABLE, "technology");
-        try {
-            assertEquals(1, cursor.getCount());
-            cursor.moveToPosition(0);
-            assertTrue(cursor.getString(0).contains(">TECHnology<"));
-        } finally {
-            cursor.close();
-        }
-    }
-
-    public void testFts4Simple() throws Exception {
-        prepareFtsTable(TEST_TABLE, "fts4", "tokenize=simple");
-
-        // Simple shouldn't include stemmed words
-        final Cursor cursor = queryFtsTable(TEST_TABLE, "technology");
-        try {
-            assertEquals(1, cursor.getCount());
-            cursor.moveToPosition(0);
-            assertTrue(cursor.getString(0).contains(">TECHnology<"));
-        } finally {
-            cursor.close();
-        }
-    }
-
-    private void prepareFtsTable(String table, String ftsType, String options)
-            throws Exception {
-        mDatabase.execSQL(
-                "CREATE VIRTUAL TABLE " + table + " USING " + ftsType
-                + "(content TEXT, " + options + ");");
-
-        final Resources res = getContext().getResources();
-        final ContentValues values = new ContentValues();
-        for (String content : TEST_CONTENT) {
-            values.clear();
-            values.put("content", content);
-            mDatabase.insert(table, null, values);
-        }
-    }
-
-    private Cursor queryFtsTable(String table, String match) {
-        return mDatabase.query(table, new String[] { "snippet(" + table + ")" },
-                "content MATCH ?", new String[] { match },
-                null, null, "rowid ASC");
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteFullExceptionTest.java b/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteFullExceptionTest.java
deleted file mode 100755
index 5745c88b79fadde19f9c5954e6f1d1068da76624..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteFullExceptionTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.sqlite.cts;
-
-import android.database.sqlite.SQLiteFullException;
-import android.test.AndroidTestCase;
-
-public class SQLiteFullExceptionTest extends AndroidTestCase {
-    public void testConstructor() {
-        new SQLiteFullException();
-
-        new SQLiteFullException("error");
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteMisuseExceptionTest.java b/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteMisuseExceptionTest.java
deleted file mode 100755
index a67018475ec4180c1316bafe86ed45dc51ddfa7b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteMisuseExceptionTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.sqlite.cts;
-
-import android.database.sqlite.SQLiteMisuseException;
-import android.test.AndroidTestCase;
-
-public class SQLiteMisuseExceptionTest extends AndroidTestCase {
-    public void testConstructor() {
-        new SQLiteMisuseException();
-
-        new SQLiteMisuseException("error");
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteOpenHelperTest.java b/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteOpenHelperTest.java
deleted file mode 100755
index 8a0ba217b5a963be5b4668581999a00f1dbfa4b9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteOpenHelperTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.sqlite.cts;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteCursor;
-import android.database.sqlite.SQLiteCursorDriver;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.database.sqlite.SQLiteQuery;
-import android.database.sqlite.SQLiteDatabase.CursorFactory;
-import android.test.AndroidTestCase;
-
-/**
- * Test {@link SQLiteOpenHelper}.
- */
-public class SQLiteOpenHelperTest extends AndroidTestCase {
-    private static final String TEST_DATABASE_NAME = "database_test.db";
-    private static final int TEST_VERSION = 1;
-    private static final int TEST_ILLEGAL_VERSION = 0;
-    private MockOpenHelper mOpenHelper;
-    private SQLiteDatabase.CursorFactory mFactory = new SQLiteDatabase.CursorFactory() {
-        public Cursor newCursor(SQLiteDatabase db, SQLiteCursorDriver masterQuery,
-                String editTable, SQLiteQuery query) {
-            return new MockCursor(db, masterQuery, editTable, query);
-        }
-    };
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mOpenHelper = getOpenHelper();
-    }
-
-    public void testConstructor() {
-        new MockOpenHelper(mContext, TEST_DATABASE_NAME, mFactory, TEST_VERSION);
-
-        // Test with illegal version number.
-        try {
-            new MockOpenHelper(mContext, TEST_DATABASE_NAME, mFactory, TEST_ILLEGAL_VERSION);
-            fail("Constructor of SQLiteOpenHelp should throws a IllegalArgumentException here.");
-        } catch (IllegalArgumentException e) {
-        }
-
-        // Test with null factory
-        new MockOpenHelper(mContext, TEST_DATABASE_NAME, null, TEST_VERSION);
-    }
-
-    public void testGetDatabase() {
-        SQLiteDatabase database = null;
-        assertFalse(mOpenHelper.hasCalledOnOpen());
-        // Test getReadableDatabase.
-        database = mOpenHelper.getReadableDatabase();
-        assertNotNull(database);
-        assertTrue(database.isOpen());
-        assertTrue(mOpenHelper.hasCalledOnOpen());
-
-        // Database has been opened, so onOpen can not be invoked.
-        mOpenHelper.resetStatus();
-        assertFalse(mOpenHelper.hasCalledOnOpen());
-        // Test getWritableDatabase.
-        SQLiteDatabase database2 = mOpenHelper.getWritableDatabase();
-        assertSame(database, database2);
-        assertTrue(database.isOpen());
-        assertFalse(mOpenHelper.hasCalledOnOpen());
-
-        mOpenHelper.close();
-        assertFalse(database.isOpen());
-
-        // After close(), onOpen() will be invoked by getWritableDatabase.
-        mOpenHelper.resetStatus();
-        assertFalse(mOpenHelper.hasCalledOnOpen());
-        SQLiteDatabase database3 = mOpenHelper.getWritableDatabase();
-        assertNotNull(database);
-        assertNotSame(database, database3);
-        assertTrue(mOpenHelper.hasCalledOnOpen());
-        assertTrue(database3.isOpen());
-        mOpenHelper.close();
-        assertFalse(database3.isOpen());
-    }
-
-    private MockOpenHelper getOpenHelper() {
-        return new MockOpenHelper(mContext, TEST_DATABASE_NAME, mFactory, TEST_VERSION);
-    }
-
-    private class MockOpenHelper extends SQLiteOpenHelper {
-        private boolean mHasCalledOnOpen = false;
-
-        public MockOpenHelper(Context context, String name, CursorFactory factory, int version) {
-            super(context, name, factory, version);
-        }
-
-        @Override
-        public void onCreate(SQLiteDatabase db) {
-        }
-
-        @Override
-        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        }
-
-        @Override
-        public void onOpen(SQLiteDatabase db) {
-            mHasCalledOnOpen = true;
-        }
-
-        public boolean hasCalledOnOpen() {
-            return mHasCalledOnOpen;
-        }
-
-        public void resetStatus() {
-            mHasCalledOnOpen = false;
-        }
-    }
-
-    private class MockCursor extends SQLiteCursor {
-        public MockCursor(SQLiteDatabase db, SQLiteCursorDriver driver, String editTable,
-                SQLiteQuery query) {
-            super(db, driver, editTable, query);
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteProgramTest.java b/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteProgramTest.java
deleted file mode 100755
index 9477aecd7e2b68d1a54e338bbff850dcc0333f57..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteProgramTest.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.sqlite.cts;
-
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteDoneException;
-import android.database.sqlite.SQLiteException;
-import android.database.sqlite.SQLiteStatement;
-import android.test.AndroidTestCase;
-import android.test.MoreAsserts;
-
-public class SQLiteProgramTest extends AndroidTestCase {
-    private static final String DATABASE_NAME = "database_test.db";
-
-    private SQLiteDatabase mDatabase;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        getContext().deleteDatabase(DATABASE_NAME);
-        mDatabase = getContext().openOrCreateDatabase(DATABASE_NAME, Context.MODE_PRIVATE, null);
-        assertNotNull(mDatabase);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mDatabase.close();
-        getContext().deleteDatabase(DATABASE_NAME);
-
-        super.tearDown();
-    }
-
-    public void testBind() {
-        mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, text1 TEXT, text2 TEXT, " +
-                "num1 INTEGER, num2 INTEGER, image BLOB);");
-        mDatabase.execSQL("INSERT INTO test (text1, text2, num1, num2, image) " +
-                "VALUES ('Mike', 'Jack', 12, 30, 'abcdefg');");
-        mDatabase.execSQL("INSERT INTO test (text1, text2, num1, num2, image) " +
-                "VALUES ('test1', 'test2', 213, 589, '123456789');");
-        SQLiteStatement statement;
-
-        statement = mDatabase.compileStatement("SELECT num1 FROM test WHERE num2 = ?;");
-        statement.bindLong(1, 30);
-        assertEquals(12, statement.simpleQueryForLong());
-
-        // re-bind without clearing
-        statement.bindDouble(1, 589.0);
-        assertEquals(213, statement.simpleQueryForLong());
-        statement.close();
-
-        statement = mDatabase.compileStatement("SELECT text1 FROM test WHERE text2 = ?;");
-
-        statement.bindDouble(1, 589.0); // Wrong binding
-        try {
-            statement.simpleQueryForString();
-            fail("Should throw exception (no rows found)");
-        } catch (SQLiteDoneException expected) {
-            // expected
-        }
-        statement.bindString(1, "test2");
-        assertEquals("test1", statement.simpleQueryForString());
-        statement.clearBindings();
-        try {
-            statement.simpleQueryForString();
-            fail("Should throw exception (unbound value)");
-        } catch (SQLiteDoneException expected) {
-            // expected
-        }
-        statement.close();
-
-        Cursor cursor = null;
-        try {
-            cursor = mDatabase.query("test", new String[]{"text1"}, "where text1='a'",
-                    new String[]{"foo"}, null, null, null);
-            fail("Should throw exception (no value to bind)");
-        } catch (SQLiteException expected) {
-            // expected
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
-        }
-        try {
-            cursor = mDatabase.query("test", new String[]{"text1"}, "where text1='a'",
-                    new String[]{"foo", "bar"}, null, null, null);
-            fail("Should throw exception (index too large)");
-        } catch (SQLiteException expected) {
-            // expected
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
-        }
-        // test positive case
-        statement = mDatabase.compileStatement(
-                "SELECT text1 FROM test WHERE text2 = ? AND num2 = ?;");
-        statement.bindString(1, "Jack");
-        statement.bindLong(2, 30);
-        assertEquals("Mike", statement.simpleQueryForString());
-        statement.close();
-    }
-
-    public void testBindNull() {
-        mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, text1 TEXT, text2 TEXT, " +
-                "num1 INTEGER, num2 INTEGER, image BLOB);");
-
-        SQLiteStatement statement = mDatabase.compileStatement("INSERT INTO test " +
-                "(text1,text2,num1,image) VALUES (?,?,?,?)");
-        statement.bindString(1, "string1");
-        statement.bindString(2, "string2");
-        statement.bindLong(3, 100);
-        statement.bindNull(4);
-        statement.execute();
-        statement.close();
-
-        final int COLUMN_TEXT1_INDEX = 0;
-        final int COLUMN_TEXT2_INDEX = 1;
-        final int COLUMN_NUM1_INDEX = 2;
-        final int COLUMN_IMAGE_INDEX = 3;
-
-        Cursor cursor = mDatabase.query("test", new String[] { "text1", "text2", "num1", "image" },
-                null, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToFirst();
-        assertEquals("string1", cursor.getString(COLUMN_TEXT1_INDEX));
-        assertEquals("string2", cursor.getString(COLUMN_TEXT2_INDEX));
-        assertEquals(100, cursor.getInt(COLUMN_NUM1_INDEX));
-        assertNull(cursor.getString(COLUMN_IMAGE_INDEX));
-        cursor.close();
-    }
-
-    public void testBindBlob() {
-        mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, text1 TEXT, text2 TEXT, " +
-                "num1 INTEGER, num2 INTEGER, image BLOB);");
-
-        SQLiteStatement statement = mDatabase.compileStatement("INSERT INTO test " +
-                "(text1,text2,num1,image) VALUES (?,?,?,?)");
-        statement.bindString(1, "string1");
-        statement.bindString(2, "string2");
-        statement.bindLong(3, 100);
-        byte[] blob = new byte[] { '1', '2', '3' };
-        statement.bindBlob(4, blob);
-        statement.execute();
-        statement.close();
-
-        final int COLUMN_TEXT1_INDEX = 0;
-        final int COLUMN_TEXT2_INDEX = 1;
-        final int COLUMN_NUM1_INDEX = 2;
-        final int COLUMN_IMAGE_INDEX = 3;
-
-        Cursor cursor = mDatabase.query("test", new String[] { "text1", "text2", "num1", "image" },
-                null, null, null, null, null);
-        assertNotNull(cursor);
-        assertEquals(1, cursor.getCount());
-        cursor.moveToFirst();
-        assertEquals("string1", cursor.getString(COLUMN_TEXT1_INDEX));
-        assertEquals("string2", cursor.getString(COLUMN_TEXT2_INDEX));
-        assertEquals(100, cursor.getInt(COLUMN_NUM1_INDEX));
-        byte[] value = cursor.getBlob(COLUMN_IMAGE_INDEX);
-        MoreAsserts.assertEquals(blob, value);
-        cursor.close();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java b/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java
deleted file mode 100755
index cde0bb0a563d7365d5f54f302a8152d26f609b4a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java
+++ /dev/null
@@ -1,499 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.sqlite.cts;
-
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteCursor;
-import android.database.sqlite.SQLiteCursorDriver;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteQuery;
-import android.database.sqlite.SQLiteQueryBuilder;
-import android.os.CancellationSignal;
-import android.os.OperationCanceledException;
-import android.test.AndroidTestCase;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.Semaphore;
-
-public class SQLiteQueryBuilderTest extends AndroidTestCase {
-    private SQLiteDatabase mDatabase;
-    private final String TEST_TABLE_NAME = "test";
-    private final String EMPLOYEE_TABLE_NAME = "employee";
-    private static final String DATABASE_FILE = "database_test.db";
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        getContext().deleteDatabase(DATABASE_FILE);
-        mDatabase = getContext().openOrCreateDatabase(DATABASE_FILE, Context.MODE_PRIVATE, null);
-        assertNotNull(mDatabase);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mDatabase.close();
-        getContext().deleteDatabase(DATABASE_FILE);
-        super.tearDown();
-    }
-
-    public void testConstructor() {
-        new SQLiteQueryBuilder();
-    }
-
-    public void testSetDistinct() {
-        String expected;
-        SQLiteQueryBuilder sqliteQueryBuilder = new SQLiteQueryBuilder();
-        sqliteQueryBuilder.setTables(TEST_TABLE_NAME);
-        sqliteQueryBuilder.setDistinct(false);
-        sqliteQueryBuilder.appendWhere("age=20");
-        String sql = sqliteQueryBuilder.buildQuery(new String[] { "age", "address" },
-                null, null, null, null, null, null);
-        assertEquals(TEST_TABLE_NAME, sqliteQueryBuilder.getTables());
-        expected = "SELECT age, address FROM " + TEST_TABLE_NAME + " WHERE (age=20)";
-        assertEquals(expected, sql);
-
-        sqliteQueryBuilder = new SQLiteQueryBuilder();
-        sqliteQueryBuilder.setTables(EMPLOYEE_TABLE_NAME);
-        sqliteQueryBuilder.setDistinct(true);
-        sqliteQueryBuilder.appendWhere("age>32");
-        sql = sqliteQueryBuilder.buildQuery(new String[] { "age", "address" },
-                null, null, null, null, null, null);
-        assertEquals(EMPLOYEE_TABLE_NAME, sqliteQueryBuilder.getTables());
-        expected = "SELECT DISTINCT age, address FROM " + EMPLOYEE_TABLE_NAME + " WHERE (age>32)";
-        assertEquals(expected, sql);
-
-        sqliteQueryBuilder = new SQLiteQueryBuilder();
-        sqliteQueryBuilder.setTables(EMPLOYEE_TABLE_NAME);
-        sqliteQueryBuilder.setDistinct(true);
-        sqliteQueryBuilder.appendWhereEscapeString("age>32");
-        sql = sqliteQueryBuilder.buildQuery(new String[] { "age", "address" },
-                null, null, null, null, null, null);
-        assertEquals(EMPLOYEE_TABLE_NAME, sqliteQueryBuilder.getTables());
-        expected = "SELECT DISTINCT age, address FROM " + EMPLOYEE_TABLE_NAME
-                + " WHERE ('age>32')";
-        assertEquals(expected, sql);
-    }
-
-    public void testSetProjectionMap() {
-        String expected;
-        Map<String, String> projectMap = new HashMap<String, String>();
-        projectMap.put("EmployeeName", "name");
-        projectMap.put("EmployeeAge", "age");
-        projectMap.put("EmployeeAddress", "address");
-        SQLiteQueryBuilder sqliteQueryBuilder = new SQLiteQueryBuilder();
-        sqliteQueryBuilder.setTables(TEST_TABLE_NAME);
-        sqliteQueryBuilder.setDistinct(false);
-        sqliteQueryBuilder.setProjectionMap(projectMap);
-        String sql = sqliteQueryBuilder.buildQuery(new String[] { "EmployeeName", "EmployeeAge" },
-                null, null, null, null, null, null);
-        expected = "SELECT name, age FROM " + TEST_TABLE_NAME;
-        assertEquals(expected, sql);
-
-        sql = sqliteQueryBuilder.buildQuery(null, // projectionIn is null
-                null, null, null, null, null, null);
-        // TODO: implement an order-independent way of doing the projection columns comparison
-        expected = "SELECT address, name, age FROM " + TEST_TABLE_NAME;
-        assertEquals(expected, sql);
-
-        sqliteQueryBuilder.setProjectionMap(null);
-        sql = sqliteQueryBuilder.buildQuery(new String[] { "name", "address" },
-                null, null, null, null, null, null);
-        expected = "SELECT name, address FROM " + TEST_TABLE_NAME;
-        assertEquals(expected, sql);
-    }
-
-    public void testSetCursorFactory() {
-        mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, " +
-                "name TEXT, age INTEGER, address TEXT);");
-        mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Mike', '20', 'LA');");
-        mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('jack', '40', 'LA');");
-
-        SQLiteQueryBuilder sqliteQueryBuilder = new SQLiteQueryBuilder();
-        sqliteQueryBuilder.setTables(TEST_TABLE_NAME);
-        Cursor cursor = sqliteQueryBuilder.query(mDatabase, new String[] { "name", "age" },
-                null, null, null, null, null);
-        assertNotNull(cursor);
-        assertTrue(cursor instanceof SQLiteCursor);
-        cursor.close();
-
-        SQLiteDatabase.CursorFactory factory = new SQLiteDatabase.CursorFactory() {
-            public Cursor newCursor(SQLiteDatabase db, SQLiteCursorDriver masterQuery,
-                    String editTable, SQLiteQuery query) {
-                return new MockCursor(db, masterQuery, editTable, query);
-            }
-        };
-
-        sqliteQueryBuilder.setCursorFactory(factory);
-        cursor = sqliteQueryBuilder.query(mDatabase, new String[] { "name", "age" },
-                null, null, null, null, null);
-        assertNotNull(cursor);
-        assertTrue(cursor instanceof MockCursor);
-        cursor.close();
-    }
-
-    private static class MockCursor extends SQLiteCursor {
-        public MockCursor(SQLiteDatabase db, SQLiteCursorDriver driver,
-                String editTable, SQLiteQuery query) {
-            super(db, driver, editTable, query);
-        }
-    }
-
-    public void testBuildQueryString() {
-        String expected;
-        final String[] DEFAULT_TEST_PROJECTION = new String [] { "name", "age", "sum(salary)" };
-        final String DEFAULT_TEST_WHERE = "age > 25";
-        final String DEFAULT_HAVING = "sum(salary) > 3000";
-
-        String sql = SQLiteQueryBuilder.buildQueryString(false, "Employee",
-                DEFAULT_TEST_PROJECTION,
-                DEFAULT_TEST_WHERE, "name", DEFAULT_HAVING, "name", "100");
-
-        expected = "SELECT name, age, sum(salary) FROM Employee WHERE " + DEFAULT_TEST_WHERE +
-                " GROUP BY name " +
-                "HAVING " + DEFAULT_HAVING + " " +
-                "ORDER BY name " +
-                "LIMIT 100";
-        assertEquals(expected, sql);
-    }
-
-    public void testBuildQuery() {
-        final String[] DEFAULT_TEST_PROJECTION = new String[] { "name", "sum(salary)" };
-        final String DEFAULT_TEST_WHERE = "age > 25";
-        final String DEFAULT_HAVING = "sum(salary) > 2000";
-
-        SQLiteQueryBuilder sqliteQueryBuilder = new SQLiteQueryBuilder();
-        sqliteQueryBuilder.setTables(TEST_TABLE_NAME);
-        sqliteQueryBuilder.setDistinct(false);
-        String sql = sqliteQueryBuilder.buildQuery(DEFAULT_TEST_PROJECTION,
-                DEFAULT_TEST_WHERE, null, "name", DEFAULT_HAVING, "name", "2");
-        String expected = "SELECT name, sum(salary) FROM " + TEST_TABLE_NAME
-                + " WHERE (" + DEFAULT_TEST_WHERE + ") " +
-                "GROUP BY name HAVING " + DEFAULT_HAVING + " ORDER BY name LIMIT 2";
-        assertEquals(expected, sql);
-    }
-
-    public void testAppendColumns() {
-        StringBuilder sb = new StringBuilder();
-        String[] columns = new String[] { "name", "age" };
-
-        assertEquals("", sb.toString());
-        SQLiteQueryBuilder.appendColumns(sb, columns);
-        assertEquals("name, age ", sb.toString());
-    }
-
-    public void testQuery() {
-        createEmployeeTable();
-
-        SQLiteQueryBuilder sqliteQueryBuilder = new SQLiteQueryBuilder();
-        sqliteQueryBuilder.setTables("Employee");
-        Cursor cursor = sqliteQueryBuilder.query(mDatabase,
-                new String[] { "name", "sum(salary)" }, null, null,
-                "name", "sum(salary)>1000", "name");
-        assertNotNull(cursor);
-        assertEquals(3, cursor.getCount());
-
-        final int COLUMN_NAME_INDEX = 0;
-        final int COLUMN_SALARY_INDEX = 1;
-        cursor.moveToFirst();
-        assertEquals("Jim", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(4500, cursor.getInt(COLUMN_SALARY_INDEX));
-        cursor.moveToNext();
-        assertEquals("Mike", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(4000, cursor.getInt(COLUMN_SALARY_INDEX));
-        cursor.moveToNext();
-        assertEquals("jack", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(3500, cursor.getInt(COLUMN_SALARY_INDEX));
-        cursor.close();
-
-        sqliteQueryBuilder = new SQLiteQueryBuilder();
-        sqliteQueryBuilder.setTables(EMPLOYEE_TABLE_NAME);
-        cursor = sqliteQueryBuilder.query(mDatabase,
-                new String[] { "name", "sum(salary)" }, null, null,
-                "name", "sum(salary)>1000", "name", "2" // limit is 2
-                );
-        assertNotNull(cursor);
-        assertEquals(2, cursor.getCount());
-        cursor.moveToFirst();
-        assertEquals("Jim", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(4500, cursor.getInt(COLUMN_SALARY_INDEX));
-        cursor.moveToNext();
-        assertEquals("Mike", cursor.getString(COLUMN_NAME_INDEX));
-        assertEquals(4000, cursor.getInt(COLUMN_SALARY_INDEX));
-        cursor.close();
-    }
-
-    public void testUnionQuery() {
-        String expected;
-        String[] innerProjection = new String[] {"name", "age", "location"};
-        SQLiteQueryBuilder employeeQueryBuilder = new SQLiteQueryBuilder();
-        SQLiteQueryBuilder peopleQueryBuilder = new SQLiteQueryBuilder();
-
-        employeeQueryBuilder.setTables("employee");
-        peopleQueryBuilder.setTables("people");
-
-        String employeeSubQuery = employeeQueryBuilder.buildUnionSubQuery(
-                "_id", innerProjection,
-                null, 2, "employee",
-                "age=25",
-                null, null, null);
-        String peopleSubQuery = peopleQueryBuilder.buildUnionSubQuery(
-                "_id", innerProjection,
-                null, 2, "people",
-                "location=LA",
-                null, null, null);
-        expected = "SELECT name, age, location FROM employee WHERE (age=25)";
-        assertEquals(expected, employeeSubQuery);
-        expected = "SELECT name, age, location FROM people WHERE (location=LA)";
-        assertEquals(expected, peopleSubQuery);
-
-        SQLiteQueryBuilder unionQueryBuilder = new SQLiteQueryBuilder();
-
-        unionQueryBuilder.setDistinct(true);
-
-        String unionQuery = unionQueryBuilder.buildUnionQuery(
-                new String[] { employeeSubQuery, peopleSubQuery }, null, null);
-        expected = "SELECT name, age, location FROM employee WHERE (age=25) " +
-                "UNION SELECT name, age, location FROM people WHERE (location=LA)";
-        assertEquals(expected, unionQuery);
-    }
-
-    public void testCancelableQuery_WhenNotCanceled_ReturnsResultSet() {
-        createEmployeeTable();
-
-        CancellationSignal cancellationSignal = new CancellationSignal();
-        SQLiteQueryBuilder sqliteQueryBuilder = new SQLiteQueryBuilder();
-        sqliteQueryBuilder.setTables("Employee");
-        Cursor cursor = sqliteQueryBuilder.query(mDatabase,
-                new String[] { "name", "sum(salary)" }, null, null,
-                "name", "sum(salary)>1000", "name", null, cancellationSignal);
-
-        assertEquals(3, cursor.getCount());
-        cursor.close();
-    }
-
-    public void testCancelableQuery_WhenCanceledBeforeQuery_ThrowsImmediately() {
-        createEmployeeTable();
-
-        CancellationSignal cancellationSignal = new CancellationSignal();
-        SQLiteQueryBuilder sqliteQueryBuilder = new SQLiteQueryBuilder();
-        sqliteQueryBuilder.setTables("Employee");
-
-        cancellationSignal.cancel();
-        Cursor cursor = null;
-        try {
-            cursor = sqliteQueryBuilder.query(mDatabase,
-                    new String[] { "name", "sum(salary)" }, null, null,
-                    "name", "sum(salary)>1000", "name", null, cancellationSignal);
-            fail("Expected OperationCanceledException");
-        } catch (OperationCanceledException ex) {
-            // expected
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
-        }
-    }
-
-    public void testCancelableQuery_WhenCanceledAfterQuery_ThrowsWhenExecuted() {
-        createEmployeeTable();
-
-        CancellationSignal cancellationSignal = new CancellationSignal();
-        SQLiteQueryBuilder sqliteQueryBuilder = new SQLiteQueryBuilder();
-        sqliteQueryBuilder.setTables("Employee");
-
-        Cursor cursor = sqliteQueryBuilder.query(mDatabase,
-                new String[] { "name", "sum(salary)" }, null, null,
-                "name", "sum(salary)>1000", "name", null, cancellationSignal);
-
-        cancellationSignal.cancel();
-        try {
-            cursor.getCount(); // force execution
-            fail("Expected OperationCanceledException");
-        } catch (OperationCanceledException ex) {
-            // expected
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
-        }
-    }
-
-    public void testCancelableQuery_WhenCanceledDueToContention_StopsWaitingAndThrows() {
-        createEmployeeTable();
-
-        for (int i = 0; i < 5; i++) {
-            final CancellationSignal cancellationSignal = new CancellationSignal();
-            final Semaphore barrier1 = new Semaphore(0);
-            final Semaphore barrier2 = new Semaphore(0);
-            Thread contentionThread = new Thread() {
-                @Override
-                public void run() {
-                    mDatabase.beginTransaction(); // acquire the only available connection
-                    barrier1.release(); // release query to start running
-                    try {
-                        barrier2.acquire(); // wait for test to end
-                    } catch (InterruptedException e) {
-                    }
-                    mDatabase.endTransaction(); // release the connection
-                }
-            };
-            Thread cancellationThread = new Thread() {
-                @Override
-                public void run() {
-                    try {
-                        Thread.sleep(300);
-                    } catch (InterruptedException ex) {
-                    }
-                    cancellationSignal.cancel();
-                }
-            };
-            try {
-                SQLiteQueryBuilder sqliteQueryBuilder = new SQLiteQueryBuilder();
-                sqliteQueryBuilder.setTables("Employee");
-
-                contentionThread.start();
-                cancellationThread.start();
-
-                try {
-                    barrier1.acquire(); // wait for contention thread to start transaction
-                } catch (InterruptedException e) {
-                }
-
-                final long startTime = System.nanoTime();
-                Cursor cursor = null;
-                try {
-                    cursor = sqliteQueryBuilder.query(mDatabase,
-                            new String[] { "name", "sum(salary)" }, null, null,
-                            "name", "sum(salary)>1000", "name", null, cancellationSignal);
-                    cursor.getCount(); // force execution
-                    fail("Expected OperationCanceledException");
-                } catch (OperationCanceledException ex) {
-                    // expected
-                } finally {
-                    if (cursor != null) {
-                        cursor.close();
-                    }
-                }
-
-                // We want to confirm that the query really was blocked trying to acquire a
-                // connection for a certain amount of time before it was freed by cancel.
-                final long waitTime = System.nanoTime() - startTime;
-                if (waitTime > 150 * 1000000L) {
-                    return; // success!
-                }
-            } finally {
-                barrier1.release();
-                barrier2.release();
-                try {
-                    contentionThread.join();
-                    cancellationThread.join();
-                } catch (InterruptedException e) {
-                }
-            }
-        }
-
-        // Occasionally we might miss the timing deadline due to factors in the
-        // environment, but if after several trials we still couldn't demonstrate
-        // that the query was blocked, then the test must be broken.
-        fail("Could not prove that the query actually blocked before cancel() was called.");
-    }
-
-    public void testCancelableQuery_WhenCanceledDuringLongRunningQuery_CancelsQueryAndThrows() {
-        // Populate a table with a bunch of integers.
-        mDatabase.execSQL("CREATE TABLE x (v INTEGER);");
-        for (int i = 0; i < 100; i++) {
-            mDatabase.execSQL("INSERT INTO x VALUES (?)", new Object[] { i });
-        }
-
-        for (int i = 0; i < 5; i++) {
-            final CancellationSignal cancellationSignal = new CancellationSignal();
-            Thread cancellationThread = new Thread() {
-                @Override
-                public void run() {
-                    try {
-                        Thread.sleep(300);
-                    } catch (InterruptedException ex) {
-                    }
-                    cancellationSignal.cancel();
-                }
-            };
-            try {
-                // Build an unsatisfiable 5-way cross-product query over 100 values but
-                // produces no output.  This should force SQLite to loop for a long time
-                // as it tests 10^10 combinations.
-                SQLiteQueryBuilder sqliteQueryBuilder = new SQLiteQueryBuilder();
-                sqliteQueryBuilder.setTables("x AS a, x AS b, x AS c, x AS d, x AS e");
-
-                cancellationThread.start();
-
-                final long startTime = System.nanoTime();
-                Cursor cursor = null;
-                try {
-                    cursor = sqliteQueryBuilder.query(mDatabase, null,
-                            "a.v + b.v + c.v + d.v + e.v > 1000000",
-                            null, null, null, null, null, cancellationSignal);
-                    cursor.getCount(); // force execution
-                    fail("Expected OperationCanceledException");
-                } catch (OperationCanceledException ex) {
-                    // expected
-                } finally {
-                    if (cursor != null) {
-                        cursor.close();
-                    }
-                }
-
-                // We want to confirm that the query really was running and then got
-                // canceled midway.
-                final long waitTime = System.nanoTime() - startTime;
-                if (waitTime > 150 * 1000000L && waitTime < 600 * 1000000L) {
-                    return; // success!
-                }
-            } finally {
-                try {
-                    cancellationThread.join();
-                } catch (InterruptedException e) {
-                }
-            }
-        }
-
-        // Occasionally we might miss the timing deadline due to factors in the
-        // environment, but if after several trials we still couldn't demonstrate
-        // that the query was canceled, then the test must be broken.
-        fail("Could not prove that the query actually canceled midway during execution.");
-    }
-
-    private void createEmployeeTable() {
-        mDatabase.execSQL("CREATE TABLE employee (_id INTEGER PRIMARY KEY, " +
-                "name TEXT, month INTEGER, salary INTEGER);");
-        mDatabase.execSQL("INSERT INTO employee (name, month, salary) " +
-                "VALUES ('Mike', '1', '1000');");
-        mDatabase.execSQL("INSERT INTO employee (name, month, salary) " +
-                "VALUES ('Mike', '2', '3000');");
-        mDatabase.execSQL("INSERT INTO employee (name, month, salary) " +
-                "VALUES ('jack', '1', '2000');");
-        mDatabase.execSQL("INSERT INTO employee (name, month, salary) " +
-                "VALUES ('jack', '3', '1500');");
-        mDatabase.execSQL("INSERT INTO employee (name, month, salary) " +
-                "VALUES ('Jim', '1', '1000');");
-        mDatabase.execSQL("INSERT INTO employee (name, month, salary) " +
-                "VALUES ('Jim', '3', '3500');");
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteQueryTest.java b/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteQueryTest.java
deleted file mode 100755
index c0549fdb5ea03c868cc2352a1804bca27a6d1442..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteQueryTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.sqlite.cts;
-
-import junit.framework.TestCase;
-
-public class SQLiteQueryTest extends TestCase {
-    public void testMethods() {
-        // cannot obtain an instance of SQLiteQuery
-    }
-}
diff --git a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteStatementTest.java b/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteStatementTest.java
deleted file mode 100755
index a2e924d08d2fed14e9b90d73516eb8ff3b47a113..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/database/src/android/database/sqlite/cts/SQLiteStatementTest.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.sqlite.cts;
-
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.DatabaseUtils;
-import android.database.SQLException;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteDoneException;
-import android.database.sqlite.SQLiteStatement;
-import android.os.ParcelFileDescriptor;
-import android.test.AndroidTestCase;
-import android.test.MoreAsserts;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-public class SQLiteStatementTest extends AndroidTestCase {
-    private static final String STRING1 = "this is a test";
-    private static final String STRING2 = "another test";
-
-    private static final byte[][] BLOBS = new byte [][] {
-        parseBlob("86FADCF1A820666AEBD0789F47932151A2EF734269E8AC4E39630AB60519DFD8"),
-        new byte[1],
-        null,
-        parseBlob("00"),
-        parseBlob("FF"),
-        parseBlob("D7B500FECF25F7A4D83BF823D3858690790F2526013DE6CAE9A69170E2A1E47238"),
-    };
-
-    private static final String DATABASE_NAME = "database_test.db";
-
-    private static final int CURRENT_DATABASE_VERSION = 42;
-    private SQLiteDatabase mDatabase;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        getContext().deleteDatabase(DATABASE_NAME);
-        mDatabase = getContext().openOrCreateDatabase(DATABASE_NAME, Context.MODE_PRIVATE, null);
-        assertNotNull(mDatabase);
-        mDatabase.setVersion(CURRENT_DATABASE_VERSION);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mDatabase.close();
-        getContext().deleteDatabase(DATABASE_NAME);
-        super.tearDown();
-    }
-
-    private void populateDefaultTable() {
-        mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, data TEXT);");
-    }
-
-    private void populateBlobTable() {
-        mDatabase.execSQL("CREATE TABLE blob_test (_id INTEGER PRIMARY KEY, data BLOB)");
-        for (int i = 0; i < BLOBS.length; i++) {
-            ContentValues values = new ContentValues();
-            values.put("_id", i);
-            values.put("data", BLOBS[i]);
-            mDatabase.insert("blob_test", null, values);
-        }
-    }
-
-    public void testExecute() {
-        mDatabase.disableWriteAheadLogging();
-        populateDefaultTable();
-
-        assertEquals(0, DatabaseUtils.longForQuery(mDatabase, "select count(*) from test", null));
-
-        // test update
-        // insert 2 rows and then update them.
-        SQLiteStatement statement1 = mDatabase.compileStatement(
-                "INSERT INTO test (data) VALUES ('" + STRING2 + "')");
-        assertEquals(1, statement1.executeInsert());
-        assertEquals(2, statement1.executeInsert());
-        SQLiteStatement statement2 =
-                mDatabase.compileStatement("UPDATE test set data = 'a' WHERE _id > 0");
-        assertEquals(2, statement2.executeUpdateDelete());
-        statement2.close();
-        // should still have 2 rows in the table
-        assertEquals(2, DatabaseUtils.longForQuery(mDatabase, "select count(*) from test", null));
-
-        // test delete
-        // insert 2 more rows and delete 3 of them
-        assertEquals(3, statement1.executeInsert());
-        assertEquals(4, statement1.executeInsert());
-        statement1.close();
-        statement2 = mDatabase.compileStatement("DELETE from test WHERE _id < 4");
-        assertEquals(3, statement2.executeUpdateDelete());
-        statement2.close();
-        // should still have 1 row1 in the table
-        assertEquals(1, DatabaseUtils.longForQuery(mDatabase, "select count(*) from test", null));
-
-        // if the SQL statement is something that causes rows of data to
-        // be returned, executeUpdateDelete() (and execute()) throw an exception.
-        statement2 = mDatabase.compileStatement("SELECT count(*) FROM test");
-        try {
-            statement2.executeUpdateDelete();
-            fail("exception expected");
-        } catch (SQLException e) {
-            // expected
-        } finally {
-            statement2.close();
-        }
-    }
-
-    public void testExecuteInsert() {
-        populateDefaultTable();
-
-        Cursor c = mDatabase.query("test", null, null, null, null, null, null);
-        assertEquals(0, c.getCount());
-
-        // test insert
-        SQLiteStatement statement = mDatabase.compileStatement(
-                "INSERT INTO test (data) VALUES ('" + STRING2 + "')");
-        assertEquals(1, statement.executeInsert());
-        statement.close();
-
-        // try to insert another row with the same id. last inserted rowid should be -1
-        statement = mDatabase.compileStatement("insert or ignore into test values(1, 1);");
-        assertEquals(-1, statement.executeInsert());
-        statement.close();
-
-        c = mDatabase.query("test", null, null, null, null, null, null);
-        assertEquals(1, c.getCount());
-
-        c.moveToFirst();
-        assertEquals(STRING2, c.getString(c.getColumnIndex("data")));
-        c.close();
-
-        // if the sql statement is something that causes rows of data to
-        // be returned, executeInsert() throws an exception
-        statement = mDatabase.compileStatement(
-                "SELECT * FROM test WHERE data=\"" + STRING2 + "\"");
-        try {
-            statement.executeInsert();
-            fail("exception expected");
-        } catch (SQLException e) {
-            // expected
-        } finally {
-            statement.close();
-
-        }
-    }
-
-    public void testSimpleQueryForLong() {
-        mDatabase.execSQL("CREATE TABLE test (num INTEGER NOT NULL, str TEXT NOT NULL);");
-        mDatabase.execSQL("INSERT INTO test VALUES (1234, 'hello');");
-        SQLiteStatement statement =
-                mDatabase.compileStatement("SELECT num FROM test WHERE str = ?");
-
-        // test query long
-        statement.bindString(1, "hello");
-        long value = statement.simpleQueryForLong();
-        assertEquals(1234, value);
-
-        // test query returns zero rows
-        statement.bindString(1, "world");
-
-        try {
-            statement.simpleQueryForLong();
-            fail("There should be a SQLiteDoneException thrown out.");
-        } catch (SQLiteDoneException e) {
-            // expected.
-        }
-
-        statement.close();
-    }
-
-    public void testSimpleQueryForString() {
-        mDatabase.execSQL("CREATE TABLE test (num INTEGER NOT NULL, str TEXT NOT NULL);");
-        mDatabase.execSQL("INSERT INTO test VALUES (1234, 'hello');");
-        SQLiteStatement statement =
-                mDatabase.compileStatement("SELECT str FROM test WHERE num = ?");
-
-        // test query String
-        statement.bindLong(1, 1234);
-        String value = statement.simpleQueryForString();
-        assertEquals("hello", value);
-
-        // test query returns zero rows
-        statement.bindLong(1, 5678);
-
-        try {
-            statement.simpleQueryForString();
-            fail("There should be a SQLiteDoneException thrown out.");
-        } catch (SQLiteDoneException e) {
-            // expected.
-        }
-
-        statement.close();
-    }
-
-    public void testSimpleQueryForBlobFileDescriptorSuccessNormal() throws IOException {
-        doTestSimpleQueryForBlobFileDescriptorSuccess(0);
-    }
-
-    public void testSimpleQueryForBlobFileDescriptorSuccessEmpty() throws IOException {
-        doTestSimpleQueryForBlobFileDescriptorSuccess(1);
-    }
-
-    public void testSimpleQueryForBlobFileDescriptorSuccessNull() {
-        populateBlobTable();
-
-        String sql = "SELECT data FROM blob_test WHERE _id = " + 2;
-        SQLiteStatement stm = mDatabase.compileStatement(sql);
-        assertNull(stm.simpleQueryForBlobFileDescriptor());
-    }
-
-    public void testSimpleQueryForBlobFileDescriptorSuccess00() throws IOException {
-        doTestSimpleQueryForBlobFileDescriptorSuccess(3);
-    }
-
-    public void testSimpleQueryForBlobFileDescriptorSuccessFF() throws IOException {
-        doTestSimpleQueryForBlobFileDescriptorSuccess(4);
-    }
-
-    public void testSimpleQueryForBlobFileDescriptorSuccessEmbeddedNul() throws IOException {
-        doTestSimpleQueryForBlobFileDescriptorSuccess(5);
-    }
-
-    private void doTestSimpleQueryForBlobFileDescriptorSuccess(int i) throws IOException {
-        populateBlobTable();
-
-        String sql = "SELECT data FROM blob_test WHERE _id = " + i;
-        SQLiteStatement stm = mDatabase.compileStatement(sql);
-        ParcelFileDescriptor fd = stm.simpleQueryForBlobFileDescriptor();
-        assertFileDescriptorContent(BLOBS[i], fd);
-    }
-
-    public void testSimpleQueryForBlobFileDescriptorSuccessParam() throws IOException {
-        populateBlobTable();
-
-        String sql = "SELECT data FROM blob_test WHERE _id = ?";
-        SQLiteStatement stm = mDatabase.compileStatement(sql);
-        stm.bindLong(1, 0);
-        ParcelFileDescriptor fd = stm.simpleQueryForBlobFileDescriptor();
-        assertFileDescriptorContent(BLOBS[0], fd);
-    }
-
-    public void testGetBlobFailureNoParam() throws Exception {
-        populateBlobTable();
-
-        String sql = "SELECT data FROM blob_test WHERE _id = 100";
-        SQLiteStatement stm = mDatabase.compileStatement(sql);
-        ParcelFileDescriptor fd = null;
-        SQLiteDoneException expectedException = null;
-        try {
-            fd = stm.simpleQueryForBlobFileDescriptor();
-        } catch (SQLiteDoneException ex) {
-            expectedException = ex;
-        } finally {
-            if (fd != null) {
-                fd.close();
-                fd = null;
-            }
-        }
-        assertNotNull("Should have thrown SQLiteDoneException", expectedException);
-    }
-
-    public void testGetBlobFailureParam() throws Exception {
-        populateBlobTable();
-
-        String sql = "SELECT data FROM blob_test WHERE _id = ?";
-        SQLiteStatement stm = mDatabase.compileStatement(sql);
-        stm.bindLong(1, 100);
-        ParcelFileDescriptor fd = null;
-        SQLiteDoneException expectedException = null;
-        try {
-            fd = stm.simpleQueryForBlobFileDescriptor();
-        } catch (SQLiteDoneException ex) {
-            expectedException = ex;
-        } finally {
-            if (fd != null) {
-                fd.close();
-                fd = null;
-            }
-        }
-        assertNotNull("Should have thrown SQLiteDoneException", expectedException);
-    }
-
-    /*
-     * Convert string of hex digits to byte array.
-     * Results are undefined for poorly formed string.
-     *
-     * @param src hex string
-     */
-    private static byte[] parseBlob(String src) {
-        int len = src.length();
-        byte[] result = new byte[len / 2];
-
-        for (int i = 0; i < len / 2; i++) {
-            int val;
-            char c1 = src.charAt(i * 2);
-            char c2 = src.charAt(i * 2 + 1);
-            int val1 = Character.digit(c1, 16);
-            int val2 = Character.digit(c2, 16);
-            val = (val1 << 4) | val2;
-            result[i] = (byte) val;
-        }
-        return result;
-    }
-
-    private static void assertFileDescriptorContent(byte[] expected, ParcelFileDescriptor fd)
-            throws IOException {
-        assertInputStreamContent(expected, new ParcelFileDescriptor.AutoCloseInputStream(fd));
-    }
-
-    private static void assertInputStreamContent(byte[] expected, InputStream is)
-            throws IOException {
-        try {
-            byte[] observed = new byte[expected.length];
-            int count = is.read(observed);
-            assertEquals(expected.length, count);
-            assertEquals(-1, is.read());
-            MoreAsserts.assertEquals(expected, observed);
-        } finally {
-            is.close();
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/net/Android.mk b/proprietary/frameworks/base/tests/net/Android.mk
deleted file mode 100755
index 745a661bc37b45e98b3324e74c7adaad80dc033c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/Android.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := tests
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner voip-common
-
-# include CtsTestServer as a temporary hack to free net.cts from cts.stub.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MtkNetTestCases
-
-
-# uncomment when dalvik.annotation.Test* are removed or part of SDK
-#LOCAL_SDK_VERSION := current
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/frameworks/base/tests/net/Android.mk_ b/proprietary/frameworks/base/tests/net/Android.mk_
deleted file mode 100755
index 745a661bc37b45e98b3324e74c7adaad80dc033c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/Android.mk_
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := tests
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner voip-common
-
-# include CtsTestServer as a temporary hack to free net.cts from cts.stub.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MtkNetTestCases
-
-
-# uncomment when dalvik.annotation.Test* are removed or part of SDK
-#LOCAL_SDK_VERSION := current
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/frameworks/base/tests/net/AndroidManifest.xml b/proprietary/frameworks/base/tests/net/AndroidManifest.xml
deleted file mode 100755
index 86add6daf01079f51aa243a2899d52f0e1ddd1e7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/AndroidManifest.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mediatek.cts.net">
-
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.mediatek.cts.net"
-                     android:label="Tests of mediatek.net"/>
-
-</manifest>
-
diff --git a/proprietary/frameworks/base/tests/net/NOTICE b/proprietary/frameworks/base/tests/net/NOTICE
deleted file mode 100755
index 4d375606fc8d522e186504980e060442aa604b68..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/NOTICE
+++ /dev/null
@@ -1,34 +0,0 @@
-* Copyright (C) 2012 The Android Open Source Project:
-
-
-
-* Copyright (C) 2008 The Android Open Source Project:
-
-
-
-* Copyright (C) 2013 The Android Open Source Project:
-
-
-
-* Copyright (C) 2009 The Android Open Source Project:
-
-
-
-/*
-* Copyright (C) 2011-2014 MediaTek Inc.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-:
-  
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/net/README b/proprietary/frameworks/base/tests/net/README
deleted file mode 100755
index f57215d2dd3c516799908e8a98c7a7641b718a7a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/README
+++ /dev/null
@@ -1,15 +0,0 @@
-WHAT IT DOES?
-=============
-This is a CTS test APK for net related testing.
-The moudle tag is tests.
-
-HOW IT WAS BUILT?
-==================
-[Build Method]
-make MtkNetTestCases
-or
-mmm vendor/mediatek/proprietary/frameworks/base/tests/net
-
-HOW TO USE IT?
-==============
-adb shell am instrument -w com.mediatek.cts.net/android.test.InstrumentationTestRunner
diff --git a/proprietary/frameworks/base/tests/net/src/android/net/cts/ConnectivityManagerTest.java b/proprietary/frameworks/base/tests/net/src/android/net/cts/ConnectivityManagerTest.java
deleted file mode 100755
index 08ffdbdc790f0ba26836484701bc61b0b908727c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/src/android/net/cts/ConnectivityManagerTest.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.cts;
-
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.net.ConnectivityManager;
-import android.net.NetworkConfig;
-import android.net.NetworkInfo;
-import android.net.NetworkInfo.DetailedState;
-import android.net.NetworkInfo.State;
-import android.net.wifi.WifiManager;
-import android.test.AndroidTestCase;
-import android.util.Log;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-public class ConnectivityManagerTest extends AndroidTestCase {
-
-    private static final String TAG = ConnectivityManagerTest.class.getSimpleName();
-
-    private static final String FEATURE_ENABLE_HIPRI = "enableHIPRI";
-
-    public static final int TYPE_MOBILE = ConnectivityManager.TYPE_MOBILE;
-    public static final int TYPE_WIFI = ConnectivityManager.TYPE_WIFI;
-    private static final int HOST_ADDRESS = 0x7f000001; // represent ip 127.0.0.1
-
-    // device could have only one interface: data, wifi.
-    private static final int MIN_NUM_NETWORK_TYPES = 1;
-
-    private ConnectivityManager mCm;
-    private WifiManager mWifiManager;
-    private PackageManager mPackageManager;
-    private final HashMap<Integer, NetworkConfig> mNetworks =
-            new HashMap<Integer, NetworkConfig>();
-    private final List<Integer>mProtectedNetworks = new ArrayList<Integer>();
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mCm = (ConnectivityManager) getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
-        mWifiManager = (WifiManager) getContext().getSystemService(Context.WIFI_SERVICE);
-        mPackageManager = getContext().getPackageManager();
-
-        // Get com.android.internal.R.array.networkAttributes
-        int resId = getContext().getResources().getIdentifier("networkAttributes", "array", "android");
-        String[] naStrings = getContext().getResources().getStringArray(resId);
-
-        for (String naString : naStrings) {
-            try {
-                NetworkConfig n = new NetworkConfig(naString);
-                mNetworks.put(n.type, n);
-            } catch (Exception e) { }
-        }
-
-        // Get com.android.internal.R.array.config_protectedNetworks
-        resId = getContext().getResources().getIdentifier("config_protectedNetworks", "array", "android");
-        int[] protectedNetworks = getContext().getResources().getIntArray(resId);
-        for (int p : protectedNetworks) {
-            mProtectedNetworks.add(p);
-        }
-    }
-
-
-
-    public void testGetNetworkInfo() {
-        for (int type = -1; type <= ConnectivityManager.MAX_NETWORK_TYPE + 1; type++) {
-            if (isSupported(type)) {
-                NetworkInfo ni = mCm.getNetworkInfo(type);
-                assertTrue("Info shouldn't be null for " + type, ni != null);
-                State state = ni.getState();
-                assertTrue("Bad state for " + type, State.UNKNOWN.ordinal() >= state.ordinal()
-                           && state.ordinal() >= State.CONNECTING.ordinal());
-                DetailedState ds = ni.getDetailedState();
-                assertTrue("Bad detailed state for " + type,
-                           DetailedState.FAILED.ordinal() >= ds.ordinal()
-                           && ds.ordinal() >= DetailedState.IDLE.ordinal());
-            } else {
-                assertNull("Info should be null for " + type, mCm.getNetworkInfo(type));
-            }
-        }
-    }
-
-    public void testGetAllNetworkInfo() {
-        NetworkInfo[] ni = mCm.getAllNetworkInfo();
-        assertTrue(ni.length >= MIN_NUM_NETWORK_TYPES);
-        for (int type = 0; type <= ConnectivityManager.MAX_NETWORK_TYPE; type++) {
-            int desiredFoundCount = (isSupported(type) ? 1 : 0);
-            int foundCount = 0;
-            for (NetworkInfo i : ni) {
-                if (i.getType() == type) foundCount++;
-            }
-            if (foundCount != desiredFoundCount) {
-                Log.e(TAG, "failure in testGetAllNetworkInfo.  Dump of returned NetworkInfos:");
-                for (NetworkInfo networkInfo : ni) Log.e(TAG, "  " + networkInfo);
-            }
-            assertTrue("Unexpected foundCount of " + foundCount + " for type " + type,
-                    foundCount == desiredFoundCount);
-        }
-    }
-
-
-    private boolean isSupported(int networkType) {
-        // Change-Id I02eb5f22737720095f646f8db5c87fd66da129d6 added VPN support
-        // to all devices directly in software, independent of any external
-        // configuration.
-        return mNetworks.containsKey(networkType) ||
-               (networkType == ConnectivityManager.TYPE_VPN);
-    }
-
-    // true if only the system can turn it on
-    private boolean isNetworkProtected(int networkType) {
-        return mProtectedNetworks.contains(networkType);
-    }
-
-    public void testIsNetworkSupported() {
-        for (int type = -1; type <= ConnectivityManager.MAX_NETWORK_TYPE; type++) {
-            boolean supported = mCm.isNetworkSupported(type);
-            if (isSupported(type)) {
-                assertTrue(supported);
-            } else {
-                assertFalse(supported);
-            }
-        }
-    }
-
-
-
-    /** Receiver that captures the last connectivity change's network type and state. */
-    private class ConnectivityActionReceiver extends BroadcastReceiver {
-
-        private final CountDownLatch mReceiveLatch = new CountDownLatch(1);
-
-        private final int mNetworkType;
-
-        ConnectivityActionReceiver(int networkType) {
-            mNetworkType = networkType;
-        }
-
-        public void onReceive(Context context, Intent intent) {
-            NetworkInfo networkInfo = intent.getExtras()
-                    .getParcelable(ConnectivityManager.EXTRA_NETWORK_INFO);
-            int networkType = networkInfo.getType();
-            State networkState = networkInfo.getState();
-            Log.i(TAG, "Network type: " + networkType + " state: " + networkState);
-            if (networkType == mNetworkType && networkInfo.getState() == State.CONNECTED) {
-                mReceiveLatch.countDown();
-            }
-        }
-
-        public boolean waitForConnection() throws InterruptedException {
-            return mReceiveLatch.await(30, TimeUnit.SECONDS);
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/net/src/android/net/cts/CredentialsTest.java b/proprietary/frameworks/base/tests/net/src/android/net/cts/CredentialsTest.java
deleted file mode 100755
index 91c3621eab8c583e69a0933556ba88c2c5412c81..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/src/android/net/cts/CredentialsTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.cts;
-
-import android.net.Credentials;
-import android.test.AndroidTestCase;
-
-public class CredentialsTest extends AndroidTestCase {
-
-    public void testCredentials() {
-        // new the Credentials instance
-        // Test with zero inputs
-        Credentials cred = new Credentials(0, 0, 0);
-        assertEquals(0, cred.getGid());
-        assertEquals(0, cred.getPid());
-        assertEquals(0, cred.getUid());
-
-        // Test with big integer
-        cred = new Credentials(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE);
-        assertEquals(Integer.MAX_VALUE, cred.getGid());
-        assertEquals(Integer.MAX_VALUE, cred.getPid());
-        assertEquals(Integer.MAX_VALUE, cred.getUid());
-
-        // Test with big negative integer
-        cred = new Credentials(Integer.MIN_VALUE, Integer.MIN_VALUE, Integer.MIN_VALUE);
-        assertEquals(Integer.MIN_VALUE, cred.getGid());
-        assertEquals(Integer.MIN_VALUE, cred.getPid());
-        assertEquals(Integer.MIN_VALUE, cred.getUid());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/net/src/android/net/cts/DhcpInfoTest.java b/proprietary/frameworks/base/tests/net/src/android/net/cts/DhcpInfoTest.java
deleted file mode 100755
index 085fdd9132321d6385192e7319a13a554c5f7efd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/src/android/net/cts/DhcpInfoTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.cts;
-
-import android.net.DhcpInfo;
-import android.test.AndroidTestCase;
-
-public class DhcpInfoTest extends AndroidTestCase {
-
-    public void testConstructor() {
-        new DhcpInfo();
-    }
-
-    public void testToString() {
-        String expectedDefault = "ipaddr 0.0.0.0 gateway 0.0.0.0 netmask 0.0.0.0 dns1 0.0.0.0 "
-                + "dns2 0.0.0.0 DHCP server 0.0.0.0 lease 0 seconds";
-        String STR_ADDR1 = "255.255.255.255";
-        String STR_ADDR2 = "127.0.0.1";
-        String STR_ADDR3 = "192.168.1.1";
-        String STR_ADDR4 = "192.168.1.0";
-        int leaseTime = 9999;
-        String expected = "ipaddr " + STR_ADDR1 + " gateway " + STR_ADDR2 + " netmask "
-                + STR_ADDR3 + " dns1 " + STR_ADDR4 + " dns2 " + STR_ADDR4 + " DHCP server "
-                + STR_ADDR2 + " lease " + leaseTime + " seconds";
-
-        DhcpInfo dhcpInfo = new DhcpInfo();
-
-        // Test default string.
-        assertEquals(expectedDefault, dhcpInfo.toString());
-
-        dhcpInfo.ipAddress = ipToInteger(STR_ADDR1);
-        dhcpInfo.gateway = ipToInteger(STR_ADDR2);
-        dhcpInfo.netmask = ipToInteger(STR_ADDR3);
-        dhcpInfo.dns1 = ipToInteger(STR_ADDR4);
-        dhcpInfo.dns2 = ipToInteger(STR_ADDR4);
-        dhcpInfo.serverAddress = ipToInteger(STR_ADDR2);
-        dhcpInfo.leaseDuration = leaseTime;
-
-        // Test with new values
-        assertEquals(expected, dhcpInfo.toString());
-    }
-
-    private int ipToInteger(String ipString) {
-        String ipSegs[] = ipString.split("[.]");
-        int tmp = Integer.parseInt(ipSegs[3]) << 24 | Integer.parseInt(ipSegs[2]) << 16 |
-            Integer.parseInt(ipSegs[1]) << 8 | Integer.parseInt(ipSegs[0]);
-        return tmp;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/net/src/android/net/cts/LocalServerSocketTest.java b/proprietary/frameworks/base/tests/net/src/android/net/cts/LocalServerSocketTest.java
deleted file mode 100755
index dc7be1ff4ecaedc7083e5dca40376a6f896f3f9a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/src/android/net/cts/LocalServerSocketTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.net.cts;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import android.net.LocalServerSocket;
-import android.net.LocalSocket;
-import android.net.LocalSocketAddress;
-import android.test.AndroidTestCase;
-
-public class LocalServerSocketTest extends AndroidTestCase {
-
-    public void testLocalServerSocket() throws IOException {
-        LocalServerSocket localServerSocket = new LocalServerSocket(LocalSocketTest.mSockAddr);
-        assertNotNull(localServerSocket.getLocalSocketAddress());
-        commonFunctions(localServerSocket);
-    }
-
-    public void commonFunctions(LocalServerSocket localServerSocket) throws IOException {
-        // create client socket
-        LocalSocket clientSocket = new LocalSocket();
-
-        // establish connection between client and server
-        clientSocket.connect(new LocalSocketAddress(LocalSocketTest.mSockAddr));
-        LocalSocket serverSocket = localServerSocket.accept();
-
-        // send data from client to server
-        OutputStream clientOutStream = clientSocket.getOutputStream();
-        clientOutStream.write(12);
-        InputStream serverInStream = serverSocket.getInputStream();
-        assertEquals(12, serverInStream.read());
-
-        // send data from server to client
-        OutputStream serverOutStream = serverSocket.getOutputStream();
-        serverOutStream.write(3);
-        InputStream clientInStream = clientSocket.getInputStream();
-        assertEquals(3, clientInStream.read());
-
-        // close server socket
-        assertNotNull(localServerSocket.getFileDescriptor());
-        localServerSocket.close();
-        assertNull(localServerSocket.getFileDescriptor());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/net/src/android/net/cts/LocalSocketAddressTest.java b/proprietary/frameworks/base/tests/net/src/android/net/cts/LocalSocketAddressTest.java
deleted file mode 100755
index 6ef003b26f3f5c8c0563f7983b599aafc5227b61..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/src/android/net/cts/LocalSocketAddressTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.cts;
-
-import android.net.LocalSocketAddress;
-import android.net.LocalSocketAddress.Namespace;
-import android.test.AndroidTestCase;
-
-public class LocalSocketAddressTest extends AndroidTestCase {
-
-    public void testNewLocalSocketAddressWithDefaultNamespace() {
-        // default namespace
-        LocalSocketAddress localSocketAddress = new LocalSocketAddress("name");
-        assertEquals("name", localSocketAddress.getName());
-        assertEquals(Namespace.ABSTRACT, localSocketAddress.getNamespace());
-
-        // specify the namespace
-        LocalSocketAddress localSocketAddress2 =
-                new LocalSocketAddress("name2", Namespace.ABSTRACT);
-        assertEquals("name2", localSocketAddress2.getName());
-        assertEquals(Namespace.ABSTRACT, localSocketAddress2.getNamespace());
-
-        LocalSocketAddress localSocketAddress3 =
-                new LocalSocketAddress("name3", Namespace.FILESYSTEM);
-        assertEquals("name3", localSocketAddress3.getName());
-        assertEquals(Namespace.FILESYSTEM, localSocketAddress3.getNamespace());
-
-        LocalSocketAddress localSocketAddress4 =
-                new LocalSocketAddress("name4", Namespace.RESERVED);
-        assertEquals("name4", localSocketAddress4.getName());
-        assertEquals(Namespace.RESERVED, localSocketAddress4.getNamespace());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/net/src/android/net/cts/LocalSocketAddress_NamespaceTest.java b/proprietary/frameworks/base/tests/net/src/android/net/cts/LocalSocketAddress_NamespaceTest.java
deleted file mode 100755
index 97dfa435fa1b5890f1281bc679dab8470ac6a549..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/src/android/net/cts/LocalSocketAddress_NamespaceTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.cts;
-
-import android.net.LocalSocketAddress.Namespace;
-import android.test.AndroidTestCase;
-
-public class LocalSocketAddress_NamespaceTest extends AndroidTestCase {
-
-    public void testValueOf() {
-        assertEquals(Namespace.ABSTRACT, Namespace.valueOf("ABSTRACT"));
-        assertEquals(Namespace.RESERVED, Namespace.valueOf("RESERVED"));
-        assertEquals(Namespace.FILESYSTEM, Namespace.valueOf("FILESYSTEM"));
-    }
-
-    public void testValues() {
-        Namespace[] expected = Namespace.values();
-        assertEquals(Namespace.ABSTRACT, expected[0]);
-        assertEquals(Namespace.RESERVED, expected[1]);
-        assertEquals(Namespace.FILESYSTEM, expected[2]);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/net/src/android/net/cts/LocalSocketTest.java b/proprietary/frameworks/base/tests/net/src/android/net/cts/LocalSocketTest.java
deleted file mode 100755
index 946811c3fdca9c6d6bb82154bf467a479d431ef4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/src/android/net/cts/LocalSocketTest.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.cts;
-
-import java.io.FileDescriptor;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import android.net.Credentials;
-import android.net.LocalServerSocket;
-import android.net.LocalSocket;
-import android.net.LocalSocketAddress;
-import android.test.AndroidTestCase;
-
-public class LocalSocketTest extends AndroidTestCase {
-    public final static String mSockAddr = "com.android.net.LocalSocketTest";
-
-    public void testLocalConnections() throws IOException {
-        // create client and server socket
-        LocalServerSocket localServerSocket = new LocalServerSocket(mSockAddr);
-        LocalSocket clientSocket = new LocalSocket();
-
-        // establish connection between client and server
-        LocalSocketAddress locSockAddr = new LocalSocketAddress(mSockAddr);
-        assertFalse(clientSocket.isConnected());
-        clientSocket.connect(locSockAddr);
-        assertTrue(clientSocket.isConnected());
-        LocalSocket serverSocket = localServerSocket.accept();
-
-        Credentials credent = clientSocket.getPeerCredentials();
-        assertTrue(0 != credent.getPid());
-
-        // send data from client to server
-        OutputStream clientOutStream = clientSocket.getOutputStream();
-        clientOutStream.write(12);
-        InputStream serverInStream = serverSocket.getInputStream();
-        assertEquals(12, serverInStream.read());
-
-        //send data from server to client
-        OutputStream serverOutStream = serverSocket.getOutputStream();
-        serverOutStream.write(3);
-        InputStream clientInStream = clientSocket.getInputStream();
-        assertEquals(3, clientInStream.read());
-
-        // Test sending and receiving file descriptors
-        clientSocket.setFileDescriptorsForSend(new FileDescriptor[]{FileDescriptor.in});
-        clientOutStream.write(32);
-        assertEquals(32, serverInStream.read());
-
-        FileDescriptor[] out = serverSocket.getAncillaryFileDescriptors();
-        assertEquals(1, out.length);
-        FileDescriptor fd = clientSocket.getFileDescriptor();
-        assertTrue(fd.valid());
-
-        //shutdown input stream of client
-        clientSocket.shutdownInput();
-        assertEquals(-1, clientInStream.read());
-
-        //shutdown output stream of client
-        clientSocket.shutdownOutput();
-        try {
-            clientOutStream.write(10);
-            fail("testLocalSocket shouldn't come to here");
-        } catch (IOException e) {
-            // expected
-        }
-
-        //shutdown input stream of server
-        serverSocket.shutdownInput();
-        assertEquals(-1, serverInStream.read());
-
-        //shutdown output stream of server
-        serverSocket.shutdownOutput();
-        try {
-            serverOutStream.write(10);
-            fail("testLocalSocket shouldn't come to here");
-        } catch (IOException e) {
-            // expected
-        }
-
-        //close client socket
-        clientSocket.close();
-        try {
-            clientInStream.read();
-            fail("testLocalSocket shouldn't come to here");
-        } catch (IOException e) {
-            // expected
-        }
-
-        //close server socket
-        serverSocket.close();
-        try {
-            serverInStream.read();
-            fail("testLocalSocket shouldn't come to here");
-        } catch (IOException e) {
-            // expected
-        }
-    }
-
-    public void testAccessors() throws IOException {
-        LocalSocket socket = new LocalSocket();
-        LocalSocketAddress addr = new LocalSocketAddress("secondary");
-
-        assertFalse(socket.isBound());
-        socket.bind(addr);
-        assertTrue(socket.isBound());
-        assertEquals(addr, socket.getLocalSocketAddress());
-
-        String str = socket.toString();
-        assertTrue(str.contains("impl:android.net.LocalSocketImpl"));
-
-        socket.setReceiveBufferSize(1999);
-        assertEquals(1999 << 1, socket.getReceiveBufferSize());
-
-        socket.setSendBufferSize(1998);
-        assertEquals(1998 << 1, socket.getSendBufferSize());
-
-        // Timeout is not support at present, so set is ignored
-        socket.setSoTimeout(1996);
-        assertEquals(0, socket.getSoTimeout());
-
-        try {
-            socket.getRemoteSocketAddress();
-            fail("testLocalSocketSecondary shouldn't come to here");
-        } catch (UnsupportedOperationException e) {
-            // expected
-        }
-
-        try {
-            socket.isClosed();
-            fail("testLocalSocketSecondary shouldn't come to here");
-        } catch (UnsupportedOperationException e) {
-            // expected
-        }
-
-        try {
-            socket.isInputShutdown();
-            fail("testLocalSocketSecondary shouldn't come to here");
-        } catch (UnsupportedOperationException e) {
-            // expected
-        }
-
-        try {
-            socket.isOutputShutdown();
-            fail("testLocalSocketSecondary shouldn't come to here");
-        } catch (UnsupportedOperationException e) {
-            // expected
-        }
-
-        try {
-            socket.connect(addr, 2005);
-            fail("testLocalSocketSecondary shouldn't come to here");
-        } catch (UnsupportedOperationException e) {
-            // expected
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/net/src/android/net/cts/MailToTest.java b/proprietary/frameworks/base/tests/net/src/android/net/cts/MailToTest.java
deleted file mode 100755
index e454d20628c3537f6ed96f3785526fabcda85178..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/src/android/net/cts/MailToTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.cts;
-
-import android.net.MailTo;
-import android.test.AndroidTestCase;
-import android.util.Log;
-
-public class MailToTest extends AndroidTestCase {
-    private static final String MAILTOURI_1 = "mailto:chris@example.com";
-    private static final String MAILTOURI_2 = "mailto:infobot@example.com?subject=current-issue";
-    private static final String MAILTOURI_3 =
-            "mailto:infobot@example.com?body=send%20current-issue";
-    private static final String MAILTOURI_4 = "mailto:infobot@example.com?body=send%20current-" +
-                                              "issue%0D%0Asend%20index";
-    private static final String MAILTOURI_5 = "mailto:joe@example.com?" +
-                                              "cc=bob@example.com&body=hello";
-    private static final String MAILTOURI_6 = "mailto:?to=joe@example.com&" +
-                                              "cc=bob@example.com&body=hello";
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
-    public void testParseMailToURI() {
-        assertFalse(MailTo.isMailTo(null));
-        assertFalse(MailTo.isMailTo(""));
-        assertFalse(MailTo.isMailTo("http://www.google.com"));
-
-        assertTrue(MailTo.isMailTo(MAILTOURI_1));
-        MailTo mailTo_1 = MailTo.parse(MAILTOURI_1);
-        Log.d("Trace", mailTo_1.toString());
-        assertEquals("chris@example.com", mailTo_1.getTo());
-        assertEquals(1, mailTo_1.getHeaders().size());
-        assertNull(mailTo_1.getBody());
-        assertNull(mailTo_1.getCc());
-        assertNull(mailTo_1.getSubject());
-        assertEquals("mailto:?to=chris%40example.com&", mailTo_1.toString());
-
-        assertTrue(MailTo.isMailTo(MAILTOURI_2));
-        MailTo mailTo_2 = MailTo.parse(MAILTOURI_2);
-        Log.d("Trace", mailTo_2.toString());
-        assertEquals(2, mailTo_2.getHeaders().size());
-        assertEquals("infobot@example.com", mailTo_2.getTo());
-        assertEquals("current-issue", mailTo_2.getSubject());
-        assertNull(mailTo_2.getBody());
-        assertNull(mailTo_2.getCc());
-        String stringUrl = mailTo_2.toString();
-        assertTrue(stringUrl.startsWith("mailto:?"));
-        assertTrue(stringUrl.contains("to=infobot%40example.com&"));
-        assertTrue(stringUrl.contains("subject=current-issue&"));
-
-        assertTrue(MailTo.isMailTo(MAILTOURI_3));
-        MailTo mailTo_3 = MailTo.parse(MAILTOURI_3);
-        Log.d("Trace", mailTo_3.toString());
-        assertEquals(2, mailTo_3.getHeaders().size());
-        assertEquals("infobot@example.com", mailTo_3.getTo());
-        assertEquals("send current-issue", mailTo_3.getBody());
-        assertNull(mailTo_3.getCc());
-        assertNull(mailTo_3.getSubject());
-        stringUrl = mailTo_3.toString();
-        assertTrue(stringUrl.startsWith("mailto:?"));
-        assertTrue(stringUrl.contains("to=infobot%40example.com&"));
-        assertTrue(stringUrl.contains("body=send%20current-issue&"));
-
-        assertTrue(MailTo.isMailTo(MAILTOURI_4));
-        MailTo mailTo_4 = MailTo.parse(MAILTOURI_4);
-        Log.d("Trace", mailTo_4.toString() + " " + mailTo_4.getBody());
-        assertEquals(2, mailTo_4.getHeaders().size());
-        assertEquals("infobot@example.com", mailTo_4.getTo());
-        assertEquals("send current-issue\r\nsend index", mailTo_4.getBody());
-        assertNull(mailTo_4.getCc());
-        assertNull(mailTo_4.getSubject());
-        stringUrl = mailTo_4.toString();
-        assertTrue(stringUrl.startsWith("mailto:?"));
-        assertTrue(stringUrl.contains("to=infobot%40example.com&"));
-        assertTrue(stringUrl.contains("body=send%20current-issue%0D%0Asend%20index&"));
-
-
-        assertTrue(MailTo.isMailTo(MAILTOURI_5));
-        MailTo mailTo_5 = MailTo.parse(MAILTOURI_5);
-        Log.d("Trace", mailTo_5.toString() + mailTo_5.getHeaders().toString()
-                + mailTo_5.getHeaders().size());
-        assertEquals(3, mailTo_5.getHeaders().size());
-        assertEquals("joe@example.com", mailTo_5.getTo());
-        assertEquals("bob@example.com", mailTo_5.getCc());
-        assertEquals("hello", mailTo_5.getBody());
-        assertNull(mailTo_5.getSubject());
-        stringUrl = mailTo_5.toString();
-        assertTrue(stringUrl.startsWith("mailto:?"));
-        assertTrue(stringUrl.contains("cc=bob%40example.com&"));
-        assertTrue(stringUrl.contains("body=hello&"));
-        assertTrue(stringUrl.contains("to=joe%40example.com&"));
-
-        assertTrue(MailTo.isMailTo(MAILTOURI_6));
-        MailTo mailTo_6 = MailTo.parse(MAILTOURI_6);
-        Log.d("Trace", mailTo_6.toString() + mailTo_6.getHeaders().toString()
-                + mailTo_6.getHeaders().size());
-        assertEquals(3, mailTo_6.getHeaders().size());
-        assertEquals(", joe@example.com", mailTo_6.getTo());
-        assertEquals("bob@example.com", mailTo_6.getCc());
-        assertEquals("hello", mailTo_6.getBody());
-        assertNull(mailTo_6.getSubject());
-        stringUrl = mailTo_6.toString();
-        assertTrue(stringUrl.startsWith("mailto:?"));
-        assertTrue(stringUrl.contains("cc=bob%40example.com&"));
-        assertTrue(stringUrl.contains("body=hello&"));
-        assertTrue(stringUrl.contains("to=%2C%20joe%40example.com&"));
-    }
-}
diff --git a/proprietary/frameworks/base/tests/net/src/android/net/cts/NetworkInfoTest.java b/proprietary/frameworks/base/tests/net/src/android/net/cts/NetworkInfoTest.java
deleted file mode 100755
index 7cb45ede681e05e979f1896b6d4504cec1ab38a9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/src/android/net/cts/NetworkInfoTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.cts;
-
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.NetworkInfo.DetailedState;
-import android.net.NetworkInfo.State;
-import android.test.AndroidTestCase;
-
-public class NetworkInfoTest extends AndroidTestCase {
-
-    public static final int TYPE_MOBILE = ConnectivityManager.TYPE_MOBILE;
-    public static final int TYPE_WIFI = ConnectivityManager.TYPE_WIFI;
-    public static final String MOBILE_TYPE_NAME = "mobile";
-    public static final String WIFI_TYPE_NAME = "WIFI";
-
-    public void testAccessNetworkInfoProperties() {
-        ConnectivityManager cm = (ConnectivityManager) getContext().getSystemService(
-                Context.CONNECTIVITY_SERVICE);
-        NetworkInfo[] ni = cm.getAllNetworkInfo();
-        assertTrue(ni.length >= 1);
-
-        for (NetworkInfo netInfo: ni) {
-            switch (netInfo.getType()) {
-                case TYPE_MOBILE:
-                    assertNetworkInfo(netInfo, MOBILE_TYPE_NAME);
-                    break;
-                case TYPE_WIFI:
-                    assertNetworkInfo(netInfo, WIFI_TYPE_NAME);
-                    break;
-                 // TODO: Add BLUETOOTH_TETHER testing
-                 default:
-                     break;
-            }
-        }
-    }
-
-    private void assertNetworkInfo(NetworkInfo netInfo, String expectedTypeName) {
-        assertEquals(expectedTypeName.compareToIgnoreCase(netInfo.getTypeName()), 0);
-        if (netInfo.isConnectedOrConnecting()) {
-            assertTrue(netInfo.isAvailable());
-            if (State.CONNECTED == netInfo.getState()) {
-                assertTrue(netInfo.isConnected());
-            }
-            assertTrue(State.CONNECTING == netInfo.getState()
-                    || State.CONNECTED == netInfo.getState());
-            assertTrue(DetailedState.SCANNING == netInfo.getDetailedState()
-                    || DetailedState.CONNECTING == netInfo.getDetailedState()
-                    || DetailedState.AUTHENTICATING == netInfo.getDetailedState()
-                    || DetailedState.CONNECTED == netInfo.getDetailedState());
-        }
-        assertNotNull(netInfo.toString());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/net/src/android/net/cts/NetworkInfo_DetailedStateTest.java b/proprietary/frameworks/base/tests/net/src/android/net/cts/NetworkInfo_DetailedStateTest.java
deleted file mode 100755
index 590ce8957938c0e5055ae15d62074236cd522aa1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/src/android/net/cts/NetworkInfo_DetailedStateTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.cts;
-
-
-import android.net.NetworkInfo.DetailedState;
-import android.test.AndroidTestCase;
-
-public class NetworkInfo_DetailedStateTest extends AndroidTestCase {
-
-    public void testValueOf() {
-        assertEquals(DetailedState.AUTHENTICATING, DetailedState.valueOf("AUTHENTICATING"));
-        assertEquals(DetailedState.CONNECTED, DetailedState.valueOf("CONNECTED"));
-        assertEquals(DetailedState.CONNECTING, DetailedState.valueOf("CONNECTING"));
-        assertEquals(DetailedState.DISCONNECTED, DetailedState.valueOf("DISCONNECTED"));
-        assertEquals(DetailedState.DISCONNECTING, DetailedState.valueOf("DISCONNECTING"));
-        assertEquals(DetailedState.FAILED, DetailedState.valueOf("FAILED"));
-        assertEquals(DetailedState.IDLE, DetailedState.valueOf("IDLE"));
-        assertEquals(DetailedState.OBTAINING_IPADDR, DetailedState.valueOf("OBTAINING_IPADDR"));
-        assertEquals(DetailedState.SCANNING, DetailedState.valueOf("SCANNING"));
-        assertEquals(DetailedState.SUSPENDED, DetailedState.valueOf("SUSPENDED"));
-    }
-
-    public void testValues() {
-        DetailedState[] expected = DetailedState.values();
-        assertEquals(13, expected.length);
-        assertEquals(DetailedState.IDLE, expected[0]);
-        assertEquals(DetailedState.SCANNING, expected[1]);
-        assertEquals(DetailedState.CONNECTING, expected[2]);
-        assertEquals(DetailedState.AUTHENTICATING, expected[3]);
-        assertEquals(DetailedState.OBTAINING_IPADDR, expected[4]);
-        assertEquals(DetailedState.CONNECTED, expected[5]);
-        assertEquals(DetailedState.SUSPENDED, expected[6]);
-        assertEquals(DetailedState.DISCONNECTING, expected[7]);
-        assertEquals(DetailedState.DISCONNECTED, expected[8]);
-        assertEquals(DetailedState.FAILED, expected[9]);
-        assertEquals(DetailedState.BLOCKED, expected[10]);
-        assertEquals(DetailedState.VERIFYING_POOR_LINK, expected[11]);
-        assertEquals(DetailedState.CAPTIVE_PORTAL_CHECK, expected[12]);
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/net/src/android/net/cts/NetworkInfo_StateTest.java b/proprietary/frameworks/base/tests/net/src/android/net/cts/NetworkInfo_StateTest.java
deleted file mode 100755
index 5303ef1281524dbaead9dedd7c12f5c6336da36e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/src/android/net/cts/NetworkInfo_StateTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.cts;
-
-import android.net.NetworkInfo.State;
-import android.test.AndroidTestCase;
-
-public class NetworkInfo_StateTest extends AndroidTestCase {
-
-    public void testValueOf() {
-        assertEquals(State.CONNECTED, State.valueOf("CONNECTED"));
-        assertEquals(State.CONNECTING, State.valueOf("CONNECTING"));
-        assertEquals(State.DISCONNECTED, State.valueOf("DISCONNECTED"));
-        assertEquals(State.DISCONNECTING, State.valueOf("DISCONNECTING"));
-        assertEquals(State.SUSPENDED, State.valueOf("SUSPENDED"));
-        assertEquals(State.UNKNOWN, State.valueOf("UNKNOWN"));
-    }
-
-    public void testValues() {
-        State[] expected = State.values();
-        assertEquals(6, expected.length);
-        assertEquals(State.CONNECTING, expected[0]);
-        assertEquals(State.CONNECTED, expected[1]);
-        assertEquals(State.SUSPENDED, expected[2]);
-        assertEquals(State.DISCONNECTING, expected[3]);
-        assertEquals(State.DISCONNECTED, expected[4]);
-        assertEquals(State.UNKNOWN, expected[5]);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/net/src/android/net/cts/ProxyTest.java b/proprietary/frameworks/base/tests/net/src/android/net/cts/ProxyTest.java
deleted file mode 100755
index 86c418660a8deeac4007de304cd9ebb6fb9d8bf0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/src/android/net/cts/ProxyTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.cts;
-
-
-import android.net.Proxy;
-import android.test.AndroidTestCase;
-
-public class ProxyTest extends AndroidTestCase {
-
-    public void testConstructor() {
-        new Proxy();
-    }
-
-    public void testAccessProperties() {
-        final int minValidPort = 0;
-        final int maxValidPort = 65535;
-        int defaultPort = Proxy.getDefaultPort();
-        if (null == Proxy.getDefaultHost()) {
-            assertEquals(-1, defaultPort);
-        } else {
-            assertTrue(defaultPort >= minValidPort && defaultPort <= maxValidPort);
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/net/src/android/net/cts/TrafficStatsTest.java b/proprietary/frameworks/base/tests/net/src/android/net/cts/TrafficStatsTest.java
deleted file mode 100755
index cc56866c9a2ef74c4752c109bd0e292cd597357b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/src/android/net/cts/TrafficStatsTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.cts;
-
-import android.net.TrafficStats;
-import android.test.AndroidTestCase;
-import android.util.Log;
-
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-public class TrafficStatsTest extends AndroidTestCase {
-    private static final String LOG_TAG = "TrafficStatsTest";
-
-    public void testValidMobileStats() {
-        // We can't assume a mobile network is even present in this test, so
-        // we simply assert that a valid value is returned.
-
-        assertTrue(TrafficStats.getMobileTxPackets() >= 0);
-        assertTrue(TrafficStats.getMobileRxPackets() >= 0);
-        assertTrue(TrafficStats.getMobileTxBytes() >= 0);
-        assertTrue(TrafficStats.getMobileRxBytes() >= 0);
-    }
-
-    public void testValidTotalStats() {
-        assertTrue(TrafficStats.getTotalTxPackets() >= 0);
-        assertTrue(TrafficStats.getTotalRxPackets() >= 0);
-        assertTrue(TrafficStats.getTotalTxBytes() >= 0);
-        assertTrue(TrafficStats.getTotalRxBytes() >= 0);
-    }
-
-    public void testThreadStatsTag() throws Exception {
-        TrafficStats.setThreadStatsTag(0xf00d);
-        assertTrue("Tag didn't stick", TrafficStats.getThreadStatsTag() == 0xf00d);
-
-        final CountDownLatch latch = new CountDownLatch(1);
-
-        new Thread("TrafficStatsTest.testThreadStatsTag") {
-            @Override
-            public void run() {
-                assertTrue("Tag leaked", TrafficStats.getThreadStatsTag() != 0xf00d);
-                TrafficStats.setThreadStatsTag(0xcafe);
-                assertTrue("Tag didn't stick", TrafficStats.getThreadStatsTag() == 0xcafe);
-                latch.countDown();
-            }
-        } .start();
-
-        latch.await(5, TimeUnit.SECONDS);
-        assertTrue("Tag lost", TrafficStats.getThreadStatsTag() == 0xf00d);
-
-        TrafficStats.clearThreadStatsTag();
-        assertTrue("Tag not cleared", TrafficStats.getThreadStatsTag() != 0xf00d);
-    }
-
-    long tcpPacketToIpBytes(long packetCount, long bytes) {
-        // ip header + tcp header + data.
-        // Tcp header is mostly 32. Syn has different tcp options -> 40. Don't care.
-        return packetCount * (20 + 32 + bytes);
-    }
-
-    private void accessOwnTrafficStats() throws IOException {
-        final int ownAppUid = getContext().getApplicationInfo().uid;
-        Log.d(LOG_TAG, "accesOwnTrafficStatsWithTags(): about to read qtaguid stats for own uid " + ownAppUid);
-
-        boolean foundOwnDetailedStats = false;
-        try {
-            BufferedReader qtaguidReader = new BufferedReader(new FileReader("/proc/net/xt_qtaguid/stats"));
-            String line;
-            while ((line = qtaguidReader.readLine()) != null) {
-                String tokens[] = line.split(" ");
-                if (tokens.length > 3 && tokens[3].equals(String.valueOf(ownAppUid))) {
-                    Log.d(LOG_TAG, "accessOwnTrafficStatsWithTags(): got own stats: " + line);
-                }
-            }
-            qtaguidReader.close();
-        } catch (FileNotFoundException e) {
-            fail("Was not able to access qtaguid/stats: " + e);
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/net/src/android/net/cts/UriTest.java b/proprietary/frameworks/base/tests/net/src/android/net/cts/UriTest.java
deleted file mode 100755
index 4ff43c6049967426ec52d57ab73c9aa20a88be25..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/src/android/net/cts/UriTest.java
+++ /dev/null
@@ -1,417 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.cts;
-
-import android.content.ContentUris;
-import android.net.Uri;
-import android.os.Parcel;
-import android.test.AndroidTestCase;
-import java.io.File;
-import java.util.Arrays;
-
-public class UriTest extends AndroidTestCase {
-    public void testParcelling() {
-        parcelAndUnparcel(Uri.parse("foo:bob%20lee"));
-        parcelAndUnparcel(Uri.fromParts("foo", "bob lee", "fragment"));
-        parcelAndUnparcel(new Uri.Builder()
-             .scheme("http")
-            .authority("crazybob.org")
-            .path("/rss/")
-            .encodedQuery("a=b")
-            .fragment("foo")
-            .build());
-     }
-
-    private void parcelAndUnparcel(Uri u) {
-        Parcel p = Parcel.obtain();
-        Uri.writeToParcel(p, u);
-        p.setDataPosition(0);
-        assertEquals(u, Uri.CREATOR.createFromParcel(p));
-
-        p.setDataPosition(0);
-        u = u.buildUpon().build();
-        Uri.writeToParcel(p, u);
-        p.setDataPosition(0);
-        assertEquals(u, Uri.CREATOR.createFromParcel(p));
-    }
-
-    public void testBuildUpon() {
-        Uri u = Uri.parse("bob:lee").buildUpon().scheme("robert").build();
-        assertEquals("robert", u.getScheme());
-        assertEquals("lee", u.getEncodedSchemeSpecificPart());
-        assertEquals("lee", u.getSchemeSpecificPart());
-        assertNull(u.getQuery());
-        assertNull(u.getPath());
-        assertNull(u.getAuthority());
-        assertNull(u.getHost());
-
-        Uri a = Uri.fromParts("foo", "bar", "tee");
-        Uri b = a.buildUpon().fragment("new").build();
-        assertEquals("new", b.getFragment());
-        assertEquals("bar", b.getSchemeSpecificPart());
-        assertEquals("foo", b.getScheme());
-        a = new Uri.Builder()
-                .scheme("foo")
-                .encodedOpaquePart("bar")
-                .fragment("tee")
-                .build();
-        b = a.buildUpon().fragment("new").build();
-        assertEquals("new", b.getFragment());
-        assertEquals("bar", b.getSchemeSpecificPart());
-        assertEquals("foo", b.getScheme());
-    }
-
-    public void testStringUri() {
-        assertEquals("bob lee",
-                Uri.parse("foo:bob%20lee").getSchemeSpecificPart());
-        assertEquals("bob%20lee",
-                Uri.parse("foo:bob%20lee").getEncodedSchemeSpecificPart());
-
-        assertEquals("/bob%20lee",
-                Uri.parse("foo:/bob%20lee").getEncodedPath());
-        assertNull(Uri.parse("foo:bob%20lee").getPath());
-
-        assertEquals("bob%20lee",
-                Uri.parse("foo:?bob%20lee").getEncodedQuery());
-        assertNull(Uri.parse("foo:bob%20lee").getEncodedQuery());
-        assertNull(Uri.parse("foo:bar#?bob%20lee").getQuery());
-
-        assertEquals("bob%20lee",
-                Uri.parse("foo:#bob%20lee").getEncodedFragment());
-
-        Uri uri = Uri.parse("http://localhost:42");
-        assertEquals("localhost", uri.getHost());
-        assertEquals(42, uri.getPort());
-
-        uri = Uri.parse("http://bob@localhost:42");
-        assertEquals("bob", uri.getUserInfo());
-        assertEquals("localhost", uri.getHost());
-        assertEquals(42, uri.getPort());
-
-        uri = Uri.parse("http://bob%20lee@localhost:42");
-        assertEquals("bob lee", uri.getUserInfo());
-        assertEquals("bob%20lee", uri.getEncodedUserInfo());
-
-        uri = Uri.parse("http://localhost");
-        assertEquals("localhost", uri.getHost());
-        assertEquals(-1, uri.getPort());
-    }
-
-    public void testCompareTo() {
-        Uri a = Uri.parse("foo:a");
-        Uri b = Uri.parse("foo:b");
-        Uri b2 = Uri.parse("foo:b");
-
-        assertTrue(a.compareTo(b) < 0);
-        assertTrue(b.compareTo(a) > 0);
-        assertEquals(0, b.compareTo(b2));
-    }
-
-    public void testEqualsAndHashCode() {
-        Uri a = Uri.parse("http://crazybob.org/test/?foo=bar#tee");
-
-        Uri b = new Uri.Builder()
-                .scheme("http")
-                .authority("crazybob.org")
-                .path("/test/")
-                .encodedQuery("foo=bar")
-                .fragment("tee")
-                .build();
-
-        // Try alternate builder methods.
-        Uri c = new Uri.Builder()
-                .scheme("http")
-                .encodedAuthority("crazybob.org")
-                .encodedPath("/test/")
-                .encodedQuery("foo=bar")
-                .encodedFragment("tee")
-                .build();
-
-        assertFalse(Uri.EMPTY.equals(null));
-        assertEquals(a, b);
-        assertEquals(b, c);
-        assertEquals(c, a);
-        assertEquals(a.hashCode(), b.hashCode());
-        assertEquals(b.hashCode(), c.hashCode());
-    }
-
-    public void testEncodeAndDecode() {
-        String encoded = Uri.encode("Bob:/", "/");
-        assertEquals(-1, encoded.indexOf(':'));
-        assertTrue(encoded.indexOf('/') > -1);
-        assertDecode(null);
-        assertDecode("");
-        assertDecode("Bob");
-        assertDecode(":Bob");
-        assertDecode("::Bob");
-        assertDecode("Bob::Lee");
-        assertDecode("Bob:Lee");
-        assertDecode("Bob::");
-        assertDecode("Bob:");
-        assertDecode("::Bob::");
-    }
-
-    private void assertDecode(String s) {
-        assertEquals(s, Uri.decode(Uri.encode(s, null)));
-    }
-
-    public void testFromFile() {
-        File f = new File("/tmp/bob");
-        Uri uri = Uri.fromFile(f);
-        assertEquals("file:///tmp/bob", uri.toString());
-        try {
-            Uri.fromFile(null);
-            fail("testFile fail");
-            } catch (NullPointerException e) { }
-    }
-
-    public void testQueryParameters() {
-        Uri uri = Uri.parse("content://user");
-        assertEquals(null, uri.getQueryParameter("a"));
-
-        uri = uri.buildUpon().appendQueryParameter("a", "b").build();
-        assertEquals("b", uri.getQueryParameter("a"));
-
-        uri = uri.buildUpon().appendQueryParameter("a", "b2").build();
-        assertEquals(Arrays.asList("b", "b2"), uri.getQueryParameters("a"));
-
-        uri = uri.buildUpon().appendQueryParameter("c", "d").build();
-        assertEquals(Arrays.asList("b", "b2"), uri.getQueryParameters("a"));
-        assertEquals("d", uri.getQueryParameter("c"));
-    }
-
-    public void testPathOperations() {
-        Uri uri = Uri.parse("content://user/a/b");
-
-        assertEquals(2, uri.getPathSegments().size());
-        assertEquals("a", uri.getPathSegments().get(0));
-        assertEquals("b", uri.getPathSegments().get(1));
-        assertEquals("b", uri.getLastPathSegment());
-
-        Uri first = uri;
-        uri = uri.buildUpon().appendPath("c").build();
-        assertEquals(3, uri.getPathSegments().size());
-        assertEquals("c", uri.getPathSegments().get(2));
-        assertEquals("c", uri.getLastPathSegment());
-        assertEquals("content://user/a/b/c", uri.toString());
-
-        uri = ContentUris.withAppendedId(uri, 100);
-        assertEquals(4, uri.getPathSegments().size());
-        assertEquals("100", uri.getPathSegments().get(3));
-        assertEquals("100", uri.getLastPathSegment());
-        assertEquals(100, ContentUris.parseId(uri));
-        assertEquals("content://user/a/b/c/100", uri.toString());
-
-        // Make sure the original URI is still intact.
-        assertEquals(2, first.getPathSegments().size());
-        assertEquals("b", first.getLastPathSegment());
-
-        try {
-        first.getPathSegments().get(2);
-        fail("test path operations");
-        } catch (IndexOutOfBoundsException e) { }
-
-        assertEquals(null, Uri.EMPTY.getLastPathSegment());
-
-        Uri withC = Uri.parse("foo:/a/b/").buildUpon().appendPath("c").build();
-        assertEquals("/a/b/c", withC.getPath());
-    }
-
-    public void testOpaqueUri() {
-        Uri uri = Uri.parse("mailto:nobody");
-        testOpaqueUri(uri);
-
-        uri = uri.buildUpon().build();
-        testOpaqueUri(uri);
-
-        uri = Uri.fromParts("mailto", "nobody", null);
-        testOpaqueUri(uri);
-
-        uri = uri.buildUpon().build();
-        testOpaqueUri(uri);
-
-        uri = new Uri.Builder()
-                .scheme("mailto")
-                .opaquePart("nobody")
-                .build();
-        testOpaqueUri(uri);
-
-        uri = uri.buildUpon().build();
-        testOpaqueUri(uri);
-    }
-
-    private void testOpaqueUri(Uri uri) {
-        assertEquals("mailto", uri.getScheme());
-        assertEquals("nobody", uri.getSchemeSpecificPart());
-        assertEquals("nobody", uri.getEncodedSchemeSpecificPart());
-
-        assertNull(uri.getFragment());
-        assertTrue(uri.isAbsolute());
-        assertTrue(uri.isOpaque());
-        assertFalse(uri.isRelative());
-        assertFalse(uri.isHierarchical());
-
-        assertNull(uri.getAuthority());
-        assertNull(uri.getEncodedAuthority());
-        assertNull(uri.getPath());
-        assertNull(uri.getEncodedPath());
-        assertNull(uri.getUserInfo());
-        assertNull(uri.getEncodedUserInfo());
-        assertNull(uri.getQuery());
-        assertNull(uri.getEncodedQuery());
-        assertNull(uri.getHost());
-        assertEquals(-1, uri.getPort());
-
-        assertTrue(uri.getPathSegments().isEmpty());
-        assertNull(uri.getLastPathSegment());
-
-        assertEquals("mailto:nobody", uri.toString());
-
-        Uri withFragment = uri.buildUpon().fragment("top").build();
-        assertEquals("mailto:nobody#top", withFragment.toString());
-    }
-
-    public void testHierarchicalUris() {
-        testHierarchical("http", "google.com", "/p1/p2", "query", "fragment");
-        testHierarchical("file", null, "/p1/p2", null, null);
-        testHierarchical("content", "contact", "/p1/p2", null, null);
-        testHierarchical("http", "google.com", "/p1/p2", null, "fragment");
-        testHierarchical("http", "google.com", "", null, "fragment");
-        testHierarchical("http", "google.com", "", "query", "fragment");
-        testHierarchical("http", "google.com", "", "query", null);
-        testHierarchical("http", null, "/", "query", null);
-    }
-
-    private static void testHierarchical(String scheme, String authority,
-        String path, String query, String fragment) {
-        StringBuilder sb = new StringBuilder();
-
-        if (authority != null) {
-            sb.append("//").append(authority);
-        }
-        if (path != null) {
-            sb.append(path);
-        }
-        if (query != null) {
-            sb.append('?').append(query);
-        }
-
-        String ssp = sb.toString();
-
-        if (scheme != null) {
-            sb.insert(0, scheme + ":");
-        }
-        if (fragment != null) {
-            sb.append('#').append(fragment);
-        }
-
-        String uriString = sb.toString();
-
-        Uri uri = Uri.parse(uriString);
-
-        // Run these twice to test caching.
-        compareHierarchical(
-        uriString, ssp, uri, scheme, authority, path, query, fragment);
-        compareHierarchical(
-        uriString, ssp, uri, scheme, authority, path, query, fragment);
-
-        // Test rebuilt version.
-        uri = uri.buildUpon().build();
-
-        // Run these twice to test caching.
-        compareHierarchical(
-                uriString, ssp, uri, scheme, authority, path, query, fragment);
-        compareHierarchical(
-                uriString, ssp, uri, scheme, authority, path, query, fragment);
-
-        // The decoded and encoded versions of the inputs are all the same.
-        // We'll test the actual encoding decoding separately.
-
-        // Test building with encoded versions.
-        Uri built = new Uri.Builder()
-            .scheme(scheme)
-                .encodedAuthority(authority)
-                .encodedPath(path)
-                .encodedQuery(query)
-                .encodedFragment(fragment)
-                .build();
-
-        compareHierarchical(
-                uriString, ssp, built, scheme, authority, path, query, fragment);
-        compareHierarchical(
-                uriString, ssp, built, scheme, authority, path, query, fragment);
-
-        // Test building with decoded versions.
-        built = new Uri.Builder()
-                .scheme(scheme)
-                .authority(authority)
-                .path(path)
-                .query(query)
-                .fragment(fragment)
-                .build();
-
-        compareHierarchical(
-                uriString, ssp, built, scheme, authority, path, query, fragment);
-        compareHierarchical(
-                uriString, ssp, built, scheme, authority, path, query, fragment);
-
-        // Rebuild.
-        built = built.buildUpon().build();
-
-        compareHierarchical(
-                uriString, ssp, built, scheme, authority, path, query, fragment);
-        compareHierarchical(
-                uriString, ssp, built, scheme, authority, path, query, fragment);
-    }
-
-    private static void compareHierarchical(String uriString, String ssp,
-        Uri uri,
-        String scheme, String authority, String path, String query,
-        String fragment) {
-        assertEquals(scheme, uri.getScheme());
-        assertEquals(authority, uri.getAuthority());
-        assertEquals(authority, uri.getEncodedAuthority());
-        assertEquals(path, uri.getPath());
-        assertEquals(path, uri.getEncodedPath());
-        assertEquals(query, uri.getQuery());
-        assertEquals(query, uri.getEncodedQuery());
-        assertEquals(fragment, uri.getFragment());
-        assertEquals(fragment, uri.getEncodedFragment());
-        assertEquals(ssp, uri.getSchemeSpecificPart());
-
-        if (scheme != null) {
-            assertTrue(uri.isAbsolute());
-            assertFalse(uri.isRelative());
-        } else {
-            assertFalse(uri.isAbsolute());
-            assertTrue(uri.isRelative());
-        }
-
-        assertFalse(uri.isOpaque());
-        assertTrue(uri.isHierarchical());
-        assertEquals(uriString, uri.toString());
-    }
-
-    public void testNormalizeScheme() {
-        assertEquals(Uri.parse(""), Uri.parse("").normalizeScheme());
-        assertEquals(Uri.parse("http://www.android.com"),
-                Uri.parse("http://www.android.com").normalizeScheme());
-        assertEquals(Uri.parse("http://USER@WWW.ANDROID.COM:100/ABOUT?foo=blah@bar=bleh#c"),
-                Uri.parse("HTTP://USER@WWW.ANDROID.COM:100/ABOUT?foo=blah@bar=bleh#c")
-                        .normalizeScheme());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/net/src/android/net/cts/Uri_BuilderTest.java b/proprietary/frameworks/base/tests/net/src/android/net/cts/Uri_BuilderTest.java
deleted file mode 100755
index 4088d822cfcca4dc6e7783cc16f72a3db59ea69d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/src/android/net/cts/Uri_BuilderTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.cts;
-
-import junit.framework.TestCase;
-import android.net.Uri.Builder;
-import android.net.Uri;
-
-public class Uri_BuilderTest extends TestCase {
-    public void testBuilderOperations() {
-        Uri uri = Uri.parse("http://google.com/p1?query#fragment");
-        Builder builder = uri.buildUpon();
-        uri = builder.appendPath("p2").build();
-        assertEquals("http", uri.getScheme());
-        assertEquals("google.com", uri.getAuthority());
-        assertEquals("/p1/p2", uri.getPath());
-        assertEquals("query", uri.getQuery());
-        assertEquals("fragment", uri.getFragment());
-        assertEquals(uri.toString(), builder.toString());
-
-        uri = Uri.parse("mailto:nobody");
-        builder = uri.buildUpon();
-        uri = builder.build();
-        assertEquals("mailto", uri.getScheme());
-        assertEquals("nobody", uri.getSchemeSpecificPart());
-        assertEquals(uri.toString(), builder.toString());
-
-        uri = new Uri.Builder()
-                .scheme("http")
-                .encodedAuthority("google.com")
-                .encodedPath("/p1")
-                .appendEncodedPath("p2")
-                .encodedQuery("query")
-                .appendQueryParameter("query2", null)
-                .encodedFragment("fragment")
-                .build();
-        assertEquals("http", uri.getScheme());
-        assertEquals("google.com", uri.getEncodedAuthority());
-        assertEquals("/p1/p2", uri.getEncodedPath());
-        assertEquals("query&query2=null", uri.getEncodedQuery());
-        assertEquals("fragment", uri.getEncodedFragment());
-
-        uri = new Uri.Builder()
-                .scheme("mailto")
-                .encodedOpaquePart("nobody")
-                .build();
-        assertEquals("mailto", uri.getScheme());
-        assertEquals("nobody", uri.getEncodedSchemeSpecificPart());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/net/src/android/net/cts/UrlQuerySanitizerTest.java b/proprietary/frameworks/base/tests/net/src/android/net/cts/UrlQuerySanitizerTest.java
deleted file mode 100755
index 7f8130fc834dc2010662f488ce886ec4fd99cb50..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/src/android/net/cts/UrlQuerySanitizerTest.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.cts;
-
-import java.util.List;
-import java.util.Set;
-import android.net.UrlQuerySanitizer;
-import android.net.UrlQuerySanitizer.IllegalCharacterValueSanitizer;
-import android.net.UrlQuerySanitizer.ParameterValuePair;
-import android.net.UrlQuerySanitizer.ValueSanitizer;
-import android.test.AndroidTestCase;
-
-public class UrlQuerySanitizerTest extends AndroidTestCase {
-    private static final int ALL_OK = IllegalCharacterValueSanitizer.ALL_OK;
-
-    // URL for test.
-    private static final String TEST_URL = "http://example.com/?name=Joe+User&age=20&height=175";
-
-    // Default sanitizer's change when "+".
-    private static final String EXPECTED_UNDERLINE_NAME = "Joe_User";
-
-    // IllegalCharacterValueSanitizer sanitizer's change when "+".
-    private static final String EXPECTED_SPACE_NAME = "Joe User";
-    private static final String EXPECTED_AGE = "20";
-    private static final String EXPECTED_HEIGHT = "175";
-    private static final String NAME = "name";
-    private static final String AGE = "age";
-    private static final String HEIGHT = "height";
-
-    public void testUrlQuerySanitizer() {
-        MockUrlQuerySanitizer uqs = new MockUrlQuerySanitizer();
-        assertFalse(uqs.getAllowUnregisteredParamaters());
-
-        final String query = "book=thinking in java&price=108";
-        final String book = "book";
-        final String bookName = "thinking in java";
-        final String price = "price";
-        final String bookPrice = "108";
-        final String notExistPar = "notExistParameter";
-        uqs.registerParameters(new String[]{book, price}, UrlQuerySanitizer.getSpaceLegal());
-        uqs.parseQuery(query);
-        assertTrue(uqs.hasParameter(book));
-        assertTrue(uqs.hasParameter(price));
-        assertFalse(uqs.hasParameter(notExistPar));
-        assertEquals(bookName, uqs.getValue(book));
-        assertEquals(bookPrice, uqs.getValue(price));
-        assertNull(uqs.getValue(notExistPar));
-        uqs.clear();
-        assertFalse(uqs.hasParameter(book));
-        assertFalse(uqs.hasParameter(price));
-
-        uqs.parseEntry(book, bookName);
-        assertTrue(uqs.hasParameter(book));
-        assertEquals(bookName, uqs.getValue(book));
-        uqs.parseEntry(price, bookPrice);
-        assertTrue(uqs.hasParameter(price));
-        assertEquals(bookPrice, uqs.getValue(price));
-        assertFalse(uqs.hasParameter(notExistPar));
-        assertNull(uqs.getValue(notExistPar));
-
-        uqs = new MockUrlQuerySanitizer(TEST_URL);
-        assertTrue(uqs.getAllowUnregisteredParamaters());
-
-        assertTrue(uqs.hasParameter(NAME));
-        assertTrue(uqs.hasParameter(AGE));
-        assertTrue(uqs.hasParameter(HEIGHT));
-        assertFalse(uqs.hasParameter(notExistPar));
-
-        assertEquals(EXPECTED_UNDERLINE_NAME, uqs.getValue(NAME));
-        assertEquals(EXPECTED_AGE, uqs.getValue(AGE));
-        assertEquals(EXPECTED_HEIGHT, uqs.getValue(HEIGHT));
-        assertNull(uqs.getValue(notExistPar));
-
-        final int ContainerLen = 3;
-        Set<String> urlSet = uqs.getParameterSet();
-        assertEquals(ContainerLen, urlSet.size());
-        assertTrue(urlSet.contains(NAME));
-        assertTrue(urlSet.contains(AGE));
-        assertTrue(urlSet.contains(HEIGHT));
-        assertFalse(urlSet.contains(notExistPar));
-
-        List<ParameterValuePair> urlList = uqs.getParameterList();
-        assertEquals(ContainerLen, urlList.size());
-        ParameterValuePair pvp = urlList.get(0);
-        assertEquals(NAME, pvp.mParameter);
-        assertEquals(EXPECTED_UNDERLINE_NAME, pvp.mValue);
-        pvp = urlList.get(1);
-        assertEquals(AGE, pvp.mParameter);
-        assertEquals(EXPECTED_AGE, pvp.mValue);
-        pvp = urlList.get(2);
-        assertEquals(HEIGHT, pvp.mParameter);
-        assertEquals(EXPECTED_HEIGHT, pvp.mValue);
-
-        assertFalse(uqs.getPreferFirstRepeatedParameter());
-        uqs.addSanitizedEntry(HEIGHT, EXPECTED_HEIGHT + 1);
-        assertEquals(ContainerLen, urlSet.size());
-        assertEquals(ContainerLen + 1, urlList.size());
-        assertEquals(EXPECTED_HEIGHT + 1, uqs.getValue(HEIGHT));
-
-        uqs.setPreferFirstRepeatedParameter(true);
-        assertTrue(uqs.getPreferFirstRepeatedParameter());
-        uqs.addSanitizedEntry(HEIGHT, EXPECTED_HEIGHT);
-        assertEquals(ContainerLen, urlSet.size());
-        assertEquals(ContainerLen + 2, urlList.size());
-        assertEquals(EXPECTED_HEIGHT + 1, uqs.getValue(HEIGHT));
-
-        uqs.registerParameter(NAME, null);
-        assertNull(uqs.getValueSanitizer(NAME));
-        assertNotNull(uqs.getEffectiveValueSanitizer(NAME));
-
-        uqs.setAllowUnregisteredParamaters(false);
-        assertFalse(uqs.getAllowUnregisteredParamaters());
-        uqs.registerParameter(NAME, null);
-        assertNull(uqs.getEffectiveValueSanitizer(NAME));
-
-        ValueSanitizer vs = new IllegalCharacterValueSanitizer(ALL_OK);
-        uqs.registerParameter(NAME, vs);
-        uqs.parseUrl(TEST_URL);
-        assertEquals(EXPECTED_SPACE_NAME, uqs.getValue(NAME));
-        assertNotSame(EXPECTED_AGE, uqs.getValue(AGE));
-
-        String[] register = {NAME, AGE};
-        uqs.registerParameters(register, vs);
-        uqs.parseUrl(TEST_URL);
-        assertEquals(EXPECTED_SPACE_NAME, uqs.getValue(NAME));
-        assertEquals(EXPECTED_AGE, uqs.getValue(AGE));
-        assertNotSame(EXPECTED_HEIGHT, uqs.getValue(HEIGHT));
-
-        uqs.setUnregisteredParameterValueSanitizer(vs);
-        assertEquals(vs, uqs.getUnregisteredParameterValueSanitizer());
-
-        vs = UrlQuerySanitizer.getAllIllegal();
-        assertEquals("Joe_User", vs.sanitize("Joe<User"));
-        vs = UrlQuerySanitizer.getAllButNulAndAngleBracketsLegal();
-        assertEquals("Joe   User", vs.sanitize("Joe<>\0User"));
-        vs = UrlQuerySanitizer.getAllButNulLegal();
-        assertEquals("Joe User", vs.sanitize("Joe\0User"));
-        vs = UrlQuerySanitizer.getAllButWhitespaceLegal();
-        assertEquals("Joe_User", vs.sanitize("Joe User"));
-        vs = UrlQuerySanitizer.getAmpAndSpaceLegal();
-        assertEquals("Joe User&", vs.sanitize("Joe User&"));
-        vs = UrlQuerySanitizer.getAmpLegal();
-        assertEquals("Joe_User&", vs.sanitize("Joe User&"));
-        vs = UrlQuerySanitizer.getSpaceLegal();
-        assertEquals("Joe User ", vs.sanitize("Joe User&"));
-        vs = UrlQuerySanitizer.getUrlAndSpaceLegal();
-        assertEquals("Joe User&Smith%B5'\'", vs.sanitize("Joe User&Smith%B5'\'"));
-        vs = UrlQuerySanitizer.getUrlLegal();
-        assertEquals("Joe_User&Smith%B5'\'", vs.sanitize("Joe User&Smith%B5'\'"));
-
-        String escape = "Joe";
-        assertEquals(escape, uqs.unescape(escape));
-        String expectedPlus = "Joe User";
-        String expectedPercentSignHex = "title=" + Character.toString((char) 181);
-        String initialPlus = "Joe+User";
-        String initialPercentSign = "title=%B5";
-        assertEquals(expectedPlus, uqs.unescape(initialPlus));
-        assertEquals(expectedPercentSignHex, uqs.unescape(initialPercentSign));
-
-        assertTrue(uqs.decodeHexDigit('0') >= 0);
-        assertTrue(uqs.decodeHexDigit('b') >= 0);
-        assertTrue(uqs.decodeHexDigit('F') >= 0);
-        assertTrue(uqs.decodeHexDigit('$') < 0);
-
-        assertTrue(uqs.isHexDigit('0'));
-        assertTrue(uqs.isHexDigit('b'));
-        assertTrue(uqs.isHexDigit('F'));
-        assertFalse(uqs.isHexDigit('$'));
-
-        uqs.clear();
-        assertEquals(0, urlSet.size());
-        assertEquals(0, urlList.size());
-
-        uqs.setPreferFirstRepeatedParameter(true);
-        assertTrue(uqs.getPreferFirstRepeatedParameter());
-        uqs.setPreferFirstRepeatedParameter(false);
-        assertFalse(uqs.getPreferFirstRepeatedParameter());
-
-        UrlQuerySanitizer uq = new UrlQuerySanitizer();
-        uq.setPreferFirstRepeatedParameter(true);
-        final String PARA_ANSWER = "answer";
-        uq.registerParameter(PARA_ANSWER, new MockValueSanitizer());
-        uq.parseUrl("http://www.google.com/question?answer=13&answer=42");
-        assertEquals("13", uq.getValue(PARA_ANSWER));
-
-        uq.setPreferFirstRepeatedParameter(false);
-        uq.parseQuery("http://www.google.com/question?answer=13&answer=42");
-        assertEquals("42", uq.getValue(PARA_ANSWER));
-
-    }
-
-    private static class MockValueSanitizer implements ValueSanitizer {
-
-        public String sanitize(String value) {
-            return value;
-        }
-    }
-
-    class MockUrlQuerySanitizer extends UrlQuerySanitizer {
-        public MockUrlQuerySanitizer() {
-            super();
-        }
-
-        public MockUrlQuerySanitizer(String url) {
-            super(url);
-        }
-
-        @Override
-        protected void addSanitizedEntry(String parameter, String value) {
-            super.addSanitizedEntry(parameter, value);
-        }
-
-        @Override
-        protected void clear() {
-            super.clear();
-        }
-
-        @Override
-        protected int decodeHexDigit(char c) {
-            return super.decodeHexDigit(c);
-        }
-
-        @Override
-        protected boolean isHexDigit(char c) {
-            return super.isHexDigit(c);
-        }
-
-        @Override
-        protected void parseEntry(String parameter, String value) {
-            super.parseEntry(parameter, value);
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/net/src/android/net/cts/UrlQuerySanitizer_IllegalCharacterValueSanitizerTest.java b/proprietary/frameworks/base/tests/net/src/android/net/cts/UrlQuerySanitizer_IllegalCharacterValueSanitizerTest.java
deleted file mode 100755
index ac84abb4c5cce0acc393339861dfd81c9f459ae1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/src/android/net/cts/UrlQuerySanitizer_IllegalCharacterValueSanitizerTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.cts;
-
-import android.net.UrlQuerySanitizer.IllegalCharacterValueSanitizer;
-import android.test.AndroidTestCase;
-
-public class UrlQuerySanitizer_IllegalCharacterValueSanitizerTest extends AndroidTestCase {
-    static final int SPACE_OK = IllegalCharacterValueSanitizer.SPACE_OK;
-    public void testSanitize() {
-        IllegalCharacterValueSanitizer sanitizer =  new IllegalCharacterValueSanitizer(SPACE_OK);
-        assertEquals("Joe User", sanitizer.sanitize("Joe<User"));
-    }
-}
diff --git a/proprietary/frameworks/base/tests/net/src/android/net/cts/UrlQuerySanitizer_ParameterValuePairTest.java b/proprietary/frameworks/base/tests/net/src/android/net/cts/UrlQuerySanitizer_ParameterValuePairTest.java
deleted file mode 100755
index 077cdaf2ff5ac25001d3c896d07cd7d362c3e286..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/src/android/net/cts/UrlQuerySanitizer_ParameterValuePairTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.cts;
-
-import android.net.UrlQuerySanitizer;
-import android.net.UrlQuerySanitizer.ParameterValuePair;
-import android.test.AndroidTestCase;
-
-public class UrlQuerySanitizer_ParameterValuePairTest extends AndroidTestCase {
-    public void testConstructor() {
-        final String parameter = "name";
-        final String vaule = "Joe_user";
-
-        UrlQuerySanitizer uqs = new UrlQuerySanitizer();
-        ParameterValuePair parameterValuePair = uqs.new ParameterValuePair(parameter, vaule);
-        assertEquals(parameter, parameterValuePair.mParameter);
-        assertEquals(vaule, parameterValuePair.mValue);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/net/src/android/net/cts/VpnServiceTest.java b/proprietary/frameworks/base/tests/net/src/android/net/cts/VpnServiceTest.java
deleted file mode 100755
index 8bdd7b08959e52eb1158f708231817ae13335989..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/src/android/net/cts/VpnServiceTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.net.cts;
-
-import android.content.Intent;
-import android.net.VpnService;
-import android.os.ParcelFileDescriptor;
-import android.test.AndroidTestCase;
-
-import java.io.File;
-import java.net.DatagramSocket;
-import java.net.Socket;
-
-/**
- * VpnService API is built with security in mind. However, its security also
- * blocks us from writing tests for positive cases. For now we only test for
- * negative cases, and we will try to cover the rest in the future.
- */
-public class VpnServiceTest extends AndroidTestCase {
-
-    private static final String TAG = VpnServiceTest.class.getSimpleName();
-
-    private VpnService mVpnService = new VpnService();
-
-    public void testPrepare() throws Exception {
-        // Should never return null since we are not prepared.
-        Intent intent = VpnService.prepare(mContext);
-        assertNotNull(intent);
-
-        // Should be always resolved by only one activity.
-        int count = mContext.getPackageManager().queryIntentActivities(intent, 0).size();
-        assertEquals(1, count);
-    }
-
-    public void testEstablish() throws Exception {
-        ParcelFileDescriptor descriptor = null;
-        try {
-            // Should always return null since we are not prepared.
-            descriptor = mVpnService.new Builder().addAddress("8.8.8.8", 30).establish();
-            assertNull(descriptor);
-        } finally {
-            try {
-                descriptor.close();
-            } catch (Exception e) {
-                // ignore
-            }
-        }
-    }
-
-    public void testProtect_DatagramSocket() throws Exception {
-        DatagramSocket socket = new DatagramSocket();
-        try {
-            // Should always return false since we are not prepared.
-            assertFalse(mVpnService.protect(socket));
-        } finally {
-            try {
-                socket.close();
-            } catch (Exception e) {
-                // ignore
-            }
-        }
-    }
-
-    public void testProtect_Socket() throws Exception {
-        Socket socket = new Socket();
-        try {
-            // Should always return false since we are not prepared.
-            assertFalse(mVpnService.protect(socket));
-        } finally {
-            try {
-                socket.close();
-            } catch (Exception e) {
-                // ignore
-            }
-        }
-    }
-
-    public void testProtect_int() throws Exception {
-        DatagramSocket socket = new DatagramSocket();
-        ParcelFileDescriptor descriptor = ParcelFileDescriptor.fromDatagramSocket(socket);
-        try {
-            // Should always return false since we are not prepared.
-            assertFalse(mVpnService.protect(descriptor.getFd()));
-        } finally {
-            try {
-                descriptor.close();
-            } catch (Exception e) {
-                // ignore
-            }
-            try {
-                socket.close();
-            } catch (Exception e) {
-                // ignore
-            }
-        }
-    }
-
-    public void testTunDevice() throws Exception {
-        File file = new File("/dev/tun");
-        assertTrue(file.exists());
-        assertFalse(file.isFile());
-        assertFalse(file.isDirectory());
-        assertFalse(file.canExecute());
-        assertFalse(file.canRead());
-        assertFalse(file.canWrite());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/net/src/android/net/http/cts/SslCertificateTest.java b/proprietary/frameworks/base/tests/net/src/android/net/http/cts/SslCertificateTest.java
deleted file mode 100755
index 70ae496356f38d904561a12380d6ec899132e4bc..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/src/android/net/http/cts/SslCertificateTest.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.http.cts;
-
-import java.math.BigInteger;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.Principal;
-import java.security.PublicKey;
-import java.security.SignatureException;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateExpiredException;
-import java.security.cert.CertificateNotYetValidException;
-import java.security.cert.X509Certificate;
-import java.text.DateFormat;
-import java.util.Date;
-import java.util.Set;
-
-import junit.framework.TestCase;
-import android.net.http.SslCertificate;
-import android.net.http.SslCertificate.DName;
-import android.os.Bundle;
-
-public class SslCertificateTest extends TestCase {
-
-    public void testConstructor() {
-        // new the SslCertificate instance
-        String date = DateFormat.getInstance().format(new Date());
-        new SslCertificate("c=129", "e=weji", date, date);
-
-        // new the SslCertificate instance
-        new SslCertificate(new MockX509Certificate());
-
-    }
-
-    class MockX509Certificate extends X509Certificate {
-
-        @Override
-        public void checkValidity() throws CertificateExpiredException,
-                CertificateNotYetValidException {
-        }
-
-        @Override
-        public void checkValidity(Date date) throws CertificateExpiredException,
-                CertificateNotYetValidException {
-        }
-
-        @Override
-        public int getBasicConstraints() {
-            return 0;
-        }
-
-        @Override
-        public Principal getIssuerDN() {
-            return new MockPrincipal();
-        }
-
-        @Override
-        public boolean[] getIssuerUniqueID() {
-            return null;
-        }
-
-        @Override
-        public boolean[] getKeyUsage() {
-            return null;
-        }
-
-        @Override
-        public Date getNotAfter() {
-            return new Date(System.currentTimeMillis());
-        }
-
-        @Override
-        public Date getNotBefore() {
-            return new Date(System.currentTimeMillis() - 1000);
-        }
-
-        @Override
-        public BigInteger getSerialNumber() {
-            return null;
-        }
-
-        @Override
-        public String getSigAlgName() {
-            return null;
-        }
-
-        @Override
-        public String getSigAlgOID() {
-            return null;
-        }
-
-        @Override
-        public byte[] getSigAlgParams() {
-            return null;
-        }
-
-        @Override
-        public byte[] getSignature() {
-            return null;
-        }
-
-        @Override
-        public Principal getSubjectDN() {
-            return new MockPrincipal();
-        }
-
-        class MockPrincipal implements Principal {
-            public String getName() {
-                return null;
-            }
-        }
-        @Override
-        public boolean[] getSubjectUniqueID() {
-            return null;
-        }
-
-        @Override
-        public byte[] getTBSCertificate() throws CertificateEncodingException {
-            return null;
-        }
-
-        @Override
-        public int getVersion() {
-            return 0;
-        }
-
-        @Override
-        public byte[] getEncoded() throws CertificateEncodingException {
-            return null;
-        }
-
-        @Override
-        public PublicKey getPublicKey() {
-            return null;
-        }
-
-        @Override
-        public String toString() {
-            return null;
-        }
-
-        @Override
-        public void verify(PublicKey key) throws CertificateException, NoSuchAlgorithmException,
-                InvalidKeyException, NoSuchProviderException, SignatureException {
-        }
-
-        @Override
-        public void verify(PublicKey key, String sigProvider) throws CertificateException,
-                NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException,
-                SignatureException {
-        }
-
-        public Set<String> getCriticalExtensionOIDs() {
-            return null;
-        }
-
-        public byte[] getExtensionValue(String oid) {
-            return null;
-        }
-
-        public Set<String> getNonCriticalExtensionOIDs() {
-            return null;
-        }
-
-        public boolean hasUnsupportedCriticalExtension() {
-            return false;
-        }
-    }
-
-    public void testState() {
-        // set the expected value
-
-        Date date1 = new Date(System.currentTimeMillis() - 1000);
-        Date date2 = new Date(System.currentTimeMillis());
-        SslCertificate ssl = new SslCertificate("c=129", "e=weji", date1, date2);
-        Bundle saved = SslCertificate.saveState(ssl);
-        assertTrue(saved.size() == 4);
-
-        assertNotNull(saved.getString("issued-to"));
-        assertNotNull(saved.getString("issued-by"));
-        assertNotNull(saved.getString("valid-not-before"));
-        assertNotNull(saved.getString("valid-not-after"));
-        assertNull(SslCertificate.saveState(null));
-
-        SslCertificate restored = SslCertificate.restoreState(saved);
-        assertEquals(ssl.getValidNotAfter(), restored.getValidNotAfter());
-        assertEquals(ssl.getValidNotBefore(), restored.getValidNotBefore());
-    }
-
-    public void testSslCertificate() {
-
-        final String TO = "c=ccc,o=testOName,ou=testUName,cn=testCName";
-        final String BY = "e=aeei,c=adb,o=testOName,ou=testUName,cn=testCName";
-        // new the SslCertificate instance
-        Date date1 = new Date(System.currentTimeMillis() - 1000);
-        Date date2 = new Date(System.currentTimeMillis());
-        SslCertificate ssl = new SslCertificate(TO, BY, date1, date2);
-        DName issuedTo = ssl.getIssuedTo();
-        DName issuedBy = ssl.getIssuedBy();
-
-        assertEquals("testCName", issuedTo.getCName());
-        assertEquals(TO, issuedTo.getDName());
-        assertEquals("testOName", issuedTo.getOName());
-        assertEquals("testUName", issuedTo.getUName());
-
-        assertEquals("testCName", issuedBy.getCName());
-        assertEquals(BY, issuedBy.getDName());
-        assertEquals("testOName", issuedBy.getOName());
-        assertEquals("testUName", issuedBy.getUName());
-
-        assertEquals(date1, ssl.getValidNotBeforeDate());
-        assertEquals(date2, ssl.getValidNotAfterDate());
-        final String EXPECTED = "Issued to: c=ccc,o=testOName,ou=testUName,cn=testCName;\n"
-            + "Issued by: e=aeei,c=adb,o=testOName,ou=testUName,cn=testCName;\n";
-        assertEquals(EXPECTED, ssl.toString());
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/net/src/android/net/http/cts/SslCertificate_DNameTest.java b/proprietary/frameworks/base/tests/net/src/android/net/http/cts/SslCertificate_DNameTest.java
deleted file mode 100755
index b0c71e8c10329fecc7e28bbeac60ad32732e48e5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/src/android/net/http/cts/SslCertificate_DNameTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.http.cts;
-
-import java.text.DateFormat;
-import java.util.Date;
-
-import junit.framework.TestCase;
-import android.net.http.SslCertificate;
-import android.net.http.SslCertificate.DName;
-
-public class SslCertificate_DNameTest extends TestCase {
-
-    public void testDName() {
-        final String TO = "c=ccc,o=testOName,ou=testUName,cn=testCName";
-        final String BY = "e=aeei,c=adb,o=testOName,ou=testUName,cn=testCName";
-        // new the SslCertificate instance
-        Date date1 = new Date(System.currentTimeMillis() - 1000);
-        Date date2 = new Date(System.currentTimeMillis());
-        SslCertificate ssl = new SslCertificate(TO, BY, DateFormat.getInstance().format(
-                date1), DateFormat.getInstance().format(date2));
-        DName issuedTo = ssl.getIssuedTo();
-
-        assertNotNull(issuedTo);
-
-        assertEquals("testCName", issuedTo.getCName());
-        assertEquals(TO, issuedTo.getDName());
-        assertEquals("testOName", issuedTo.getOName());
-        assertEquals("testUName", issuedTo.getUName());
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/net/src/android/net/http/cts/SslErrorTest.java b/proprietary/frameworks/base/tests/net/src/android/net/http/cts/SslErrorTest.java
deleted file mode 100755
index 850a8b61e6aed4d8456f1d2fc071419ed6c619c9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/src/android/net/http/cts/SslErrorTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.http.cts;
-
-import android.net.http.SslCertificate;
-import android.net.http.SslError;
-
-
-import java.util.Date;
-
-import junit.framework.TestCase;
-
-public class SslErrorTest extends TestCase {
-    private SslCertificate mCertificate;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mCertificate = new SslCertificate("foo", "bar", new Date(42), new Date(43));
-    }
-
-    public void testHasError() {
-        SslError error = new SslError(SslError.SSL_EXPIRED, mCertificate);
-        assertTrue(error.hasError(SslError.SSL_EXPIRED));
-        assertFalse(error.hasError(SslError.SSL_UNTRUSTED));
-    }
-
-    public void testAddError() {
-        SslError error = new SslError(SslError.SSL_EXPIRED, mCertificate);
-        assertFalse(error.hasError(SslError.SSL_UNTRUSTED));
-        error.addError(SslError.SSL_UNTRUSTED);
-        assertTrue(error.hasError(SslError.SSL_UNTRUSTED));
-    }
-
-    public void testAddErrorIgnoresInvalidValues() {
-        SslError error = new SslError(SslError.SSL_EXPIRED, mCertificate);
-        error.addError(42);
-        assertFalse(error.hasError(42));
-    }
-
-    public void testConstructorIgnoresInvalidValues() {
-        SslError error = new SslError(42, mCertificate);
-        assertFalse(error.hasError(42));
-    }
-
-    public void testGetPrimaryError() {
-        SslError error = new SslError(SslError.SSL_EXPIRED, mCertificate);
-        error.addError(SslError.SSL_UNTRUSTED);
-        assertEquals(error.getPrimaryError(), SslError.SSL_UNTRUSTED);
-    }
-
-    public void testGetPrimaryErrorWithEmptySet() {
-        SslError error = new SslError(42, mCertificate);
-        assertEquals(error.getPrimaryError(), -1);
-    }
-
-    public void testGetUrl() {
-        SslError error = new SslError(SslError.SSL_EXPIRED, mCertificate, "foo");
-        assertEquals(error.getUrl(), "foo");
-    }
-
-    public void testGetUrlWithDeprecatedConstructor() {
-        SslError error = new SslError(SslError.SSL_EXPIRED, mCertificate);
-        assertEquals(error.getUrl(), "");
-    }
-}
diff --git a/proprietary/frameworks/base/tests/net/src/android/net/ipv6/cts/PingTest.java b/proprietary/frameworks/base/tests/net/src/android/net/ipv6/cts/PingTest.java
deleted file mode 100755
index c23ad30f050109f0091f3d2d09c052c539f3926b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/net/src/android/net/ipv6/cts/PingTest.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net.ipv6.cts;
-
-import android.test.AndroidTestCase;
-import android.util.Log;
-
-import android.system.ErrnoException;
-import android.system.Os;
-import android.system.StructTimeval;
-import static android.system.OsConstants.*;
-
-import java.io.FileDescriptor;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Inet6Address;
-import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Random;
-
-/**
- * Checks that the device has kernel support for the IPv6 ping socket. This allows ping6 to work
- * without root privileges. The necessary kernel code is in Linux 3.11 or above, or the
- * <code>common/android-3.x</code> kernel trees. If you are not running one of these kernels, the
- * functionality can be obtained by cherry-picking the following patches from David Miller's
- * <code>net-next</code> tree:
- * <ul>
- * <li>6d0bfe2 net: ipv6: Add IPv6 support to the ping socket.
- * <li>c26d6b4 ping: always initialize ->sin6_scope_id and ->sin6_flowinfo
- * <li>fbfe80c net: ipv6: fix wrong ping_v6_sendmsg return value
- * <li>a1bdc45 net: ipv6: add missing lock in ping_v6_sendmsg
- * <li>cf970c0 ping: prevent NULL pointer dereference on write to msg_name
- * </ul>
- * or the equivalent backports to the <code>common/android-3.x</code> trees.
- */
-public class PingTest extends AndroidTestCase {
-    /** Maximum size of the packets we're using to test. */
-    private static final int MAX_SIZE = 4096;
-
-    /** Size of the ICMPv6 header. */
-    private static final int ICMP_HEADER_SIZE = 8;
-
-    /** Number of packets to test. */
-    private static final int NUM_PACKETS = 10;
-
-    /** The beginning of an ICMPv6 echo request: type, code, and uninitialized checksum. */
-    private static final byte[] PING_HEADER = new byte[] {
-        (byte) 0x80, (byte) 0x00, (byte) 0x00, (byte) 0x00
-    };
-
-    /**
-     * Returns a byte array containing an ICMPv6 echo request with the specified payload length.
-     */
-    private byte[] pingPacket(int payloadLength) {
-        byte[] packet = new byte[payloadLength + ICMP_HEADER_SIZE];
-        new Random().nextBytes(packet);
-        System.arraycopy(PING_HEADER, 0, packet, 0, PING_HEADER.length);
-        return packet;
-    }
-
-    /**
-     * Checks that the first length bytes of two byte arrays are equal.
-     */
-    private void assertArrayBytesEqual(byte[] expected, byte[] actual, int length) {
-        for (int i = 0; i < length; i++) {
-            assertEquals("Arrays differ at index " + i + ":", expected[i], actual[i]);
-        }
-    }
-
-    /**
-     * Creates an IPv6 ping socket and sets a receive timeout of 100ms.
-     */
-    private FileDescriptor createPingSocket() throws ErrnoException {
-        FileDescriptor s = Os.socket(AF_INET6, SOCK_DGRAM, IPPROTO_ICMPV6);
-        Os.setsockoptTimeval(s, SOL_SOCKET, SO_RCVTIMEO, StructTimeval.fromMillis(100));
-        return s;
-    }
-
-    /**
-     * Sends a ping packet to a random port on the specified address on the specified socket.
-     */
-    private void sendPing(FileDescriptor s,
-            InetAddress address, byte[] packet) throws ErrnoException, IOException {
-        // Pick a random port. Choose a range that gives a reasonable chance of picking a low port.
-        int port = (int) (Math.random() * 2048);
-
-        // Send the packet.
-        int ret = Os.sendto(s, ByteBuffer.wrap(packet), 0, address, port);
-        assertEquals(packet.length, ret);
-    }
-
-    /**
-     * Checks that a socket has received a response appropriate to the specified packet.
-     */
-    private void checkResponse(FileDescriptor s, InetAddress dest,
-            byte[] sent, boolean useRecvfrom) throws ErrnoException, IOException {
-        ByteBuffer responseBuffer = ByteBuffer.allocate(MAX_SIZE);
-        int bytesRead;
-
-        // Receive the response.
-        if (useRecvfrom) {
-            InetSocketAddress from = new InetSocketAddress();
-            bytesRead = Os.recvfrom(s, responseBuffer, 0, from);
-
-            // Check the source address and scope ID.
-            assertTrue(from.getAddress() instanceof Inet6Address);
-            Inet6Address fromAddress = (Inet6Address) from.getAddress();
-            assertEquals(0, fromAddress.getScopeId());
-            assertNull(fromAddress.getScopedInterface());
-            assertEquals(dest.getHostAddress(), fromAddress.getHostAddress());
-        } else {
-            bytesRead = Os.read(s, responseBuffer);
-        }
-
-        // Check the packet length.
-        assertEquals(sent.length, bytesRead);
-
-        // Check the response is an echo reply.
-        byte[] response = new byte[bytesRead];
-        responseBuffer.flip();
-        responseBuffer.get(response, 0, bytesRead);
-        assertEquals((byte) 0x81, response[0]);
-
-        // Find out what ICMP ID was used in the packet that was sent.
-        int id = ((InetSocketAddress) Os.getsockname(s)).getPort();
-        sent[4] = (byte) (id / 256);
-        sent[5] = (byte) (id % 256);
-
-        // Ensure the response is the same as the packet, except for the type (which is 0x81)
-        // and the ID and checksum,  which are set by the kernel.
-        response[0] = (byte) 0x80;                 // Type.
-        response[2] = response[3] = (byte) 0x00;   // Checksum.
-        assertArrayBytesEqual(response, sent, bytesRead);
-    }
-
-    /**
-     * Sends NUM_PACKETS random ping packets to ::1 and checks the replies.
-     */
-    public void testLoopbackPing() throws ErrnoException, IOException {
-        // Generate a random ping packet and send it to localhost.
-        InetAddress ipv6Loopback = InetAddress.getByName(null);
-        assertEquals("::1", ipv6Loopback.getHostAddress());
-
-        for (int i = 0; i < NUM_PACKETS; i++) {
-            byte[] packet = pingPacket((int) (Math.random() * (MAX_SIZE - ICMP_HEADER_SIZE)));
-            FileDescriptor s = createPingSocket();
-            // Use both recvfrom and read().
-            sendPing(s, ipv6Loopback, packet);
-            checkResponse(s, ipv6Loopback, packet, true);
-            sendPing(s, ipv6Loopback, packet);
-            checkResponse(s, ipv6Loopback, packet, false);
-            // Check closing the socket doesn't raise an exception.
-            Os.close(s);
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/nfc/Android.mk b/proprietary/frameworks/base/tests/nfc/Android.mk
deleted file mode 100755
index 7f163908ca02dc2c11f2680c7643950d5d69b665..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/nfc/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-# Include all test java files.
-LOCAL_SRC_FILES := \
-	$(call all-java-files-under, src)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_PACKAGE_NAME := MediaTekNfcTestCases
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/frameworks/base/tests/nfc/Android.mk_ b/proprietary/frameworks/base/tests/nfc/Android.mk_
deleted file mode 100755
index 7f163908ca02dc2c11f2680c7643950d5d69b665..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/nfc/Android.mk_
+++ /dev/null
@@ -1,17 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-# Include all test java files.
-LOCAL_SRC_FILES := \
-	$(call all-java-files-under, src)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_PACKAGE_NAME := MediaTekNfcTestCases
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/frameworks/base/tests/nfc/AndroidManifest.xml b/proprietary/frameworks/base/tests/nfc/AndroidManifest.xml
deleted file mode 100755
index 0fb1ae0d9c95ad94ab9d3a9231d87f0951074938..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/nfc/AndroidManifest.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.mediatek.nfc.tests" >
-
-    <uses-permission android:name="android.permission.NFC" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-
-    <application >
-        <uses-library android:name="android.test.runner" />
-        <activity android:name="com.mediatek.nfc.tests.NfcTestActivity"
-            android:theme="@*android:style/Theme.Translucent.NoTitleBar"
-            android:excludeFromRecents="true"
-            android:noHistory="true"/>
-
-    </application>
-    <instrumentation android:name="com.mediatek.nfc.tests.NfcTestRunner"
-                            android:targetPackage="com.mediatek.nfc.tests"
-                            android:label="Nfc Tests" />
-
-</manifest>
diff --git a/proprietary/frameworks/base/tests/nfc/NOTICE b/proprietary/frameworks/base/tests/nfc/NOTICE
deleted file mode 100755
index 4637a4c4429745a16e84567299dc414019efdd4d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/nfc/NOTICE
+++ /dev/null
@@ -1,34 +0,0 @@
-* Copyright (C) 2012 The Android Open Source Project:
-
-
-
-* Copyright (C) 2008 The Android Open Source Project:
-
-
-
-* Copyright (C) 2013 The Android Open Source Project:
-
-
-
-* Copyright (C) 2009 The Android Open Source Project:
-
-
-
-/*
-* Copyright (C) 2011-2014 MediaTek Inc.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-:
- 
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/nfc/README b/proprietary/frameworks/base/tests/nfc/README
deleted file mode 100755
index d33c21fba709b23fb37dfb40150d209487451245..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/nfc/README
+++ /dev/null
@@ -1,20 +0,0 @@
-WHAT IT DOES?
-=============
-This is a nfc auto test APK
-The purpose of this apk is to test nfc functionality
-The RD should be able to verify nfc issues easily by using this program. 
-
-
-HOW IT WAS BUILT?
-==================
-
-
-[Build Method]
-
-mmm vendor/mediatek/proprietary/frameworks/base/tests/nfc
-
-HOW TO USE IT?
-==============
-install -r MediaTekNfcTestCases.apk
-adb shell pm list instrumentation
-adb shell am instrument -w com.mediatek.nfc.tests/com.mediatek.nfc.tests.NfcTestRunner
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/nfc/src/com/mediatek/nfc/tests/NfcApiTest.java b/proprietary/frameworks/base/tests/nfc/src/com/mediatek/nfc/tests/NfcApiTest.java
deleted file mode 100755
index a2707e18165098c6d7a952a7edb6434b4fe1b67e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/nfc/src/com/mediatek/nfc/tests/NfcApiTest.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.nfc.tests;
-
-import android.nfc.NfcAdapter;
-import android.content.Context;
-import android.test.InstrumentationTestCase;
-import android.content.Intent;
-import java.util.concurrent.Semaphore;
-
-public class NfcApiTest extends InstrumentationTestCase {
-    private static final String TAG  = "NfcApiTest";
-    private boolean mHasNfcFeature = false;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        Context context = getInstrumentation().getContext();
-        NfcAdapter adapter = NfcAdapter.getDefaultAdapter(context);
-        mHasNfcFeature = adapter != null ? true : false;
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    public void testEnable() {
-        if (!mHasNfcFeature)
-            return;
-
-        Context context = getInstrumentation().getContext();
-        NfcAdapter adapter = NfcAdapter.getDefaultAdapter(context);
-        assertNotNull(adapter);
-        adapter.isEnabled();
-    }
-
-    static final int setNdefPushMessage = 1;
-    static final int setNdefPushMessageCallback = 2;
-    static final int setOnNdefPushCompleteCallback = 3;
-    static final int enableForegroundDispatch = 4;
-    static final int disableForegroundDispatch = 5;
-
-    static private Semaphore mSem = new Semaphore(0);
-    static private boolean mIsOk = false;
-
-    static public boolean waitForResult() {
-        try {
-            mSem.acquire();
-        } catch (InterruptedException e) {
-            return false;
-        }
-        return mIsOk;
-    }
-
-    static public void onTestFinished(boolean isOk) {
-        mIsOk = isOk;
-        mSem.release();
-    }
-
-    private void launchTestCase(int id) {
-        if (!mHasNfcFeature)
-            return;
-        Context context = getInstrumentation().getContext();
-        Intent i = new Intent(context, NfcTestActivity.class);
-        i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        i.putExtra("NfcTestCase", id);
-        context.startActivity(i);
-    }
-
-    public void testSetNdefPushMessage() {
-        if (!mHasNfcFeature)
-            return;
-        launchTestCase(NfcApiTest.setNdefPushMessage);
-        if (!waitForResult())
-            assertNotNull(null);
-    }
-
-    public void testSetNdefPushMessageCallback() {
-        if (!mHasNfcFeature)
-            return;
-        launchTestCase(NfcApiTest.setNdefPushMessageCallback);
-        if (!waitForResult())
-            assertNotNull(null);
-    }
-
-    public void testSetOnNdefPushCompleteCallback() {
-        if (!mHasNfcFeature)
-            return;
-        launchTestCase(NfcApiTest.setOnNdefPushCompleteCallback);
-        if (!waitForResult())
-            assertNotNull(null);
-    }
-
-    public void testEnableForegroundDispatch() {
-        if (!mHasNfcFeature)
-            return;
-        launchTestCase(NfcApiTest.enableForegroundDispatch);
-        if (!waitForResult())
-            assertNotNull(null);
-    }
-
-    public void testDisableForegroundDispatch() {
-        if (!mHasNfcFeature)
-            return;
-        launchTestCase(NfcApiTest.disableForegroundDispatch);
-        if (!waitForResult())
-            assertNotNull(null);
-    }
-
-}
-
diff --git a/proprietary/frameworks/base/tests/nfc/src/com/mediatek/nfc/tests/NfcTestActivity.java b/proprietary/frameworks/base/tests/nfc/src/com/mediatek/nfc/tests/NfcTestActivity.java
deleted file mode 100755
index 15cf8504110dcde18a73e7a2d2f2887a4da660e3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/nfc/src/com/mediatek/nfc/tests/NfcTestActivity.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.nfc.tests;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.nfc.NfcAdapter;
-import android.nfc.NfcEvent;
-import android.nfc.NdefRecord;
-import android.nfc.NdefMessage;
-import java.nio.charset.Charset;
-import android.nfc.tech.NfcF;
-import android.app.PendingIntent;
-import android.content.IntentFilter;
-import android.content.IntentFilter.MalformedMimeTypeException;
-
-public class NfcTestActivity extends Activity
-    implements NfcAdapter.CreateNdefMessageCallback, NfcAdapter.OnNdefPushCompleteCallback {
-
-    static final String EXTRA_LAUNCH_INTENT = "launchIntent";
-
-    private NdefRecord createMimeRecord(String mimeType, byte[] payload) {
-        byte[] mimeBytes = mimeType.getBytes(Charset.forName("US-ASCII"));
-        NdefRecord mimeRecord = new NdefRecord(NdefRecord.TNF_MIME_MEDIA,
-                                                                  mimeBytes,
-                                                                  new byte[0],
-                                                                  payload);
-        return mimeRecord;
-    }
-
-    private NdefMessage createTestNdefMessage() {
-        String text = ("Beam me up, Android!\n\n" + "Beam Time: " + System.currentTimeMillis());
-        NdefMessage msg = new NdefMessage(new NdefRecord[]
-            { createMimeRecord("application/com.example.android.beam", text.getBytes()) });
-        return msg;
-    }
-
-    @Override
-    public NdefMessage createNdefMessage(NfcEvent e) {
-        return createTestNdefMessage();
-    }
-
-    @Override
-    public void onNdefPushComplete(NfcEvent e) {
-        return;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        int testCase = getIntent().getIntExtra("NfcTestCase", -1);
-        NfcAdapter adapter = NfcAdapter.getDefaultAdapter(this);
-        if (adapter == null)
-            testCase = -1;
-
-        switch (testCase) {
-            case NfcApiTest.setNdefPushMessage:
-                NdefMessage msg = createTestNdefMessage();
-                adapter.setNdefPushMessage(msg, this);
-                NfcApiTest.onTestFinished(true);
-                break;
-            case NfcApiTest.setNdefPushMessageCallback:
-                adapter.setNdefPushMessageCallback(this, this);
-                NfcApiTest.onTestFinished(true);
-                break;
-            case NfcApiTest.setOnNdefPushCompleteCallback:
-                adapter.setOnNdefPushCompleteCallback(this, this);
-                NfcApiTest.onTestFinished(true);
-                break;
-            case NfcApiTest.enableForegroundDispatch:
-                PendingIntent pendingIntent = PendingIntent.getActivity(this, 0,
-                    new Intent(this, getClass()).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), 0);
-                IntentFilter ndef = new IntentFilter(NfcAdapter.ACTION_NDEF_DISCOVERED);
-                try {
-                    ndef.addDataType("*/*");
-                } catch (MalformedMimeTypeException e) {
-                    throw new RuntimeException("fail", e);
-                }
-                IntentFilter[] filters = new IntentFilter[] { ndef, };
-                String[][] techLists = new String[][] { new String[] { NfcF.class.getName()}};
-                try {
-                    adapter.enableForegroundDispatch(this, pendingIntent, filters, techLists);
-                } catch (IllegalStateException e) {
-                    // only allowed to be called when onResume state,
-                    // currently bypass this exception
-                }
-                NfcApiTest.onTestFinished(true);
-                break;
-            case NfcApiTest.disableForegroundDispatch:
-                try {
-                    adapter.disableForegroundDispatch(this);
-                } catch (IllegalStateException e) {
-                    // only allowed to be called when onResume state,
-                    // currently bypass this exception
-                }
-                NfcApiTest.onTestFinished(true);
-                break;
-            default:
-                break;
-        }
-
-        finish();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/nfc/src/com/mediatek/nfc/tests/NfcTestRunner.java b/proprietary/frameworks/base/tests/nfc/src/com/mediatek/nfc/tests/NfcTestRunner.java
deleted file mode 100755
index dd1891fdaf7a3c05669fea65e7637587a1d659d6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/nfc/src/com/mediatek/nfc/tests/NfcTestRunner.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.nfc.tests;
-
-import junit.framework.TestSuite;
-
-import android.os.Bundle;
-import android.test.InstrumentationTestRunner;
-import android.test.InstrumentationTestSuite;
-import android.util.Log;
-
- /**
- adb shell am instrument \
- *     [-e enable_iterations <iterations>] <-- example for input parameters
- *     -w com.mediatek.nfc.tests/.NfcTestRunner
- *                          ^^^^^^                   ^^^^^^^^^^^^^^^^^^^ <-- change to nfc related
- */
-
-public class NfcTestRunner extends InstrumentationTestRunner {
-    private static final String TAG = "NfcTestRunner";
-    @Override
-    public TestSuite getAllTests() {
-        TestSuite suite = new InstrumentationTestSuite(this);
-        suite.addTestSuite(NfcApiTest.class);
-        return suite;
-    }
-
-    @Override
-    public ClassLoader getLoader() {
-        return NfcTestRunner.class.getClassLoader();
-    }
-
-    @Override
-    public void onCreate(Bundle arguments) {
-        Log.d(TAG, String.format("NfcTestRunner onCreate() is called"));
-        super.onCreate(arguments);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/Android.mk b/proprietary/frameworks/base/tests/resources/Android.mk
deleted file mode 100755
index 0548edc1c6ca4ac8c720083df12425bd85bc51e0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/Android.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)\
-              $(call all-java-files-under, core/runner/src)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-#LOCAL_JNI_SHARED_LIBRARIES := libcts_jni
-
-# Resource unit tests use a private locale and some densities
-LOCAL_AAPT_FLAGS = -c xx_YY -c cs -c small -c normal -c large -c xlarge \
-        -c 320dpi -c 240dpi -c 160dpi -c 32dpi \
-        -c mdpi -c hdpi -c xhdpi -c xxhdpi \
-        -c kok,kok_IN,kok_419,kok_419_VARIANT,kok_Knda_419,kok_Knda_419_VARIANT,kok_VARIANT,kok_Knda,tgl,tgl_PH
-
-LOCAL_PACKAGE_NAME := MediaTekResourceTestStubs
-
-LOCAL_DEX_PREOPT := false
-
-include $(BUILD_PACKAGE)
-
-# Build the test APK using its own makefile, and any other CTS-related packages
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/frameworks/base/tests/resources/Android.mk_ b/proprietary/frameworks/base/tests/resources/Android.mk_
deleted file mode 100755
index 0548edc1c6ca4ac8c720083df12425bd85bc51e0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/Android.mk_
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)\
-              $(call all-java-files-under, core/runner/src)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-#LOCAL_JNI_SHARED_LIBRARIES := libcts_jni
-
-# Resource unit tests use a private locale and some densities
-LOCAL_AAPT_FLAGS = -c xx_YY -c cs -c small -c normal -c large -c xlarge \
-        -c 320dpi -c 240dpi -c 160dpi -c 32dpi \
-        -c mdpi -c hdpi -c xhdpi -c xxhdpi \
-        -c kok,kok_IN,kok_419,kok_419_VARIANT,kok_Knda_419,kok_Knda_419_VARIANT,kok_VARIANT,kok_Knda,tgl,tgl_PH
-
-LOCAL_PACKAGE_NAME := MediaTekResourceTestStubs
-
-LOCAL_DEX_PREOPT := false
-
-include $(BUILD_PACKAGE)
-
-# Build the test APK using its own makefile, and any other CTS-related packages
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/frameworks/base/tests/resources/AndroidManifest.xml b/proprietary/frameworks/base/tests/resources/AndroidManifest.xml
deleted file mode 100755
index 29e9b7d1750f7c8b51ad2e3984a6059b46f7b474..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/AndroidManifest.xml
+++ /dev/null
@@ -1,1055 +0,0 @@
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mediatek.cts.resource.stub">
-
-    <permission android:name="android.app.cts.permission.TEST_GRANTED"
-        android:protectionLevel="normal"
-            android:label="@string/permlab_testGranted"
-            android:description="@string/permdesc_testGranted">
-        <meta-data android:name="android.app.cts.string" android:value="foo" />
-        <meta-data android:name="android.app.cts.boolean" android:value="true" />
-        <meta-data android:name="android.app.cts.integer" android:value="100" />
-        <meta-data android:name="android.app.cts.color" android:value="#ff000000" />
-        <meta-data android:name="android.app.cts.float" android:value="100.1" />
-        <meta-data android:name="android.app.cts.reference" android:resource="@xml/metadata" />
-    </permission>
-
-    <uses-permission android:name="android.permission.GET_TASKS" />
-    <uses-permission android:name="android.permission.SET_WALLPAPER" />
-    <uses-permission android:name="android.permission.SET_TIME_ZONE" />
-    <uses-permission android:name="android.permission.WRITE_CALL_LOG" />
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
-    <uses-permission android:name="android.permission.WRITE_SOCIAL_STREAM" />
-    <uses-permission android:name="android.permission.READ_CALL_LOG" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.READ_SOCIAL_STREAM" />
-    <uses-permission android:name="android.permission.WRITE_CALENDAR" />
-    <uses-permission android:name="android.permission.READ_CALENDAR" />
-    <uses-permission android:name="android.permission.DEVICE_POWER" />
-    <uses-permission android:name="android.permission.STATUS_BAR" />
-    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.PERSISTENT_ACTIVITY" />
-    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
-    <uses-permission android:name="android.permission.INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_OWNER_DATA" />
-    <uses-permission android:name="android.permission.READ_OWNER_DATA" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.DELETE_CACHE_FILES" />
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
-    <uses-permission android:name="android.permission.ADD_SYSTEM_SERVICE" />
-    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-    <uses-permission android:name="android.app.cts.permission.TEST_GRANTED" />
-    <uses-permission android:name="android.permission.INJECT_EVENTS" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.CALL_PHONE" />
-    <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.DUMP" />
-    <uses-permission android:name="android.permission.NFC" />
-    <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
-    <uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-
-    <!-- Used for PackageManager test, don't delete this INTERNET permission -->
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.SET_PREFERRED_APPLICATIONS" />
-    <uses-permission android:name="android.permission.INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.GET_PACKAGE_SIZE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.SEND_SMS" />
-    <uses-permission android:name="android.permission.RECEIVE_SMS" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS" />
-    <uses-permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS" />
-    <uses-permission android:name="android.permission.WRITE_USER_DICTIONARY" />
-    <uses-permission android:name="android.permission.READ_USER_DICTIONARY" />
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_LOGS" />
-
-    <!-- telephony provider tests -->
-    <uses-permission android:name="android.permission.READ_SMS"/>
-    <uses-permission android:name="android.permission.WRITE_SMS"/>
-
-    <!-- content sync tests -->
-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.READ_SYNC_STATS" />
-
-    <!-- Used for ClonedSecureRandomTest -->
-    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
-
-    <!-- Used for Transmit IR Test -->
-    <uses-permission android:name="android.permission.TRANSMIT_IR" />
-
-    <!-- Used for SystemFeatures Test -->
-    <uses-permission android:name="android.permission.BODY_SENSORS"/>
-
-    <!-- Used for PackageManager test, don't delete this permission-tree -->
-    <permission-tree android:name="com.android.cts.stub.permission.TEST_DYNAMIC"
-                    android:label="Test Tree"/>
-
-    <!-- Used for PackageManager test, don't delete this permission-group -->
-    <permission-group android:name="android.permission-group.COST_MONEY"/>
-    <!-- Used for PackageManager test, don't delete! -->
-    <uses-configuration/>
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:glEsVersion="0x00020000" />
-    <feature-group/>
-    <feature-group>
-        <uses-feature android:glEsVersion="0x00030000" />
-        <uses-feature android:name="android.hardware.location" />
-    </feature-group>
-    <feature-group>
-        <uses-feature android:glEsVersion="0x00010001" />
-        <uses-feature android:name="android.hardware.camera" />
-    </feature-group>
-
-    <!-- maxRecents=1 keeps the recents list from filling memory with thumbnails -->
-    <application android:label="Android TestCase"
-                android:icon="@drawable/size_48x48"
-                android:maxRecents="1"
-                android:multiArch="true"
-                android:name="android.app.cts.MockApplication"
-                android:supportsRtl="true">
-
-        <activity android:name="android.app.cts.ActionBarActivity" />
-        <activity android:name="android.widget.cts.TwoLineListItemStubActivity"
-            android:label="TwoLineListItemStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.view.cts.ViewStubStubActivity"
-            android:label="ViewStubStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.ViewFlipperStubActivity"
-            android:label="ViewFlipperStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.app.cts.DialogStubActivity"
-            android:label="DialogStubActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.HorizontalScrollViewStubActivity"
-            android:label="HorizontalScrollViewStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.SlidingDrawerStubActivity"
-            android:label="SlidingDrawerStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.view.cts.UsingViewsStubActivity"
-            android:label="Using Views Test">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        <activity android:name="android.view.cts.FocusHandlingStubActivity"
-            android:label="Focus Handling Test">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        <activity android:name="android.app.cts.MockActivity" android:label="MockActivity">
-            <meta-data android:name="android.app.alias"
-                android:resource="@xml/alias" />
-            <meta-data android:name="android.app.intent.filter"
-                android:resource="@xml/intentfilter" />
-            <meta-data android:name="android.widget.layout"
-                android:resource="@xml/layout" />
-            <meta-data android:name="android.view.merge"
-                android:resource="@xml/merge" />
-        </activity>
-
-        <activity android:name="android.widget.cts.DigitalClockStubActivity"
-            android:label="DigitalClockStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.ImageViewStubActivity"
-            android:label="ImageViewStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.SeekBarStubActivity"
-            android:label="SeekBarStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.ScrollViewStubActivity"
-            android:label="ScrollViewStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.FrameLayoutStubActivity"
-            android:label="FrameLayoutStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.LinearLayoutStubActivity"
-            android:label="LinearLayoutStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.GridLayoutStubActivity"
-            android:label="GridLayoutStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.LayoutDirectionStubActivity"
-            android:label="LayoutDirectionStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.ProgressBarStubActivity"
-            android:label="ProgressBarStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.ChronometerStubActivity"
-            android:label="ChronometerStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.MediaControllerStubActivity"
-            android:label="MediaControllerStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.RatingBarStubActivity"
-            android:label="RatingBarStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.RemoteViewsStubActivity"
-            android:label="RemoteViewsStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.view.cts.ViewGroupStubActivity" android:label="ViewGroupStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        <activity android:name="android.view.cts.ViewTestStubActivity"
-            android:label="ViewTestStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        <activity android:name="android.view.cts.ViewLayoutPositionTestStubActivity"
-            android:label="ViewTestStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.view.cts.WindowStubActivity"
-            android:theme="@android:style/Theme.Holo.NoActionBar"
-            android:label="WindowStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.ViewGroupStubActivity"
-            android:label="WidgetViewGroupStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.VideoViewStubActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize">
-            android:label="VideoViewStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.AutoCompleteStubActivity"
-            android:label="AutoCompleteStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.ViewAnimatorStubActivity" android:label="ViewAnimatorStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.GridViewStubActivity"
-            android:label="GridViewStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.RelativeLayoutStubActivity"
-            android:label="RelativeLayoutStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.FrameLayoutStubActivity"
-            android:label="FrameLayoutStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <service android:name="android.content.cts.MockContextWrapperService" />
-        <activity android:name=".content.ContextWrapperStubActivity"
-            android:label="ContextWrapperStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-        </activity>
-
-        <receiver android:name="android.content.cts.MockReceiverFirst">
-            <intent-filter android:priority="3">
-                <action android:name="android.content.cts.BroadcastReceiverTest.BROADCAST_TESTABORT" />
-            </intent-filter>
-        </receiver>
-        <receiver android:name="android.content.cts.MockReceiverAbort">
-            <intent-filter android:priority="2">
-                <action android:name="android.content.cts.BroadcastReceiverTest.BROADCAST_TESTABORT" />
-            </intent-filter>
-        </receiver>
-        <receiver android:name="android.content.cts.MockReceiver">
-            <intent-filter android:priority="1">
-                <action android:name="android.content.cts.BroadcastReceiverTest.BROADCAST_MOCKTEST" />
-                <action android:name="android.content.cts.BroadcastReceiverTest.BROADCAST_TESTABORT" />
-                <action android:name="android.content.cts.ContextWrapperTest.BROADCAST_TESTORDER" />
-            </intent-filter>
-        </receiver>
-
-        <activity android:name="android.provider.cts.BrowserStubActivity"
-            android:label="BrowserStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.content.cts.AvailableIntentsActivity"
-            android:label="AvailableIntentsActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.text.cts.EmojiStubActivity"
-            android:label="AvailableIntentsActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.TableStubActivity"
-            android:label="TableStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.TabHostStubActivity"
-            android:label="TabHostStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.view.animation.cts.AnimationTestStubActivity"
-            android:label="AnimationTestStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.view.animation.cts.GridLayoutAnimStubActivity"
-            android:label="GridLayoutAnimStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.view.animation.cts.LayoutAnimStubActivity"
-            android:label="LayoutAnimStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.webkit.cts.CookieSyncManagerStubActivity"
-            android:label="CookieSyncManagerStubActivity"
-            android:screenOrientation="nosensor">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.ExpandableListSimple"
-            android:label="ExpandableListSimple">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.StubActivity"
-            android:label="StubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.ExpandableListWithHeaders"
-            android:label="ExpandableListWithHeaders">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.GalleryStubActivity"
-            android:label="GalleryStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.MockPopupWindowStubActivity"
-            android:label="MockPopupWindowStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.ListViewStubActivity"
-            android:label="ListViewStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.TextViewStubActivity"
-            android:label="TextViewStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.DialerFilterStubActivity"
-            android:label="DialerFilterStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        <activity android:name="android.widget.cts.MultiAutoCompleteTextViewStubActivity"
-            android:label="MultiAutoCompleteTextView Test Activity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.AdapterViewStubActivity"
-            android:label="AdapterViewStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.CheckedTextViewStubActivity"
-            android:label="CheckedTextViewStubActivity"/>
-
-        <activity android:name="android.hardware.cts.CameraStubActivity"
-            android:label="CameraStubActivity"
-            android:screenOrientation="landscape"
-            android:configChanges="keyboardHidden|orientation|screenSize">
-        </activity>
-
-        <activity android:name="android.hardware.camera2.cts.Camera2SurfaceViewStubActivity"
-            android:label="Camera2StubActivity"
-            android:screenOrientation="landscape"
-            android:configChanges="keyboardHidden|orientation|screenSize">
-        </activity>
-
-        <activity android:name="android.hardware.camera2.cts.Camera2MultiViewStubActivity"
-            android:label="Camera2MultiViewStubActivity"
-            android:screenOrientation="landscape"
-            android:configChanges="keyboardHidden|orientation|screenSize">
-        </activity>
-
-        <activity android:name="android.view.inputmethod.cts.InputMethodStubActivity"
-            android:label="InputMethodStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        <service android:name="android.view.inputmethod.cts.InputMethodInfoStub"
-            android:label="InputMethodInfoStub">
-            <intent-filter>
-                <action android:name="android.view.InputMethod" />
-            </intent-filter>
-            <meta-data android:name="android.view.im"
-                android:resource="@xml/method" />
-        </service>
-
-        <activity android:name="android.view.cts.MenuInflaterStubActivity"
-                                        android:label="MenuInflaterStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.text.method.cts.KeyListenerStubActivity"
-            android:label="KeyListenerStubActivity"/>
-
-        <activity android:name="android.text.method.cts.StubActivity"
-            android:label="StubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.text.style.cts.URLSpanStubActivity"
-            android:label="URLSpanStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.text.style.cts.MockURLSpanTestActivity"
-            android:label="MockURLSpanTestActivity"
-            android:launchMode="singleTask"
-            android:alwaysRetainTaskState="true"
-            android:configChanges="orientation|keyboardHidden">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-                <data android:scheme="ctstest" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.widget.cts.ZoomButtonStubActivity"
-            android:label="ZoomButtonStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.view.cts.SurfaceViewStubActivity"
-            android:label="SurfaceViewStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.app.cts.MockApplicationActivity"
-            android:label="MockApplicationActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.app.cts.InstrumentationTestActivity"
-                  android:theme="@style/Theme_NoSwipeDismiss"
-                  android:label="InstrumentationTestActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.dir/person" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.app.cts.AliasActivityStub">
-            <meta-data android:name="android.app.alias"
-                android:resource="@xml/alias" />
-        </activity>
-
-        <activity android:name="android.webkit.cts.WebViewStubActivity"
-            android:label="WebViewStubActivity"
-            android:screenOrientation="nosensor">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.webkit.cts.WebViewStartupStubActivity"
-            android:label="WebViewStartupStubActivity"
-            android:screenOrientation="nosensor">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.app.cts.ChildActivity"
-                        android:label="ChildActivity" />
-
-        <receiver android:name="android.app.cts.MockReceiver">
-            <intent-filter>
-                <action android:name="android.app.cts.PendingIntentTest.TEST_RECEIVER" />
-            </intent-filter>
-        </receiver>
-
-        <service android:name="android.app.cts.MockService" />
-
-        <activity android:name="android.app.cts.SearchManagerStubActivity"
-                android:label="SearchManagerStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <meta-data android:name="android.app.searchable" android:resource="@xml/searchable" />
-        </activity>
-
-        <service android:name="android.app.cts.LocalService">
-            <intent-filter>
-                <action android:name="android.app.cts.activity.SERVICE_LOCAL" />
-            </intent-filter>
-            <meta-data android:name="android.app.cts.string" android:value="foo" />
-            <meta-data android:name="android.app.cts.boolean" android:value="true" />
-            <meta-data android:name="android.app.cts.integer" android:value="100" />
-            <meta-data android:name="android.app.cts.color" android:value="#ff000000" />
-            <meta-data android:name="android.app.cts.float" android:value="100.1" />
-            <meta-data android:name="android.app.cts.reference" android:resource="@xml/metadata" />
-        </service>
-
-        <service android:name="android.app.cts.LocalGrantedService"
-             android:permission="android.app.cts.permission.TEST_GRANTED">
-            <intent-filter>
-                <action android:name="android.app.cts.activity.SERVICE_LOCAL_GRANTED" />
-            </intent-filter>
-        </service>
-
-        <service android:name="android.app.cts.LocalDeniedService"
-               android:permission="android.app.cts.permission.TEST_DENIED">
-            <intent-filter>
-                <action android:name="android.app.cts.activity.SERVICE_LOCAL_DENIED" />
-            </intent-filter>
-        </service>
-
-        <activity android:name="android.app.cts.TestedScreen"
-                android:process=":remoteScreen">
-        </activity>
-        <activity android:name="android.app.cts.LocalScreen" android:multiprocess="true">
-        </activity>
-        <activity android:name="android.app.cts.ClearTop" android:multiprocess="true"
-               android:launchMode="singleTop">
-        </activity>
-        <activity android:name="android.app.cts.LocalDialog" android:multiprocess="true"
-               android:theme="@android:style/Theme.Dialog">
-        </activity>
-
-        <activity android:name="android.app.cts.PendingIntentStubActivity"
-             android:label="PendingIntentStubActivity"/>
-
-        <activity android:name="android.app.cts.LocalActivityManagerStubActivity"
-                        android:label="LocalActivityManagerStubActivity" />
-
-        <activity android:name="android.app.cts.LocalActivityManagerTestHelper"
-            android:label="LocalActivityManagerTestHelper" />
-
-        <activity android:name="android.app.cts.LaunchpadTabActivity" android:multiprocess="true">
-        </activity>
-
-        <activity android:name="android.app.cts.LocalActivity" android:multiprocess="true">
-            <meta-data android:name="android.app.cts.string" android:value="foo" />
-            <meta-data android:name="android.app.cts.boolean" android:value="true" />
-            <meta-data android:name="android.app.cts.integer" android:value="100" />
-            <meta-data android:name="android.app.cts.color" android:value="#ff000000" />
-            <meta-data android:name="android.app.cts.float" android:value="100.1" />
-            <meta-data android:name="android.app.cts.reference" android:resource="@xml/metadata" />
-        </activity>
-
-        <activity android:name="android.app.cts.TestedActivity"
-                android:process=":remoteActivity">
-        </activity>
-
-        <activity android:name="android.app.cts.ExpandableListTestActivity"
-            android:label="ExpandableListTestActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.view.cts.FocusFinderStubActivity"
-            android:label="FocusFinderStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.view.cts.GestureDetectorStubActivity"
-            android:label="GestureDetectorStubActivity"
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
-
-        <!--Test for PackageManager-->
-        <activity android:name="android.content.pm.cts.TestPmActivity"
-                android:icon="@drawable/start">
-            <intent-filter>
-                <action android:name="android.intent.action.PMTEST" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-            <meta-data android:name="android.content.pm.cts.xmltest" android:resource="@xml/pm_test" />
-        </activity>
-        <activity android:name="android.content.pm.cts.TestPmCompare">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.INFO" />
-            </intent-filter>
-        </activity>
-        <!--Test for PackageManager-->
-        <service android:name="android.content.pm.cts.TestPmService">
-            <intent-filter>
-                <action android:name="android.content.pm.cts.activity.PMTEST_SERVICE" />
-            </intent-filter>
-        </service>
-        <!--Test for PackageManager-->
-        <receiver android:name="android.content.pm.cts.PmTestReceiver">
-            <intent-filter>
-                <action android:name="android.content.pm.cts.PackageManagerTest.PMTEST_RECEIVER" />
-            </intent-filter>
-        </receiver>
-
-        <!-- Used for PackageManager test, don't delete this MockContentProvider provider -->
-        <provider android:name="android.content.cts.MockContentProvider" android:authorities="ctstest"
-            android:multiprocess="false" />
-        <provider android:name="android.content.cts.DummyProvider"
-            android:authorities="android.content.cts.dummyprovider"
-            android:multiprocess="true" />
-        <provider android:name="android.content.cts.MockRemoteContentProvider"
-            android:authorities="remotectstest"
-            android:process=":remoteprovider" android:multiprocess="false" />
-
-        <activity android:name="android.app.cts.ChildTabActivity" android:label="ChildTabActivity" />
-
-        <activity android:name="android.app.cts.LauncherActivityStub"
-                  android:label="LauncherActivityStub" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.app.cts.MockTabActivity" android:label="MockTabActivity" />
-
-        <activity android:name="android.app.cts.AppStubActivity" android:label="AppStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.app.cts.DialogStubActivity"
-                  android:theme="@style/Theme_NoSwipeDismiss"
-                  android:label="DialogStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.app.cts.ActivityManagerStubFooActivity"
-            android:label="ActivityManagerStubFooActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.app.cts.ActivityManagerRecentOneActivity"
-            android:label="ActivityManagerRecentOneActivity"
-            android:allowTaskReparenting="true"
-            android:taskAffinity="android.app.cts.recentOne">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.app.cts.ActivityManagerRecentTwoActivity"
-            android:label="ActivityManagerRecentTwoActivity"
-            android:allowTaskReparenting="true"
-            android:taskAffinity="android.app.cts.recentTwo">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.app.cts.ActivityManagerStubCrashActivity"
-            android:label="ActivityManagerStubCrashActivity"
-            android:multiprocess="true"
-            android:process=":ActivityManagerStubCrashActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.text.method.cts.StubActivity"
-            android:label="StubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <service android:name="android.app.cts.StubRemoteService"
-            android:process=":remote">
-            <intent-filter>
-                <action
-                    android:name="android.app.cts.ISecondary" />
-                <action
-                    android:name="android.app.REMOTESERVICE" />
-            </intent-filter>
-        </service>
-
-        <activity android:name="android.app.ActivityGroup"
-            android:label="ActivityGroup" />
-
-        <activity android:name="android.app.cts.KeyguardManagerActivity"
-            android:label="KeyguardManagerActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.os.cts.CountDownTimerTestStub"
-            android:label="CountDownTimerTestStub">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <service android:name="android.os.cts.EmptyService"
-            android:process=":remote">
-            <intent-filter>
-                <action
-                    android:name="android.os.cts.IEmptyService" />
-                <action
-                    android:name="android.os.REMOTESERVICE" />
-            </intent-filter>
-        </service>
-
-        <service android:name="android.os.cts.MessengerService"
-                android:process=":messengerService">
-        </service>
-        <service android:name="android.app.cts.IntentServiceStub"/>
-
-        <activity android:name="android.app.cts.LaunchpadActivity"
-                  android:configChanges="keyboardHidden|orientation|screenSize"
-                  android:multiprocess="true">
-        </activity>
-
-        <service android:name="android.content.cts.MockSyncAdapterService" android:exported="true">
-            <intent-filter>
-                <action android:name="android.content.SyncAdapter" />
-            </intent-filter>
-
-            <meta-data android:name="android.content.SyncAdapter"
-                       android:resource="@xml/syncadapter" />
-        </service>
-
-        <service android:name="android.content.cts.MockAccountService" android:exported="true"
-                 >
-            <intent-filter>
-                <action android:name="android.accounts.AccountAuthenticator" />
-            </intent-filter>
-
-            <meta-data android:name="android.accounts.AccountAuthenticator"
-                       android:resource="@xml/authenticator" />
-        </service>
-
-        <activity android:name="android.opengl.cts.GLSurfaceViewStubActivity"
-                  android:label="GLSurfaceViewStub"/>
-
-        <activity android:name="android.opengl.cts.OpenGlEsVersionStubActivity"/>
-
-        <activity android:name="android.opengl.cts.EglConfigStubActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize|uiMode" />
-
-        <activity android:name="android.opengl.cts.CompressedTextureStubActivity"
-            android:label="CompressedTextureStubActivity"
-            android:screenOrientation="nosensor">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.content.cts.ClipboardManagerListenerActivity"/>
-
-        <activity android:name="android.app.cts.ActivityManagerMemoryClassLaunchActivity" />
-
-        <activity android:name="android.app.cts.ActivityManagerMemoryClassTestActivity"
-                android:process=":memoryclass" />
-
-        <service android:name="android.speech.tts.cts.StubTextToSpeechService">
-            <intent-filter>
-                <action android:name="android.intent.action.TTS_SERVICE" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </service>
-
-        <activity android:name="android.renderscriptgraphics.cts.RenderscriptGLStubActivity"
-                  android:label="RenderscriptGLStub"/>
-
-        <service android:name="android.security.cts.activity.SecureRandomService"
-                 android:process=":secureRandom"/>
-    </application>
-
-
-    <!--Test for PackageManager, please put this at the very beginning-->
-    <instrumentation android:name="android.content.pm.cts.TestPmInstrumentation"
-        android:targetPackage="android"
-        android:label="PackageManager Instrumentation Test" />
-
-</manifest>
-
diff --git a/proprietary/frameworks/base/tests/resources/NOTICE b/proprietary/frameworks/base/tests/resources/NOTICE
deleted file mode 100755
index a31a940b7fc5907dd049c0a66f52f1f55fa52dbc..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/NOTICE
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project:
-<!-- Copyright (C) 2013 The Android Open Source Project:
-<!-- Copyright (C) 2008 The Android Open Source Project:
-* Copyright (C) 2008 The Android Open Source Project:
-* Copyright (C) 2009 The Android Open Source Project:
-<!-- Copyright (C) 2007 The Android Open Source Project:
-* Copyright (C) 2008 The Android Open Source Project.:
-<!-- Copyright (C) 2011 The Android Open Source Project:
-<!-- Copyright (C) 2010 The Android Open Source Project:
-* Copyright (C) 2012 The Android Open Source Project.:
-** Copyright 2008, The Android Open Source Project:
-* Copyright (C) 2008 Esmertec AG.:
-* Copyright (C) 2013 The Android Open Source Project:
-* Copyright (C) 2011 The Android Open Source Project:
-* Copyright (c) 2009, The Android Open Source Project:
-* Copyright (C) 2009 The Android Open Source Project.:
-* Copyright (C) 2010 The Android Open Source Project:
-* Copyright (C) 2012 The Android Open Source Project:
-
-
-
-/*
-* Copyright (C) 2011-2014 MediaTek Inc.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-:
- 
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/README b/proprietary/frameworks/base/tests/resources/README
deleted file mode 100755
index 0fd5560716e53aef8ed8477534dfd4b6b43fbb61..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/README
+++ /dev/null
@@ -1,22 +0,0 @@
-Test cases stubs for mediatek frameworks resources module
-
-WHAT IT DOES?
-=============
-MediaTekResourceTestStubs.apk is a test case stubs for resources
-test cases.
-
-It provide test stubs for MediaTekCtsResourceTestCases.apk
-
-The test cases are mostly come from Android CTS test cases
-
-HOW IT WAS BUILT?
-==================
-make 'vendor/mediatek/proprietary/frameworks/base/tests/resources/' folder to get
-test apk
-
-HOW TO USE IT?
-==============
-After build MediaTekResourceTestStubs.apk, install to phone with
-MediaTekCtsResourceTestCases.apk, and run command:
-'adb shell am instrument -w com.mediatek.cts.resource/android.test.InstrumentationTestRunner'
-to get result
diff --git a/proprietary/frameworks/base/tests/resources/assets/alter-footer.zip b/proprietary/frameworks/base/tests/resources/assets/alter-footer.zip
deleted file mode 100755
index f497ec000519e4b81802430b5098a9caa4cf2be3..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/assets/alter-footer.zip and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/assets/alter-metadata.zip b/proprietary/frameworks/base/tests/resources/assets/alter-metadata.zip
deleted file mode 100755
index 1c71fbc49e2e50444ea0d1136ad0ad878d6124b0..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/assets/alter-metadata.zip and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/assets/fake-eocd.zip b/proprietary/frameworks/base/tests/resources/assets/fake-eocd.zip
deleted file mode 100755
index 15dc0a9465f501add1f51ffa465a5efbdb1f4b7d..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/assets/fake-eocd.zip and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/assets/images/robot.png b/proprietary/frameworks/base/tests/resources/assets/images/robot.png
deleted file mode 100755
index 8a9e6984be96ea93dcb63ae1973e530bdfb1eda0..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/assets/images/robot.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/assets/images/tomato.png b/proprietary/frameworks/base/tests/resources/assets/images/tomato.png
deleted file mode 100755
index 44c590de018705fec49f9fe1d034681097b90e7f..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/assets/images/tomato.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/assets/jarsigned.zip b/proprietary/frameworks/base/tests/resources/assets/jarsigned.zip
deleted file mode 100755
index 8b1ef8bddb23751822eb3e6a2ddd5309310500d3..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/assets/jarsigned.zip and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/assets/noiseandchirps b/proprietary/frameworks/base/tests/resources/assets/noiseandchirps
deleted file mode 100755
index a819efcd86e325674711ad691b8c61ec5da697f4..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/assets/noiseandchirps and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/assets/noiseandchirps.mp3 b/proprietary/frameworks/base/tests/resources/assets/noiseandchirps.mp3
deleted file mode 100755
index a819efcd86e325674711ad691b8c61ec5da697f4..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/assets/noiseandchirps.mp3 and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/assets/noiseandchirps.ogg b/proprietary/frameworks/base/tests/resources/assets/noiseandchirps.ogg
deleted file mode 100755
index 1acb643decf10d3d96547f4f2dcaf547c114aa10..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/assets/noiseandchirps.ogg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/assets/noiseandchirps.wrong b/proprietary/frameworks/base/tests/resources/assets/noiseandchirps.wrong
deleted file mode 100755
index a819efcd86e325674711ad691b8c61ec5da697f4..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/assets/noiseandchirps.wrong and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/assets/otacerts.zip b/proprietary/frameworks/base/tests/resources/assets/otacerts.zip
deleted file mode 100755
index 937a128baf61ee1a6ae353e5e2cbc598c4a70cb1..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/assets/otacerts.zip and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/assets/otasigned.zip b/proprietary/frameworks/base/tests/resources/assets/otasigned.zip
deleted file mode 100755
index a6bc53e4127e5d23532c9614546f99c0b927d834..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/assets/otasigned.zip and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/assets/random.zip b/proprietary/frameworks/base/tests/resources/assets/random.zip
deleted file mode 100755
index 18c0b3b9f777fd9cb2505d93345c27bbddf7b038..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/assets/random.zip and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/assets/ringer.mp3 b/proprietary/frameworks/base/tests/resources/assets/ringer.mp3
deleted file mode 100755
index aa052e719712e56eae8e87f4b4a329f2090a0d9b..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/assets/ringer.mp3 and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/assets/samplefont.ttf b/proprietary/frameworks/base/tests/resources/assets/samplefont.ttf
deleted file mode 100755
index 49f1c620b548e3abd34cf3bd8f0fd73b86b0199e..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/assets/samplefont.ttf and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/assets/selinux_policy.xml b/proprietary/frameworks/base/tests/resources/assets/selinux_policy.xml
deleted file mode 100755
index f7e816afda872dc76a03835e7090f96fb9753abd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/selinux_policy.xml
+++ /dev/null
@@ -1,1733 +0,0 @@
-<?xml version="1.0" ?>
-<SELinux_AVC_Rules>
-    <avc_rule name="1" type="neverallow">
-        <type type="source">shell</type>
-        <type type="source">nfc</type>
-        <type type="source">platform_app</type>
-        <type type="source">bluetooth</type>
-        <type type="source">radio</type>
-        <type type="source">isolated_app</type>
-        <type type="source">untrusted_app</type>
-        <type type="source">media_app</type>
-        <type type="source">system_app</type>
-        <type type="source">release_app</type>
-        <type type="source">shared_app</type>
-        <type type="target">kernel</type>
-        <obj_class name="security">
-            <permission>load_policy</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="2" type="neverallow">
-        <type type="source">sdcardd</type>
-        <type type="source">init_shell</type>
-        <type type="source">adbd</type>
-        <type type="source">netd</type>
-        <type type="source">tee</type>
-        <type type="source">bluetooth</type>
-        <type type="source">lmkd</type>
-        <type type="source">surfaceflinger</type>
-        <type type="source">mdnsd</type>
-        <type type="source">radio</type>
-        <type type="source">hci_attach</type>
-        <type type="source">clatd</type>
-        <type type="source">watchdogd</type>
-        <type type="source">drmserver</type>
-        <type type="source">keystore</type>
-        <type type="source">runas</type>
-        <type type="source">servicemanager</type>
-        <type type="source">dhcp</type>
-        <type type="source">shell</type>
-        <type type="source">uncrypt</type>
-        <type type="source">untrusted_app</type>
-        <type type="source">gpsd</type>
-        <type type="source">isolated_app</type>
-        <type type="source">system_app</type>
-        <type type="source">wpa</type>
-        <type type="source">racoon</type>
-        <type type="source">nfc</type>
-        <type type="source">hostapd</type>
-        <type type="source">platform_app</type>
-        <type type="source">mtp</type>
-        <type type="source">inputflinger</type>
-        <type type="source">logd</type>
-        <type type="source">zygote</type>
-        <type type="source">rild</type>
-        <type type="source">dnsmasq</type>
-        <type type="source">healthd</type>
-        <type type="source">mediaserver</type>
-        <type type="source">bootanim</type>
-        <type type="source">ppp</type>
-        <type type="source">release_app</type>
-        <type type="source">shared_app</type>
-        <type type="target">audio_data_file</type>
-        <type type="target">sysfs_nfc_power_writable</type>
-        <type type="target">ion_device</type>
-        <type type="target">debuggerd</type>
-        <type type="target">netd</type>
-        <type type="target">system_server_tmpfs</type>
-        <type type="target">lmkd</type>
-        <type type="target">uhid_device</type>
-        <type type="target">init_shell</type>
-        <type type="target">radio</type>
-        <type type="target">zygote_socket</type>
-        <type type="target">system_wpa_socket</type>
-        <type type="target">sockfs</type>
-        <type type="target">selinuxfs</type>
-        <type type="target">dumpstate_socket</type>
-        <type type="target">untrusted_app_devpts</type>
-        <type type="target">shell_prop</type>
-        <type type="target">property_socket</type>
-        <type type="target">runas</type>
-        <type type="target">debuggerd_exec</type>
-        <type type="target">mqueue</type>
-        <type type="target">shell_data_file</type>
-        <type type="target">drmserver_tmpfs</type>
-        <type type="target">debuggerd_tmpfs</type>
-        <type type="target">init</type>
-        <type type="target">netif</type>
-        <type type="target">device</type>
-        <type type="target">apk_tmp_file</type>
-        <type type="target">logd</type>
-        <type type="target">servicemanager</type>
-        <type type="target">gpsd_tmpfs</type>
-        <type type="target">bluetooth_socket</type>
-        <type type="target">adb_keys_file</type>
-        <type type="target">sdcardd_exec</type>
-        <type type="target">system_app_tmpfs</type>
-        <type type="target">mediaserver_exec</type>
-        <type type="target">ppp_exec</type>
-        <type type="target">media_rw_data_file</type>
-        <type type="target">clatd_exec</type>
-        <type type="target">ueventd</type>
-        <type type="target">labeledfs</type>
-        <type type="target">asec_image_file</type>
-        <type type="target">camera_device</type>
-        <type type="target">efs_file</type>
-        <type type="target">media_app</type>
-        <type type="target">tmpfs</type>
-        <type type="target">bluetooth_prop</type>
-        <type type="target">logdr_socket</type>
-        <type type="target">nfc</type>
-        <type type="target">zygote_tmpfs</type>
-        <type type="target">cache_backup_file</type>
-        <type type="target">drmserver_socket</type>
-        <type type="target">logd_exec</type>
-        <type type="target">nfc_tmpfs</type>
-        <type type="target">zygote</type>
-        <type type="target">hostapd</type>
-        <type type="target">tee_data_file</type>
-        <type type="target">lmkd_socket</type>
-        <type type="target">zoneinfo_data_file</type>
-        <type type="target">cgroup</type>
-        <type type="target">platform_app</type>
-        <type type="target">release_app</type>
-        <type type="target">qtaguid_device</type>
-        <type type="target">surfaceflinger_tmpfs</type>
-        <type type="target">shm</type>
-        <type type="target">hci_attach_tmpfs</type>
-        <type type="target">rild_exec</type>
-        <type type="target">kernel</type>
-        <type type="target">system_ndebug_socket</type>
-        <type type="target">hci_attach_dev</type>
-        <type type="target">cpuctl_device</type>
-        <type type="target">iio_device</type>
-        <type type="target">dhcp</type>
-        <type type="target">audio_device</type>
-        <type type="target">bootanim_exec</type>
-        <type type="target">tee</type>
-        <type type="target">wpa_exec</type>
-        <type type="target">bluetooth</type>
-        <type type="target">sysfs_lowmemorykiller</type>
-        <type type="target">mdnsd_exec</type>
-        <type type="target">console_device</type>
-        <type type="target">rild</type>
-        <type type="target">hw_random_device</type>
-        <type type="target">radio_prop</type>
-        <type type="target">wallpaper_file</type>
-        <type type="target">surfaceflinger_exec</type>
-        <type type="target">audio_prop</type>
-        <type type="target">port</type>
-        <type type="target">gps_device</type>
-        <type type="target">vcs_device</type>
-        <type type="target">alarm_device</type>
-        <type type="target">keystore_tmpfs</type>
-        <type type="target">logd_socket</type>
-        <type type="target">inputflinger_exec</type>
-        <type type="target">gpu_device</type>
-        <type type="target">unlabeled</type>
-        <type type="target">racoon_exec</type>
-        <type type="target">init_tmpfs</type>
-        <type type="target">binder_device</type>
-        <type type="target">servicemanager_tmpfs</type>
-        <type type="target">sysfs_wake_lock</type>
-        <type type="target">system_app</type>
-        <type type="target">vold_exec</type>
-        <type type="target">powerctl_prop</type>
-        <type type="target">proc</type>
-        <type type="target">tee_device</type>
-        <type type="target">su_exec</type>
-        <type type="target">usermodehelper</type>
-        <type type="target">ppp_device</type>
-        <type type="target">watchdog_device</type>
-        <type type="target">netd_tmpfs</type>
-        <type type="target">debugfs</type>
-        <type type="target">wpa_socket</type>
-        <type type="target">rpmsg_device</type>
-        <type type="target">anr_data_file</type>
-        <type type="target">lmkd_tmpfs</type>
-        <type type="target">mdnsd_tmpfs</type>
-        <type type="target">logd_tmpfs</type>
-        <type type="target">proc_bluetooth_writable</type>
-        <type type="target">dhcp_exec</type>
-        <type type="target">gpsd</type>
-        <type type="target">log_device</type>
-        <type type="target">mediaserver_tmpfs</type>
-        <type type="target">security_prop</type>
-        <type type="target">vold_tmpfs</type>
-        <type type="target">system_server</type>
-        <type type="target">runas_exec</type>
-        <type type="target">adbd_socket</type>
-        <type type="target">radio_data_file</type>
-        <type type="target">tee_exec</type>
-        <type type="target">backup_data_file</type>
-        <type type="target">full_device</type>
-        <type type="target">kmsg_device</type>
-        <type type="target">ram_device</type>
-        <type type="target">inotify</type>
-        <type type="target">loop_device</type>
-        <type type="target">mtd_device</type>
-        <type type="target">random_device</type>
-        <type type="target">apk_private_tmp_file</type>
-        <type type="target">installd_socket</type>
-        <type type="target">camera_data_file</type>
-        <type type="target">uncrypt</type>
-        <type type="target">asec_public_file</type>
-        <type type="target">mediaserver</type>
-        <type type="target">graphics_device</type>
-        <type type="target">dumpstate_tmpfs</type>
-        <type type="target">usb_device</type>
-        <type type="target">vold</type>
-        <type type="target">drm_data_file</type>
-        <type type="target">sdcard_external</type>
-        <type type="target">gps_control</type>
-        <type type="target">mdns_socket</type>
-        <type type="target">logd_debug</type>
-        <type type="target">rild_debug_socket</type>
-        <type type="target">mtp_tmpfs</type>
-        <type type="target">release_app_tmpfs</type>
-        <type type="target">root_block_device</type>
-        <type type="target">dnsmasq</type>
-        <type type="target">sdcard_internal</type>
-        <type type="target">dm_device</type>
-        <type type="target">download_file</type>
-        <type type="target">inputflinger_tmpfs</type>
-        <type type="target">netd_socket</type>
-        <type type="target">racoon_tmpfs</type>
-        <type type="target">sensors_device</type>
-        <type type="target">hostapd_exec</type>
-        <type type="target">watchdogd</type>
-        <type type="target">system_file</type>
-        <type type="target">pipefs</type>
-        <type type="target">fscklogs</type>
-        <type type="target">rild_prop</type>
-        <type type="target">hci_attach_exec</type>
-        <type type="target">gpsd_exec</type>
-        <type type="target">bootanim_tmpfs</type>
-        <type type="target">servicemanager_exec</type>
-        <type type="target">proc_net</type>
-        <type type="target">shell_exec</type>
-        <type type="target">null_device</type>
-        <type type="target">debug_prop</type>
-        <type type="target">serial_device</type>
-        <type type="target">bluetooth_tmpfs</type>
-        <type type="target">sysfs_writable</type>
-        <type type="target">devpts</type>
-        <type type="target">wpa_tmpfs</type>
-        <type type="target">racoon</type>
-        <type type="target">shell</type>
-        <type type="target">video_device</type>
-        <type type="target">racoon_socket</type>
-        <type type="target">usbaccessory_device</type>
-        <type type="target">dumpstate</type>
-        <type type="target">adbd</type>
-        <type type="target">bootanim</type>
-        <type type="target">owntty_device</type>
-        <type type="target">untrusted_app</type>
-        <type type="target">sysfs_bluetooth_writable</type>
-        <type type="target">mtp_device</type>
-        <type type="target">vold_prop</type>
-        <type type="target">ctl_default_prop</type>
-        <type type="target">vpn_data_file</type>
-        <type type="target">dnsmasq_exec</type>
-        <type type="target">socket_device</type>
-        <type type="target">keystore_data_file</type>
-        <type type="target">installd_tmpfs</type>
-        <type type="target">sysfs_devices_system_cpu</type>
-        <type type="target">drmserver_exec</type>
-        <type type="target">proc_security</type>
-        <type type="target">sysfs</type>
-        <type type="target">properties_device</type>
-        <type type="target">block_device</type>
-        <type type="target">gps_data_file</type>
-        <type type="target">mtp</type>
-        <type type="target">inputflinger</type>
-        <type type="target">surfaceflinger</type>
-        <type type="target">systemkeys_data_file</type>
-        <type type="target">cache_file</type>
-        <type type="target">dalvikcache_data_file</type>
-        <type type="target">mdnsd</type>
-        <type type="target">mdnsd_socket</type>
-        <type type="target">lmkd_exec</type>
-        <type type="target">netd_exec</type>
-        <type type="target">nfc_device</type>
-        <type type="target">kmem_device</type>
-        <type type="target">ashmem_device</type>
-        <type type="target">sdcardd</type>
-        <type type="target">hci_attach</type>
-        <type type="target">dnsproxyd_socket</type>
-        <type type="target">wifi_data_file</type>
-        <type type="target">gps_socket</type>
-        <type type="target">fuse_device</type>
-        <type type="target">dhcp_tmpfs</type>
-        <type type="target">mtp_exec</type>
-        <type type="target">nfc_data_file</type>
-        <type type="target">tee_tmpfs</type>
-        <type type="target">default_prop</type>
-        <type type="target">input_device</type>
-        <type type="target">dumpstate_exec</type>
-        <type type="target">drmserver</type>
-        <type type="target">logdw_socket</type>
-        <type type="target">uncrypt_tmpfs</type>
-        <type type="target">rild_tmpfs</type>
-        <type type="target">zygote_exec</type>
-        <type type="target">keystore</type>
-        <type type="target">radio_tmpfs</type>
-        <type type="target">clatd</type>
-        <type type="target">zero_device</type>
-        <type type="target">recovery</type>
-        <type type="target">ctl_dumpstate_prop</type>
-        <type type="target">adb_device</type>
-        <type type="target">ppp</type>
-        <type type="target">rild_socket</type>
-        <type type="target">ptmx_device</type>
-        <type type="target">apk_private_data_file</type>
-        <type type="target">tun_device</type>
-        <type type="target">uncrypt_exec</type>
-        <type type="target">media_data_file</type>
-        <type type="target">media_app_tmpfs</type>
-        <type type="target">untrusted_app_tmpfs</type>
-        <type type="target">ctl_rildaemon_prop</type>
-        <type type="target">healthd</type>
-        <type type="target">node</type>
-        <type type="target">isolated_app_tmpfs</type>
-        <type type="target">radio_device</type>
-        <type type="target">urandom_device</type>
-        <type type="target">tombstone_data_file</type>
-        <type type="target">shared_app_tmpfs</type>
-        <type type="target">security_file</type>
-        <type type="target">system_data_file</type>
-        <type type="target">qtaguid_proc</type>
-        <type type="target">tty_device</type>
-        <type type="target">sdcardd_tmpfs</type>
-        <type type="target">isolated_app</type>
-        <type type="target">ueventd_tmpfs</type>
-        <type type="target">installd_exec</type>
-        <type type="target">system_prop</type>
-        <type type="target">platform_app_tmpfs</type>
-        <type type="target">wpa</type>
-        <type type="target">rootfs</type>
-        <type type="target">app_data_file</type>
-        <type type="target">apk_data_file</type>
-        <type type="target">dhcp_data_file</type>
-        <type type="target">asec_apk_file</type>
-        <type type="target">platform_app_data_file</type>
-        <type type="target">keystore_exec</type>
-        <type type="target">bluetooth_data_file</type>
-        <type type="target">klog_device</type>
-        <type type="target">debuggerd_prop</type>
-        <type type="target">vold_socket</type>
-        <type type="target">bluetooth_efs_file</type>
-        <type type="target">installd</type>
-        <type type="target">shell_tmpfs</type>
-        <type type="target">shared_app</type>
-        <obj_class name="fifo_file">
-            <permission>relabelto</permission>
-        </obj_class>
-        <obj_class name="chr_file">
-            <permission>relabelto</permission>
-        </obj_class>
-        <obj_class name="file">
-            <permission>relabelto</permission>
-        </obj_class>
-        <obj_class name="sock_file">
-            <permission>relabelto</permission>
-        </obj_class>
-        <obj_class name="blk_file">
-            <permission>relabelto</permission>
-        </obj_class>
-        <obj_class name="lnk_file">
-            <permission>relabelto</permission>
-        </obj_class>
-        <obj_class name="dir">
-            <permission>relabelto</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="3" type="neverallow">
-        <type type="source">kernel</type>
-        <type type="source">sdcardd</type>
-        <type type="source">init_shell</type>
-        <type type="source">adbd</type>
-        <type type="source">netd</type>
-        <type type="source">tee</type>
-        <type type="source">bluetooth</type>
-        <type type="source">lmkd</type>
-        <type type="source">surfaceflinger</type>
-        <type type="source">mdnsd</type>
-        <type type="source">radio</type>
-        <type type="source">hci_attach</type>
-        <type type="source">clatd</type>
-        <type type="source">watchdogd</type>
-        <type type="source">drmserver</type>
-        <type type="source">keystore</type>
-        <type type="source">recovery</type>
-        <type type="source">runas</type>
-        <type type="source">init</type>
-        <type type="source">servicemanager</type>
-        <type type="source">dhcp</type>
-        <type type="source">shell</type>
-        <type type="source">uncrypt</type>
-        <type type="source">untrusted_app</type>
-        <type type="source">ueventd</type>
-        <type type="source">gpsd</type>
-        <type type="source">isolated_app</type>
-        <type type="source">system_app</type>
-        <type type="source">media_app</type>
-        <type type="source">wpa</type>
-        <type type="source">racoon</type>
-        <type type="source">nfc</type>
-        <type type="source">shared_app</type>
-        <type type="source">hostapd</type>
-        <type type="source">platform_app</type>
-        <type type="source">mtp</type>
-        <type type="source">inputflinger</type>
-        <type type="source">logd</type>
-        <type type="source">zygote</type>
-        <type type="source">rild</type>
-        <type type="source">dnsmasq</type>
-        <type type="source">healthd</type>
-        <type type="source">mediaserver</type>
-        <type type="source">bootanim</type>
-        <type type="source">ppp</type>
-        <type type="source">release_app</type>
-        <type type="source">installd</type>
-        <type type="target">self</type>
-        <obj_class name="capability">
-            <permission>sys_ptrace</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="4" type="neverallow">
-        <type type="source">sdcardd</type>
-        <type type="source">init_shell</type>
-        <type type="source">adbd</type>
-        <type type="source">debuggerd</type>
-        <type type="source">netd</type>
-        <type type="source">tee</type>
-        <type type="source">bluetooth</type>
-        <type type="source">lmkd</type>
-        <type type="source">surfaceflinger</type>
-        <type type="source">mdnsd</type>
-        <type type="source">radio</type>
-        <type type="source">hci_attach</type>
-        <type type="source">clatd</type>
-        <type type="source">drmserver</type>
-        <type type="source">keystore</type>
-        <type type="source">runas</type>
-        <type type="source">servicemanager</type>
-        <type type="source">dhcp</type>
-        <type type="source">shell</type>
-        <type type="source">untrusted_app</type>
-        <type type="source">gpsd</type>
-        <type type="source">isolated_app</type>
-        <type type="source">system_app</type>
-        <type type="source">media_app</type>
-        <type type="source">system_server</type>
-        <type type="source">wpa</type>
-        <type type="source">racoon</type>
-        <type type="source">dumpstate</type>
-        <type type="source">nfc</type>
-        <type type="source">shared_app</type>
-        <type type="source">hostapd</type>
-        <type type="source">platform_app</type>
-        <type type="source">mtp</type>
-        <type type="source">inputflinger</type>
-        <type type="source">logd</type>
-        <type type="source">zygote</type>
-        <type type="source">rild</type>
-        <type type="source">dnsmasq</type>
-        <type type="source">mediaserver</type>
-        <type type="source">bootanim</type>
-        <type type="source">ppp</type>
-        <type type="source">release_app</type>
-        <type type="source">installd</type>
-        <type type="target">self</type>
-        <obj_class name="capability">
-            <permission>sys_rawio</permission>
-            <permission>mknod</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="5" type="neverallow">
-        <type type="source">kernel</type>
-        <type type="source">sdcardd</type>
-        <type type="source">init_shell</type>
-        <type type="source">adbd</type>
-        <type type="source">vold</type>
-        <type type="source">debuggerd</type>
-        <type type="source">netd</type>
-        <type type="source">tee</type>
-        <type type="source">bluetooth</type>
-        <type type="source">lmkd</type>
-        <type type="source">surfaceflinger</type>
-        <type type="source">mdnsd</type>
-        <type type="source">radio</type>
-        <type type="source">hci_attach</type>
-        <type type="source">clatd</type>
-        <type type="source">watchdogd</type>
-        <type type="source">drmserver</type>
-        <type type="source">keystore</type>
-        <type type="source">recovery</type>
-        <type type="source">runas</type>
-        <type type="source">init</type>
-        <type type="source">servicemanager</type>
-        <type type="source">dhcp</type>
-        <type type="source">shell</type>
-        <type type="source">uncrypt</type>
-        <type type="source">untrusted_app</type>
-        <type type="source">ueventd</type>
-        <type type="source">gpsd</type>
-        <type type="source">isolated_app</type>
-        <type type="source">system_app</type>
-        <type type="source">media_app</type>
-        <type type="source">system_server</type>
-        <type type="source">wpa</type>
-        <type type="source">racoon</type>
-        <type type="source">dumpstate</type>
-        <type type="source">nfc</type>
-        <type type="source">shared_app</type>
-        <type type="source">hostapd</type>
-        <type type="source">platform_app</type>
-        <type type="source">mtp</type>
-        <type type="source">inputflinger</type>
-        <type type="source">logd</type>
-        <type type="source">zygote</type>
-        <type type="source">rild</type>
-        <type type="source">dnsmasq</type>
-        <type type="source">healthd</type>
-        <type type="source">mediaserver</type>
-        <type type="source">bootanim</type>
-        <type type="source">ppp</type>
-        <type type="source">release_app</type>
-        <type type="source">installd</type>
-        <type type="target">self</type>
-        <obj_class name="capability2">
-            <permission>mac_override</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="6" type="neverallow">
-        <type type="source">kernel</type>
-        <type type="source">sdcardd</type>
-        <type type="source">init_shell</type>
-        <type type="source">adbd</type>
-        <type type="source">vold</type>
-        <type type="source">debuggerd</type>
-        <type type="source">netd</type>
-        <type type="source">tee</type>
-        <type type="source">bluetooth</type>
-        <type type="source">lmkd</type>
-        <type type="source">surfaceflinger</type>
-        <type type="source">mdnsd</type>
-        <type type="source">radio</type>
-        <type type="source">hci_attach</type>
-        <type type="source">clatd</type>
-        <type type="source">watchdogd</type>
-        <type type="source">drmserver</type>
-        <type type="source">keystore</type>
-        <type type="source">runas</type>
-        <type type="source">init</type>
-        <type type="source">servicemanager</type>
-        <type type="source">dhcp</type>
-        <type type="source">shell</type>
-        <type type="source">uncrypt</type>
-        <type type="source">untrusted_app</type>
-        <type type="source">ueventd</type>
-        <type type="source">gpsd</type>
-        <type type="source">isolated_app</type>
-        <type type="source">system_app</type>
-        <type type="source">media_app</type>
-        <type type="source">system_server</type>
-        <type type="source">wpa</type>
-        <type type="source">racoon</type>
-        <type type="source">dumpstate</type>
-        <type type="source">nfc</type>
-        <type type="source">shared_app</type>
-        <type type="source">hostapd</type>
-        <type type="source">platform_app</type>
-        <type type="source">mtp</type>
-        <type type="source">inputflinger</type>
-        <type type="source">logd</type>
-        <type type="source">zygote</type>
-        <type type="source">rild</type>
-        <type type="source">dnsmasq</type>
-        <type type="source">healthd</type>
-        <type type="source">mediaserver</type>
-        <type type="source">bootanim</type>
-        <type type="source">ppp</type>
-        <type type="source">release_app</type>
-        <type type="source">installd</type>
-        <type type="target">self</type>
-        <obj_class name="capability2">
-            <permission>mac_admin</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="7" type="neverallow">
-        <type type="source">kernel</type>
-        <type type="source">sdcardd</type>
-        <type type="source">init_shell</type>
-        <type type="source">adbd</type>
-        <type type="source">vold</type>
-        <type type="source">debuggerd</type>
-        <type type="source">netd</type>
-        <type type="source">tee</type>
-        <type type="source">bluetooth</type>
-        <type type="source">lmkd</type>
-        <type type="source">surfaceflinger</type>
-        <type type="source">mdnsd</type>
-        <type type="source">radio</type>
-        <type type="source">hci_attach</type>
-        <type type="source">clatd</type>
-        <type type="source">watchdogd</type>
-        <type type="source">drmserver</type>
-        <type type="source">keystore</type>
-        <type type="source">recovery</type>
-        <type type="source">runas</type>
-        <type type="source">servicemanager</type>
-        <type type="source">dhcp</type>
-        <type type="source">shell</type>
-        <type type="source">uncrypt</type>
-        <type type="source">untrusted_app</type>
-        <type type="source">ueventd</type>
-        <type type="source">gpsd</type>
-        <type type="source">isolated_app</type>
-        <type type="source">system_app</type>
-        <type type="source">media_app</type>
-        <type type="source">system_server</type>
-        <type type="source">wpa</type>
-        <type type="source">racoon</type>
-        <type type="source">dumpstate</type>
-        <type type="source">nfc</type>
-        <type type="source">shared_app</type>
-        <type type="source">hostapd</type>
-        <type type="source">platform_app</type>
-        <type type="source">mtp</type>
-        <type type="source">inputflinger</type>
-        <type type="source">logd</type>
-        <type type="source">zygote</type>
-        <type type="source">rild</type>
-        <type type="source">dnsmasq</type>
-        <type type="source">healthd</type>
-        <type type="source">mediaserver</type>
-        <type type="source">bootanim</type>
-        <type type="source">ppp</type>
-        <type type="source">release_app</type>
-        <type type="source">installd</type>
-        <type type="target">kernel</type>
-        <obj_class name="security">
-            <permission>load_policy</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="8" type="neverallow">
-        <type type="source">vold</type>
-        <type type="source">sdcardd</type>
-        <type type="source">init_shell</type>
-        <type type="source">adbd</type>
-        <type type="source">debuggerd</type>
-        <type type="source">netd</type>
-        <type type="source">tee</type>
-        <type type="source">bluetooth</type>
-        <type type="source">lmkd</type>
-        <type type="source">surfaceflinger</type>
-        <type type="source">mdnsd</type>
-        <type type="source">radio</type>
-        <type type="source">hci_attach</type>
-        <type type="source">clatd</type>
-        <type type="source">watchdogd</type>
-        <type type="source">drmserver</type>
-        <type type="source">keystore</type>
-        <type type="source">recovery</type>
-        <type type="source">runas</type>
-        <type type="source">init</type>
-        <type type="source">servicemanager</type>
-        <type type="source">dhcp</type>
-        <type type="source">shell</type>
-        <type type="source">uncrypt</type>
-        <type type="source">untrusted_app</type>
-        <type type="source">ueventd</type>
-        <type type="source">gpsd</type>
-        <type type="source">isolated_app</type>
-        <type type="source">system_app</type>
-        <type type="source">media_app</type>
-        <type type="source">system_server</type>
-        <type type="source">wpa</type>
-        <type type="source">racoon</type>
-        <type type="source">dumpstate</type>
-        <type type="source">nfc</type>
-        <type type="source">shared_app</type>
-        <type type="source">hostapd</type>
-        <type type="source">platform_app</type>
-        <type type="source">mtp</type>
-        <type type="source">inputflinger</type>
-        <type type="source">logd</type>
-        <type type="source">zygote</type>
-        <type type="source">rild</type>
-        <type type="source">dnsmasq</type>
-        <type type="source">healthd</type>
-        <type type="source">mediaserver</type>
-        <type type="source">bootanim</type>
-        <type type="source">ppp</type>
-        <type type="source">release_app</type>
-        <type type="source">installd</type>
-        <type type="target">kernel</type>
-        <obj_class name="security">
-            <permission>setenforce</permission>
-            <permission>setcheckreqprot</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="9" type="neverallow">
-        <type type="source">kernel</type>
-        <type type="source">sdcardd</type>
-        <type type="source">init_shell</type>
-        <type type="source">adbd</type>
-        <type type="source">vold</type>
-        <type type="source">debuggerd</type>
-        <type type="source">netd</type>
-        <type type="source">tee</type>
-        <type type="source">bluetooth</type>
-        <type type="source">lmkd</type>
-        <type type="source">surfaceflinger</type>
-        <type type="source">mdnsd</type>
-        <type type="source">radio</type>
-        <type type="source">hci_attach</type>
-        <type type="source">clatd</type>
-        <type type="source">watchdogd</type>
-        <type type="source">drmserver</type>
-        <type type="source">keystore</type>
-        <type type="source">recovery</type>
-        <type type="source">runas</type>
-        <type type="source">init</type>
-        <type type="source">servicemanager</type>
-        <type type="source">dhcp</type>
-        <type type="source">shell</type>
-        <type type="source">uncrypt</type>
-        <type type="source">untrusted_app</type>
-        <type type="source">ueventd</type>
-        <type type="source">gpsd</type>
-        <type type="source">isolated_app</type>
-        <type type="source">system_app</type>
-        <type type="source">media_app</type>
-        <type type="source">system_server</type>
-        <type type="source">wpa</type>
-        <type type="source">racoon</type>
-        <type type="source">dumpstate</type>
-        <type type="source">nfc</type>
-        <type type="source">shared_app</type>
-        <type type="source">hostapd</type>
-        <type type="source">platform_app</type>
-        <type type="source">mtp</type>
-        <type type="source">inputflinger</type>
-        <type type="source">logd</type>
-        <type type="source">zygote</type>
-        <type type="source">rild</type>
-        <type type="source">dnsmasq</type>
-        <type type="source">healthd</type>
-        <type type="source">mediaserver</type>
-        <type type="source">bootanim</type>
-        <type type="source">ppp</type>
-        <type type="source">release_app</type>
-        <type type="source">installd</type>
-        <type type="target">system_server_tmpfs</type>
-        <type type="target">logdr_socket</type>
-        <type type="target">lmkd_socket</type>
-        <type type="target">system_wpa_socket</type>
-        <type type="target">ueventd_tmpfs</type>
-        <type type="target">dumpstate_socket</type>
-        <type type="target">wpa_tmpfs</type>
-        <type type="target">property_socket</type>
-        <type type="target">shell_data_file</type>
-        <type type="target">debuggerd_tmpfs</type>
-        <type type="target">bootanim_tmpfs</type>
-        <type type="target">apk_tmp_file</type>
-        <type type="target">gpsd_tmpfs</type>
-        <type type="target">bluetooth_socket</type>
-        <type type="target">adb_keys_file</type>
-        <type type="target">system_app_tmpfs</type>
-        <type type="target">media_rw_data_file</type>
-        <type type="target">shared_app_tmpfs</type>
-        <type type="target">backup_data_file</type>
-        <type type="target">zygote_socket</type>
-        <type type="target">tee_data_file</type>
-        <type type="target">cache_backup_file</type>
-        <type type="target">drmserver_socket</type>
-        <type type="target">system_ndebug_socket</type>
-        <type type="target">nfc_tmpfs</type>
-        <type type="target">zoneinfo_data_file</type>
-        <type type="target">radio_data_file</type>
-        <type type="target">surfaceflinger_tmpfs</type>
-        <type type="target">apk_private_tmp_file</type>
-        <type type="target">hci_attach_tmpfs</type>
-        <type type="target">rild_debug_socket</type>
-        <type type="target">wallpaper_file</type>
-        <type type="target">sdcardd_tmpfs</type>
-        <type type="target">keystore_tmpfs</type>
-        <type type="target">bluetooth_data_file</type>
-        <type type="target">init_tmpfs</type>
-        <type type="target">servicemanager_tmpfs</type>
-        <type type="target">efs_file</type>
-        <type type="target">installd_socket</type>
-        <type type="target">inputflinger_tmpfs</type>
-        <type type="target">netd_tmpfs</type>
-        <type type="target">wpa_socket</type>
-        <type type="target">anr_data_file</type>
-        <type type="target">lmkd_tmpfs</type>
-        <type type="target">mdnsd_tmpfs</type>
-        <type type="target">logd_tmpfs</type>
-        <type type="target">mediaserver_tmpfs</type>
-        <type type="target">vold_tmpfs</type>
-        <type type="target">dnsproxyd_socket</type>
-        <type type="target">adbd_socket</type>
-        <type type="target">camera_data_file</type>
-        <type type="target">asec_public_file</type>
-        <type type="target">dumpstate_tmpfs</type>
-        <type type="target">drm_data_file</type>
-        <type type="target">gps_control</type>
-        <type type="target">logd_debug</type>
-        <type type="target">mtp_tmpfs</type>
-        <type type="target">release_app_tmpfs</type>
-        <type type="target">download_file</type>
-        <type type="target">netd_socket</type>
-        <type type="target">racoon_tmpfs</type>
-        <type type="target">system_file</type>
-        <type type="target">asec_image_file</type>
-        <type type="target">tombstone_data_file</type>
-        <type type="target">racoon_socket</type>
-        <type type="target">logd_socket</type>
-        <type type="target">untrusted_app_tmpfs</type>
-        <type type="target">vpn_data_file</type>
-        <type type="target">keystore_data_file</type>
-        <type type="target">bluetooth_tmpfs</type>
-        <type type="target">drmserver_tmpfs</type>
-        <type type="target">gps_data_file</type>
-        <type type="target">systemkeys_data_file</type>
-        <type type="target">cache_file</type>
-        <type type="target">dalvikcache_data_file</type>
-        <type type="target">installd_tmpfs</type>
-        <type type="target">mdnsd_socket</type>
-        <type type="target">mdns_socket</type>
-        <type type="target">wifi_data_file</type>
-        <type type="target">gps_socket</type>
-        <type type="target">dhcp_tmpfs</type>
-        <type type="target">nfc_data_file</type>
-        <type type="target">tee_tmpfs</type>
-        <type type="target">zygote_tmpfs</type>
-        <type type="target">uncrypt_tmpfs</type>
-        <type type="target">rild_tmpfs</type>
-        <type type="target">isolated_app_tmpfs</type>
-        <type type="target">radio_tmpfs</type>
-        <type type="target">rild_socket</type>
-        <type type="target">media_data_file</type>
-        <type type="target">media_app_tmpfs</type>
-        <type type="target">audio_data_file</type>
-        <type type="target">unlabeled</type>
-        <type type="target">security_file</type>
-        <type type="target">system_data_file</type>
-        <type type="target">bluetooth_efs_file</type>
-        <type type="target">platform_app_tmpfs</type>
-        <type type="target">app_data_file</type>
-        <type type="target">dhcp_data_file</type>
-        <type type="target">asec_apk_file</type>
-        <type type="target">platform_app_data_file</type>
-        <type type="target">logdw_socket</type>
-        <type type="target">apk_private_data_file</type>
-        <type type="target">vold_socket</type>
-        <type type="target">apk_data_file</type>
-        <type type="target">shell_tmpfs</type>
-        <obj_class name="file">
-            <permission>entrypoint</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="10" type="neverallow">
-        <type type="source">vold</type>
-        <type type="source">sdcardd</type>
-        <type type="source">init_shell</type>
-        <type type="source">adbd</type>
-        <type type="source">debuggerd</type>
-        <type type="source">netd</type>
-        <type type="source">tee</type>
-        <type type="source">bluetooth</type>
-        <type type="source">lmkd</type>
-        <type type="source">surfaceflinger</type>
-        <type type="source">mdnsd</type>
-        <type type="source">radio</type>
-        <type type="source">hci_attach</type>
-        <type type="source">clatd</type>
-        <type type="source">watchdogd</type>
-        <type type="source">drmserver</type>
-        <type type="source">keystore</type>
-        <type type="source">recovery</type>
-        <type type="source">runas</type>
-        <type type="source">servicemanager</type>
-        <type type="source">dhcp</type>
-        <type type="source">shell</type>
-        <type type="source">uncrypt</type>
-        <type type="source">untrusted_app</type>
-        <type type="source">gpsd</type>
-        <type type="source">isolated_app</type>
-        <type type="source">system_app</type>
-        <type type="source">media_app</type>
-        <type type="source">system_server</type>
-        <type type="source">wpa</type>
-        <type type="source">racoon</type>
-        <type type="source">dumpstate</type>
-        <type type="source">nfc</type>
-        <type type="source">shared_app</type>
-        <type type="source">hostapd</type>
-        <type type="source">platform_app</type>
-        <type type="source">mtp</type>
-        <type type="source">inputflinger</type>
-        <type type="source">logd</type>
-        <type type="source">zygote</type>
-        <type type="source">rild</type>
-        <type type="source">dnsmasq</type>
-        <type type="source">healthd</type>
-        <type type="source">mediaserver</type>
-        <type type="source">bootanim</type>
-        <type type="source">ppp</type>
-        <type type="source">release_app</type>
-        <type type="source">installd</type>
-        <type type="target">kmem_device</type>
-        <obj_class name="chr_file">
-            <permission>rename</permission>
-            <permission>lock</permission>
-            <permission>quotaon</permission>
-            <permission>execute_no_trans</permission>
-            <permission>open</permission>
-            <permission>append</permission>
-            <permission>create</permission>
-            <permission>write</permission>
-            <permission>relabelfrom</permission>
-            <permission>getattr</permission>
-            <permission>entrypoint</permission>
-            <permission>read</permission>
-            <permission>mounton</permission>
-            <permission>ioctl</permission>
-            <permission>link</permission>
-            <permission>unlink</permission>
-            <permission>swapon</permission>
-            <permission>execute</permission>
-            <permission>setattr</permission>
-            <permission>execmod</permission>
-            <permission>relabelto</permission>
-            <permission>audit_access</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="11" type="neverallow">
-        <type type="source">kernel</type>
-        <type type="source">sdcardd</type>
-        <type type="source">init_shell</type>
-        <type type="source">adbd</type>
-        <type type="source">vold</type>
-        <type type="source">debuggerd</type>
-        <type type="source">netd</type>
-        <type type="source">tee</type>
-        <type type="source">bluetooth</type>
-        <type type="source">lmkd</type>
-        <type type="source">surfaceflinger</type>
-        <type type="source">mdnsd</type>
-        <type type="source">radio</type>
-        <type type="source">hci_attach</type>
-        <type type="source">clatd</type>
-        <type type="source">watchdogd</type>
-        <type type="source">drmserver</type>
-        <type type="source">keystore</type>
-        <type type="source">recovery</type>
-        <type type="source">runas</type>
-        <type type="source">init</type>
-        <type type="source">servicemanager</type>
-        <type type="source">dhcp</type>
-        <type type="source">shell</type>
-        <type type="source">uncrypt</type>
-        <type type="source">untrusted_app</type>
-        <type type="source">ueventd</type>
-        <type type="source">gpsd</type>
-        <type type="source">isolated_app</type>
-        <type type="source">system_app</type>
-        <type type="source">media_app</type>
-        <type type="source">system_server</type>
-        <type type="source">wpa</type>
-        <type type="source">racoon</type>
-        <type type="source">dumpstate</type>
-        <type type="source">nfc</type>
-        <type type="source">shared_app</type>
-        <type type="source">hostapd</type>
-        <type type="source">platform_app</type>
-        <type type="source">mtp</type>
-        <type type="source">inputflinger</type>
-        <type type="source">logd</type>
-        <type type="source">zygote</type>
-        <type type="source">rild</type>
-        <type type="source">dnsmasq</type>
-        <type type="source">healthd</type>
-        <type type="source">mediaserver</type>
-        <type type="source">bootanim</type>
-        <type type="source">ppp</type>
-        <type type="source">release_app</type>
-        <type type="source">installd</type>
-        <type type="target">kmem_device</type>
-        <obj_class name="chr_file">
-            <permission>rename</permission>
-            <permission>execute</permission>
-            <permission>open</permission>
-            <permission>read</permission>
-            <permission>lock</permission>
-            <permission>audit_access</permission>
-            <permission>quotaon</permission>
-            <permission>getattr</permission>
-            <permission>execute_no_trans</permission>
-            <permission>mounton</permission>
-            <permission>write</permission>
-            <permission>relabelfrom</permission>
-            <permission>ioctl</permission>
-            <permission>link</permission>
-            <permission>entrypoint</permission>
-            <permission>swapon</permission>
-            <permission>execmod</permission>
-            <permission>append</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="12" type="neverallow">
-        <type type="source">kernel</type>
-        <type type="source">sdcardd</type>
-        <type type="source">init_shell</type>
-        <type type="source">adbd</type>
-        <type type="source">vold</type>
-        <type type="source">debuggerd</type>
-        <type type="source">netd</type>
-        <type type="source">tee</type>
-        <type type="source">bluetooth</type>
-        <type type="source">lmkd</type>
-        <type type="source">surfaceflinger</type>
-        <type type="source">mdnsd</type>
-        <type type="source">radio</type>
-        <type type="source">hci_attach</type>
-        <type type="source">clatd</type>
-        <type type="source">watchdogd</type>
-        <type type="source">drmserver</type>
-        <type type="source">keystore</type>
-        <type type="source">recovery</type>
-        <type type="source">runas</type>
-        <type type="source">servicemanager</type>
-        <type type="source">dhcp</type>
-        <type type="source">shell</type>
-        <type type="source">uncrypt</type>
-        <type type="source">untrusted_app</type>
-        <type type="source">ueventd</type>
-        <type type="source">gpsd</type>
-        <type type="source">isolated_app</type>
-        <type type="source">system_app</type>
-        <type type="source">media_app</type>
-        <type type="source">system_server</type>
-        <type type="source">wpa</type>
-        <type type="source">racoon</type>
-        <type type="source">dumpstate</type>
-        <type type="source">nfc</type>
-        <type type="source">shared_app</type>
-        <type type="source">hostapd</type>
-        <type type="source">platform_app</type>
-        <type type="source">mtp</type>
-        <type type="source">inputflinger</type>
-        <type type="source">logd</type>
-        <type type="source">zygote</type>
-        <type type="source">rild</type>
-        <type type="source">dnsmasq</type>
-        <type type="source">healthd</type>
-        <type type="source">mediaserver</type>
-        <type type="source">bootanim</type>
-        <type type="source">ppp</type>
-        <type type="source">release_app</type>
-        <type type="source">installd</type>
-        <type type="target">usermodehelper</type>
-        <obj_class name="file">
-            <permission>write</permission>
-            <permission>append</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="13" type="neverallow">
-        <type type="source">kernel</type>
-        <type type="source">sdcardd</type>
-        <type type="source">init_shell</type>
-        <type type="source">adbd</type>
-        <type type="source">vold</type>
-        <type type="source">debuggerd</type>
-        <type type="source">netd</type>
-        <type type="source">tee</type>
-        <type type="source">bluetooth</type>
-        <type type="source">lmkd</type>
-        <type type="source">surfaceflinger</type>
-        <type type="source">mdnsd</type>
-        <type type="source">radio</type>
-        <type type="source">hci_attach</type>
-        <type type="source">clatd</type>
-        <type type="source">watchdogd</type>
-        <type type="source">drmserver</type>
-        <type type="source">keystore</type>
-        <type type="source">recovery</type>
-        <type type="source">runas</type>
-        <type type="source">servicemanager</type>
-        <type type="source">dhcp</type>
-        <type type="source">shell</type>
-        <type type="source">uncrypt</type>
-        <type type="source">untrusted_app</type>
-        <type type="source">ueventd</type>
-        <type type="source">gpsd</type>
-        <type type="source">isolated_app</type>
-        <type type="source">system_app</type>
-        <type type="source">media_app</type>
-        <type type="source">system_server</type>
-        <type type="source">wpa</type>
-        <type type="source">racoon</type>
-        <type type="source">dumpstate</type>
-        <type type="source">nfc</type>
-        <type type="source">shared_app</type>
-        <type type="source">hostapd</type>
-        <type type="source">platform_app</type>
-        <type type="source">mtp</type>
-        <type type="source">inputflinger</type>
-        <type type="source">logd</type>
-        <type type="source">zygote</type>
-        <type type="source">rild</type>
-        <type type="source">dnsmasq</type>
-        <type type="source">healthd</type>
-        <type type="source">mediaserver</type>
-        <type type="source">bootanim</type>
-        <type type="source">ppp</type>
-        <type type="source">release_app</type>
-        <type type="source">installd</type>
-        <type type="target">proc_security</type>
-        <obj_class name="file">
-            <permission>write</permission>
-            <permission>append</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="14" type="neverallow">
-        <type type="source">kernel</type>
-        <type type="source">sdcardd</type>
-        <type type="source">init_shell</type>
-        <type type="source">adbd</type>
-        <type type="source">vold</type>
-        <type type="source">debuggerd</type>
-        <type type="source">netd</type>
-        <type type="source">tee</type>
-        <type type="source">bluetooth</type>
-        <type type="source">lmkd</type>
-        <type type="source">surfaceflinger</type>
-        <type type="source">mdnsd</type>
-        <type type="source">radio</type>
-        <type type="source">hci_attach</type>
-        <type type="source">clatd</type>
-        <type type="source">watchdogd</type>
-        <type type="source">drmserver</type>
-        <type type="source">keystore</type>
-        <type type="source">recovery</type>
-        <type type="source">runas</type>
-        <type type="source">init</type>
-        <type type="source">servicemanager</type>
-        <type type="source">dhcp</type>
-        <type type="source">shell</type>
-        <type type="source">uncrypt</type>
-        <type type="source">untrusted_app</type>
-        <type type="source">ueventd</type>
-        <type type="source">gpsd</type>
-        <type type="source">isolated_app</type>
-        <type type="source">system_app</type>
-        <type type="source">media_app</type>
-        <type type="source">system_server</type>
-        <type type="source">wpa</type>
-        <type type="source">racoon</type>
-        <type type="source">dumpstate</type>
-        <type type="source">nfc</type>
-        <type type="source">shared_app</type>
-        <type type="source">hostapd</type>
-        <type type="source">platform_app</type>
-        <type type="source">mtp</type>
-        <type type="source">inputflinger</type>
-        <type type="source">logd</type>
-        <type type="source">zygote</type>
-        <type type="source">rild</type>
-        <type type="source">dnsmasq</type>
-        <type type="source">healthd</type>
-        <type type="source">mediaserver</type>
-        <type type="source">bootanim</type>
-        <type type="source">ppp</type>
-        <type type="source">release_app</type>
-        <type type="source">installd</type>
-        <type type="target">init</type>
-        <obj_class name="process">
-            <permission>ptrace</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="15" type="neverallow">
-        <type type="source">kernel</type>
-        <type type="source">sdcardd</type>
-        <type type="source">init_shell</type>
-        <type type="source">adbd</type>
-        <type type="source">vold</type>
-        <type type="source">debuggerd</type>
-        <type type="source">netd</type>
-        <type type="source">tee</type>
-        <type type="source">bluetooth</type>
-        <type type="source">lmkd</type>
-        <type type="source">surfaceflinger</type>
-        <type type="source">mdnsd</type>
-        <type type="source">radio</type>
-        <type type="source">hci_attach</type>
-        <type type="source">clatd</type>
-        <type type="source">watchdogd</type>
-        <type type="source">drmserver</type>
-        <type type="source">keystore</type>
-        <type type="source">recovery</type>
-        <type type="source">runas</type>
-        <type type="source">init</type>
-        <type type="source">servicemanager</type>
-        <type type="source">dhcp</type>
-        <type type="source">shell</type>
-        <type type="source">uncrypt</type>
-        <type type="source">untrusted_app</type>
-        <type type="source">ueventd</type>
-        <type type="source">gpsd</type>
-        <type type="source">isolated_app</type>
-        <type type="source">system_app</type>
-        <type type="source">media_app</type>
-        <type type="source">system_server</type>
-        <type type="source">wpa</type>
-        <type type="source">racoon</type>
-        <type type="source">dumpstate</type>
-        <type type="source">nfc</type>
-        <type type="source">shared_app</type>
-        <type type="source">hostapd</type>
-        <type type="source">platform_app</type>
-        <type type="source">mtp</type>
-        <type type="source">inputflinger</type>
-        <type type="source">logd</type>
-        <type type="source">zygote</type>
-        <type type="source">rild</type>
-        <type type="source">dnsmasq</type>
-        <type type="source">healthd</type>
-        <type type="source">mediaserver</type>
-        <type type="source">bootanim</type>
-        <type type="source">ppp</type>
-        <type type="source">release_app</type>
-        <type type="source">installd</type>
-        <type type="target">init</type>
-        <obj_class name="binder">
-            <permission>call</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="16" type="neverallow">
-        <type type="source">sdcardd</type>
-        <type type="source">init_shell</type>
-        <type type="source">adbd</type>
-        <type type="source">debuggerd</type>
-        <type type="source">netd</type>
-        <type type="source">tee</type>
-        <type type="source">bluetooth</type>
-        <type type="source">lmkd</type>
-        <type type="source">surfaceflinger</type>
-        <type type="source">mdnsd</type>
-        <type type="source">radio</type>
-        <type type="source">hci_attach</type>
-        <type type="source">clatd</type>
-        <type type="source">watchdogd</type>
-        <type type="source">drmserver</type>
-        <type type="source">keystore</type>
-        <type type="source">runas</type>
-        <type type="source">servicemanager</type>
-        <type type="source">dhcp</type>
-        <type type="source">shell</type>
-        <type type="source">untrusted_app</type>
-        <type type="source">ueventd</type>
-        <type type="source">gpsd</type>
-        <type type="source">isolated_app</type>
-        <type type="source">system_app</type>
-        <type type="source">media_app</type>
-        <type type="source">system_server</type>
-        <type type="source">wpa</type>
-        <type type="source">racoon</type>
-        <type type="source">dumpstate</type>
-        <type type="source">nfc</type>
-        <type type="source">shared_app</type>
-        <type type="source">hostapd</type>
-        <type type="source">platform_app</type>
-        <type type="source">mtp</type>
-        <type type="source">inputflinger</type>
-        <type type="source">logd</type>
-        <type type="source">zygote</type>
-        <type type="source">rild</type>
-        <type type="source">dnsmasq</type>
-        <type type="source">healthd</type>
-        <type type="source">mediaserver</type>
-        <type type="source">bootanim</type>
-        <type type="source">ppp</type>
-        <type type="source">release_app</type>
-        <type type="source">installd</type>
-        <type type="target">block_device</type>
-        <obj_class name="blk_file">
-            <permission>read</permission>
-            <permission>write</permission>
-            <permission>open</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="17" type="neverallow">
-        <type type="source">sdcardd</type>
-        <type type="source">init_shell</type>
-        <type type="source">adbd</type>
-        <type type="source">debuggerd</type>
-        <type type="source">netd</type>
-        <type type="source">tee</type>
-        <type type="source">bluetooth</type>
-        <type type="source">lmkd</type>
-        <type type="source">surfaceflinger</type>
-        <type type="source">mdnsd</type>
-        <type type="source">radio</type>
-        <type type="source">hci_attach</type>
-        <type type="source">clatd</type>
-        <type type="source">watchdogd</type>
-        <type type="source">drmserver</type>
-        <type type="source">keystore</type>
-        <type type="source">runas</type>
-        <type type="source">servicemanager</type>
-        <type type="source">dhcp</type>
-        <type type="source">shell</type>
-        <type type="source">uncrypt</type>
-        <type type="source">untrusted_app</type>
-        <type type="source">ueventd</type>
-        <type type="source">gpsd</type>
-        <type type="source">isolated_app</type>
-        <type type="source">system_app</type>
-        <type type="source">media_app</type>
-        <type type="source">system_server</type>
-        <type type="source">wpa</type>
-        <type type="source">racoon</type>
-        <type type="source">dumpstate</type>
-        <type type="source">nfc</type>
-        <type type="source">shared_app</type>
-        <type type="source">hostapd</type>
-        <type type="source">platform_app</type>
-        <type type="source">mtp</type>
-        <type type="source">inputflinger</type>
-        <type type="source">logd</type>
-        <type type="source">rild</type>
-        <type type="source">dnsmasq</type>
-        <type type="source">healthd</type>
-        <type type="source">mediaserver</type>
-        <type type="source">bootanim</type>
-        <type type="source">ppp</type>
-        <type type="source">release_app</type>
-        <type type="source">installd</type>
-        <type type="target">sysfs_nfc_power_writable</type>
-        <type type="target">sysfs_lowmemorykiller</type>
-        <type type="target">selinuxfs</type>
-        <type type="target">untrusted_app_devpts</type>
-        <type type="target">tmpfs</type>
-        <type type="target">sysfs</type>
-        <type type="target">sockfs</type>
-        <type type="target">proc_net</type>
-        <type type="target">sysfs_wake_lock</type>
-        <type type="target">rootfs</type>
-        <type type="target">proc</type>
-        <type type="target">usermodehelper</type>
-        <type type="target">devpts</type>
-        <type type="target">debugfs</type>
-        <type type="target">qtaguid_proc</type>
-        <type type="target">sysfs_bluetooth_writable</type>
-        <type type="target">labeledfs</type>
-        <type type="target">device</type>
-        <type type="target">pipefs</type>
-        <type type="target">mqueue</type>
-        <type type="target">sysfs_devices_system_cpu</type>
-        <type type="target">sysfs_writable</type>
-        <type type="target">proc_security</type>
-        <type type="target">inotify</type>
-        <type type="target">proc_bluetooth_writable</type>
-        <type type="target">cgroup</type>
-        <type type="target">shm</type>
-        <obj_class name="filesystem">
-            <permission>relabelfrom</permission>
-            <permission>relabelto</permission>
-            <permission>mount</permission>
-            <permission>remount</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="18" type="neverallow">
-        <type type="source">logd</type>
-        <type type="target">ashmem_device</type>
-        <type type="target">fscklogs</type>
-        <type type="target">cpuctl_device</type>
-        <type type="target">iio_device</type>
-        <type type="target">audio_device</type>
-        <type type="target">root_block_device</type>
-        <type type="target">properties_device</type>
-        <type type="target">console_device</type>
-        <type type="target">dm_device</type>
-        <type type="target">hw_random_device</type>
-        <type type="target">sensors_device</type>
-        <type type="target">input_device</type>
-        <type type="target">full_device</type>
-        <type type="target">gps_device</type>
-        <type type="target">vcs_device</type>
-        <type type="target">alarm_device</type>
-        <type type="target">video_device</type>
-        <type type="target">gpu_device</type>
-        <type type="target">adb_device</type>
-        <type type="target">ion_device</type>
-        <type type="target">ptmx_device</type>
-        <type type="target">binder_device</type>
-        <type type="target">null_device</type>
-        <type type="target">tun_device</type>
-        <type type="target">mtp_device</type>
-        <type type="target">rpmsg_device</type>
-        <type type="target">fuse_device</type>
-        <type type="target">watchdog_device</type>
-        <type type="target">radio_device</type>
-        <type type="target">urandom_device</type>
-        <type type="target">usbaccessory_device</type>
-        <type type="target">kmsg_device</type>
-        <type type="target">serial_device</type>
-        <type type="target">camera_device</type>
-        <type type="target">log_device</type>
-        <type type="target">owntty_device</type>
-        <type type="target">device</type>
-        <type type="target">zero_device</type>
-        <type type="target">qtaguid_device</type>
-        <type type="target">tty_device</type>
-        <type type="target">socket_device</type>
-        <type type="target">block_device</type>
-        <type type="target">mtd_device</type>
-        <type type="target">random_device</type>
-        <type type="target">uhid_device</type>
-        <type type="target">tee_device</type>
-        <type type="target">loop_device</type>
-        <type type="target">klog_device</type>
-        <type type="target">ppp_device</type>
-        <type type="target">graphics_device</type>
-        <type type="target">nfc_device</type>
-        <type type="target">ram_device</type>
-        <type type="target">kmem_device</type>
-        <type type="target">hci_attach_dev</type>
-        <type type="target">usb_device</type>
-        <obj_class name="blk_file">
-            <permission>read</permission>
-            <permission>write</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="19" type="neverallow">
-        <type type="source">logd</type>
-        <type type="target">kernel</type>
-        <type type="target">sdcardd</type>
-        <type type="target">init_shell</type>
-        <type type="target">adbd</type>
-        <type type="target">vold</type>
-        <type type="target">debuggerd</type>
-        <type type="target">netd</type>
-        <type type="target">tee</type>
-        <type type="target">bluetooth</type>
-        <type type="target">lmkd</type>
-        <type type="target">surfaceflinger</type>
-        <type type="target">mdnsd</type>
-        <type type="target">radio</type>
-        <type type="target">hci_attach</type>
-        <type type="target">clatd</type>
-        <type type="target">watchdogd</type>
-        <type type="target">drmserver</type>
-        <type type="target">keystore</type>
-        <type type="target">recovery</type>
-        <type type="target">runas</type>
-        <type type="target">init</type>
-        <type type="target">servicemanager</type>
-        <type type="target">dhcp</type>
-        <type type="target">shell</type>
-        <type type="target">uncrypt</type>
-        <type type="target">untrusted_app</type>
-        <type type="target">ueventd</type>
-        <type type="target">gpsd</type>
-        <type type="target">isolated_app</type>
-        <type type="target">system_app</type>
-        <type type="target">media_app</type>
-        <type type="target">system_server</type>
-        <type type="target">wpa</type>
-        <type type="target">racoon</type>
-        <type type="target">dumpstate</type>
-        <type type="target">nfc</type>
-        <type type="target">shared_app</type>
-        <type type="target">hostapd</type>
-        <type type="target">platform_app</type>
-        <type type="target">mtp</type>
-        <type type="target">inputflinger</type>
-        <type type="target">logd</type>
-        <type type="target">zygote</type>
-        <type type="target">rild</type>
-        <type type="target">dnsmasq</type>
-        <type type="target">healthd</type>
-        <type type="target">mediaserver</type>
-        <type type="target">bootanim</type>
-        <type type="target">ppp</type>
-        <type type="target">release_app</type>
-        <type type="target">installd</type>
-        <obj_class name="process">
-            <permission>ptrace</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="20" type="neverallow">
-        <type type="source">logd</type>
-        <type type="target">system_file</type>
-        <obj_class name="fifo_file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="chr_file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="sock_file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="blk_file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="lnk_file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="dir">
-            <permission>write</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="21" type="neverallow">
-        <type type="source">logd</type>
-        <type type="target">app_data_file</type>
-        <type type="target">system_data_file</type>
-        <obj_class name="fifo_file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="chr_file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="sock_file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="blk_file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="lnk_file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="dir">
-            <permission>write</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="22" type="neverallow">
-        <type type="source">netd</type>
-        <type type="target">ashmem_device</type>
-        <type type="target">fscklogs</type>
-        <type type="target">cpuctl_device</type>
-        <type type="target">iio_device</type>
-        <type type="target">audio_device</type>
-        <type type="target">root_block_device</type>
-        <type type="target">properties_device</type>
-        <type type="target">console_device</type>
-        <type type="target">dm_device</type>
-        <type type="target">hw_random_device</type>
-        <type type="target">sensors_device</type>
-        <type type="target">input_device</type>
-        <type type="target">full_device</type>
-        <type type="target">gps_device</type>
-        <type type="target">vcs_device</type>
-        <type type="target">alarm_device</type>
-        <type type="target">video_device</type>
-        <type type="target">gpu_device</type>
-        <type type="target">adb_device</type>
-        <type type="target">ion_device</type>
-        <type type="target">ptmx_device</type>
-        <type type="target">binder_device</type>
-        <type type="target">null_device</type>
-        <type type="target">tun_device</type>
-        <type type="target">mtp_device</type>
-        <type type="target">rpmsg_device</type>
-        <type type="target">fuse_device</type>
-        <type type="target">watchdog_device</type>
-        <type type="target">radio_device</type>
-        <type type="target">urandom_device</type>
-        <type type="target">usbaccessory_device</type>
-        <type type="target">kmsg_device</type>
-        <type type="target">serial_device</type>
-        <type type="target">camera_device</type>
-        <type type="target">log_device</type>
-        <type type="target">owntty_device</type>
-        <type type="target">device</type>
-        <type type="target">zero_device</type>
-        <type type="target">qtaguid_device</type>
-        <type type="target">tty_device</type>
-        <type type="target">socket_device</type>
-        <type type="target">block_device</type>
-        <type type="target">mtd_device</type>
-        <type type="target">random_device</type>
-        <type type="target">uhid_device</type>
-        <type type="target">tee_device</type>
-        <type type="target">loop_device</type>
-        <type type="target">klog_device</type>
-        <type type="target">ppp_device</type>
-        <type type="target">graphics_device</type>
-        <type type="target">nfc_device</type>
-        <type type="target">ram_device</type>
-        <type type="target">kmem_device</type>
-        <type type="target">hci_attach_dev</type>
-        <type type="target">usb_device</type>
-        <obj_class name="blk_file">
-            <permission>read</permission>
-            <permission>write</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="23" type="neverallow">
-        <type type="source">netd</type>
-        <type type="target">kernel</type>
-        <obj_class name="security">
-            <permission>setenforce</permission>
-            <permission>setbool</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="24" type="neverallow">
-        <type type="source">netd</type>
-        <type type="target">kernel</type>
-        <obj_class name="security">
-            <permission>load_policy</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="25" type="neverallow">
-        <type type="source">netd</type>
-        <type type="target">kernel</type>
-        <type type="target">sdcardd</type>
-        <type type="target">init_shell</type>
-        <type type="target">adbd</type>
-        <type type="target">vold</type>
-        <type type="target">debuggerd</type>
-        <type type="target">netd</type>
-        <type type="target">tee</type>
-        <type type="target">bluetooth</type>
-        <type type="target">lmkd</type>
-        <type type="target">surfaceflinger</type>
-        <type type="target">mdnsd</type>
-        <type type="target">radio</type>
-        <type type="target">hci_attach</type>
-        <type type="target">clatd</type>
-        <type type="target">watchdogd</type>
-        <type type="target">drmserver</type>
-        <type type="target">keystore</type>
-        <type type="target">recovery</type>
-        <type type="target">runas</type>
-        <type type="target">init</type>
-        <type type="target">servicemanager</type>
-        <type type="target">dhcp</type>
-        <type type="target">shell</type>
-        <type type="target">uncrypt</type>
-        <type type="target">untrusted_app</type>
-        <type type="target">ueventd</type>
-        <type type="target">gpsd</type>
-        <type type="target">isolated_app</type>
-        <type type="target">system_app</type>
-        <type type="target">media_app</type>
-        <type type="target">system_server</type>
-        <type type="target">wpa</type>
-        <type type="target">racoon</type>
-        <type type="target">dumpstate</type>
-        <type type="target">nfc</type>
-        <type type="target">shared_app</type>
-        <type type="target">hostapd</type>
-        <type type="target">platform_app</type>
-        <type type="target">mtp</type>
-        <type type="target">inputflinger</type>
-        <type type="target">logd</type>
-        <type type="target">zygote</type>
-        <type type="target">rild</type>
-        <type type="target">dnsmasq</type>
-        <type type="target">healthd</type>
-        <type type="target">mediaserver</type>
-        <type type="target">bootanim</type>
-        <type type="target">ppp</type>
-        <type type="target">release_app</type>
-        <type type="target">installd</type>
-        <obj_class name="process">
-            <permission>ptrace</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="26" type="neverallow">
-        <type type="source">netd</type>
-        <type type="target">system_file</type>
-        <obj_class name="fifo_file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="chr_file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="sock_file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="blk_file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="lnk_file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="dir">
-            <permission>write</permission>
-        </obj_class>
-    </avc_rule>
-    <avc_rule name="27" type="neverallow">
-        <type type="source">netd</type>
-        <type type="target">app_data_file</type>
-        <type type="target">system_data_file</type>
-        <obj_class name="fifo_file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="chr_file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="sock_file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="blk_file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="lnk_file">
-            <permission>write</permission>
-        </obj_class>
-        <obj_class name="dir">
-            <permission>write</permission>
-        </obj_class>
-    </avc_rule>
-</SELinux_AVC_Rules>
diff --git a/proprietary/frameworks/base/tests/resources/assets/sphere.a3d b/proprietary/frameworks/base/tests/resources/assets/sphere.a3d
deleted file mode 100755
index 3d78b0195f27068151ad225451af57ffb8c8c464..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/assets/sphere.a3d and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/assets/text.txt b/proprietary/frameworks/base/tests/resources/assets/text.txt
deleted file mode 100755
index 3d8c5195bffcf0a36aec4727d59d344b722fa2e9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/text.txt
+++ /dev/null
@@ -1 +0,0 @@
-OneTwoThreeFourFiveSixSevenEightNineTen
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/assets/unsigned.zip b/proprietary/frameworks/base/tests/resources/assets/unsigned.zip
deleted file mode 100755
index 24e3eadacdf88d2d0f77d39463b9479514ea64f3..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/assets/unsigned.zip and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/blank_tag.html b/proprietary/frameworks/base/tests/resources/assets/webkit/blank_tag.html
deleted file mode 100755
index 628ff28bbe340fb4d852374f52844e2768540481..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/blank_tag.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-  <body>
-    <div>
-      <a href="test_hello_world.html" target="_blank" id="link">_blank anchor tag</a><br>
-    </div>
-    <iframe src="iframe_blank_tag.html"></iframe>
-  </body>
-</html>
-
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/embedded_image.html b/proprietary/frameworks/base/tests/resources/assets/webkit/embedded_image.html
deleted file mode 100755
index e41fa700bdaf26444214cfc1363c86f1c12f4f31..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/embedded_image.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>test image</title>
-    </head>
-    <body>
-        <img src="../images/robot.png" alt="robot" />
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/favicon.png b/proprietary/frameworks/base/tests/resources/assets/webkit/favicon.png
deleted file mode 100755
index fb795a0e7cf9779961419c5736644d3d02f9ff78..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/assets/webkit/favicon.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/fonts.html b/proprietary/frameworks/base/tests/resources/assets/webkit/fonts.html
deleted file mode 100755
index aefd0770876e64e6c466e259fb43a61b879a5e92..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/fonts.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-        <title>Font test page</title>
-    </head>
-    <body>
-        <font face="Standard">Standard ABCdef123</font><br/>
-        <font face="Fixed">Fixed ABCdef123</font><br/>
-        <font face="Sans-Serif">Sans Serif ABCdef123</font><br/>
-        <font face="Serif">Serif ABCdef123</font><br/>
-        <font face="Cursive">Cursive ABCdef123</font><br/>
-        <font face="Fantasy">Fantasy ABCdef123</font><br/>
-    </body>
-</html>
-
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/iframe_blank_tag.html b/proprietary/frameworks/base/tests/resources/assets/webkit/iframe_blank_tag.html
deleted file mode 100755
index fbc6dc69422a3b553fb7ede4130ed9988e8dd9c7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/iframe_blank_tag.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!DOCTYPE html>
-<html>
-<head>
-  <script type='text/javascript'> window.open('page_with_link.html'); </script>
-</head>
-</html>
-
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/javascript.html b/proprietary/frameworks/base/tests/resources/assets/webkit/javascript.html
deleted file mode 100755
index 551931a619cd84b7c71568b30fac5bb112cc9fd5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/javascript.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>javascript off</title>
-    </head>
-    <script type="text/javascript">
-        function changeTitle() {
-            document.title = "javascript on";
-         }
-    </script>
-    <body onload="changeTitle()">
-        Javascript test
-    </body>
-</html>
-
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/jsalert.html b/proprietary/frameworks/base/tests/resources/assets/webkit/jsalert.html
deleted file mode 100755
index c4b35fafbae73391e83a3059d3b27f8c137db283..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/jsalert.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>javascript alert</title>
-    </head>
-    <script type="text/javascript">
-        function fireAlert() {
-            alert("testOnJsAlert");
-        }
-    </script>
-    <body onload="fireAlert()">
-        javascript alert test
-    </body>
-</html>
-
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/jsconfirm.html b/proprietary/frameworks/base/tests/resources/assets/webkit/jsconfirm.html
deleted file mode 100755
index 720c5de1e13d3be5c759af42c4d1ff72d24967d6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/jsconfirm.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>javascript confirm</title>
-    </head>
-    <script type="text/javascript">
-        function fireConfirm() {
-            var res = confirm("testOnJsConfirm");
-            if (res == true) {
-                document.title = "OK";
-            } else {
-                document.title = "Cancel";
-            }
-        }
-    </script>
-    <body onload="fireConfirm()">
-        javascript confirm test
-    </body>
-</html>
-
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/jsform.html b/proprietary/frameworks/base/tests/resources/assets/webkit/jsform.html
deleted file mode 100755
index 4f04b29caaa923b4c267ec3953809dd8718e7dce..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/jsform.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>javascript form</title>
-    </head>
-    <script type="text/javascript">
-        function fireSubmit() {
-            if (location.hash == "") {
-                document.getElementById("formId").submit();
-            }
-        }
-    </script>
-    <body onload="window.setTimeout(function() { fireSubmit(); }, 1000);">
-        javascript form test
-        <form id="formId" action="test.html#result" method="post">
-            <input type="hidden" name="foo" value="bar" />
-        </form>
-    </body>
-</html>
-
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/jsprompt.html b/proprietary/frameworks/base/tests/resources/assets/webkit/jsprompt.html
deleted file mode 100755
index a6b7d57e97d8bdeb0d97cb4769c4d942d5a5692f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/jsprompt.html
+++ /dev/null
@@ -1,31 +0,0 @@
-
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>javascript prompt</title>
-    </head>
-    <script type="text/javascript">
-        function firePrompt() {
-            var res = prompt("testOnJsPrompt");
-            document.title = res;
-        }
-    </script>
-    <body onload="firePrompt()">
-        javascript prompt test
-    </body>
-</html>
-
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/jsunload.html b/proprietary/frameworks/base/tests/resources/assets/webkit/jsunload.html
deleted file mode 100755
index fb0673e0acbc8c5dea47baf12019419d39b90c12..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/jsunload.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>javascript unload</title>
-    </head>
-    <script type="text/javascript">
-        function fireUnload() {
-            return "testOnJsBeforeUnload";
-        }
-        window.onbeforeunload = fireUnload;
-    </script>
-    <body>
-        javascript unload test
-    </body>
-</html>
-
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/jswindow.html b/proprietary/frameworks/base/tests/resources/assets/webkit/jswindow.html
deleted file mode 100755
index 7075d6ee0c38d1bc92ce25d2c52cf797ca252fd2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/jswindow.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>javascript window</title>
-    </head>
-    <script type="text/javascript">
-        var childWindow;
-        function fireOpen() {
-            childWindow = window.open();
-            childWindow.document.title = "javascript child window";
-            childWindow.document.write("javascript child window");
-            setTimeout(function(){childWindow.close();}, 2000);
-        }
-    </script>
-    <body onload="fireOpen()">
-        javascript window test
-    </body>
-</html>
-
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/network_state.html b/proprietary/frameworks/base/tests/resources/assets/webkit/network_state.html
deleted file mode 100755
index 4712b83b85d15da4ea223db00a5a54deea722162..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/network_state.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>uninitialized</title>
-        <script type="text/javascript">
-            function getNetworkState() {
-                if (navigator.onLine) {
-                    document.title = "ONLINE";
-                } else {
-                    document.title = "OFFLINE";
-                }
-            }
-        </script>
-    </head>
-    <body onload="getNetworkState()" ononline="getNetworkState()" onoffline="getNetworkState()">
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/page_with_link.html b/proprietary/frameworks/base/tests/resources/assets/webkit/page_with_link.html
deleted file mode 100755
index 50fb78a4c012cf8cbbf361c62e9aa39be6537305..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/page_with_link.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-  <body>
-    <a href="http://foo.com" id="link">a link</a>
-  </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/popup.html b/proprietary/frameworks/base/tests/resources/assets/webkit/popup.html
deleted file mode 100755
index b5ed6715fc6a40d87cad4f8ef9b34a3a43bf927b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/popup.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>Popup allowed</title>
-    </head>
-    <body>
-        Popup allowed
-    </body>
-</html>
-
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/popup_base.html b/proprietary/frameworks/base/tests/resources/assets/webkit/popup_base.html
deleted file mode 100755
index 6c6e7eb07f76590839dbf20120f3242a192f6660..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/popup_base.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title></title>
-    </head>
-    <script type="text/javascript">
-        function openWindow() {
-            newWindow = window.open("popup.html");
-            if (!newWindow) {
-                document.title = "Popup blocked";
-            }
-         }
-    </script>
-    <body onload="openWindow()">
-        Popup blocked
-    </body>
-</html>
-
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/test_anchor.html b/proprietary/frameworks/base/tests/resources/assets/webkit/test_anchor.html
deleted file mode 100755
index fc5047d602dc830b5f103c95320702902ac43ace..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/test_anchor.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-  <head>
-    <title>PASSING QUERY PARAM FAILED</title>
-  </head>
-  <body>
-    <script>
-      document.title = self.document.location.hash.substring(1);
-    </script>
-  </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/test_blankPage.html b/proprietary/frameworks/base/tests/resources/assets/webkit/test_blankPage.html
deleted file mode 100755
index fbe282d225990126a5acc213b9b9a9885846cc33..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/test_blankPage.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>Blank page</title>
-    </head>
-    <body>
-    <div style="height:100px;width:100px">&nbsp;</div>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/test_br_tag.html b/proprietary/frameworks/base/tests/resources/assets/webkit/test_br_tag.html
deleted file mode 100755
index 39eb2fa2530b1b223c2df905ee86e4c26760af0b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/test_br_tag.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>test br tag</title>
-    </head>
-    <body>
-        <h3>testing br tag</h3>
-        <p>
-            there is a br after line1<br>line2
-        </p>
-        <p>
-            there are two brs after line3<br><br>line 4
-        </p>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/test_databaseaccess.html b/proprietary/frameworks/base/tests/resources/assets/webkit/test_databaseaccess.html
deleted file mode 100755
index dcf7b098f91db3c77fde4b59f1c52b4176f78436..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/test_databaseaccess.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head><title>None</title><script>
-        function checkDatabase() {
-            if ('openDatabase' in window) {
-                var db = window.openDatabase('test', '1.0', 'results', 1*1024*1024);
-            }
-            document.title = db ? "Has database" : "No database";
-        }
-    </script></head>
-    <body onload='checkDatabase()'>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/test_favicon.html b/proprietary/frameworks/base/tests/resources/assets/webkit/test_favicon.html
deleted file mode 100755
index 902a2771433bb12ac0aa574fb31316a07aac52a6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/test_favicon.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>test favicon</title>
-        <link rel="icon" type="image/png" href="favicon.png">
-    </head>
-    <body>
-        <h3>hello favicon!</h3><br>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/test_firstPage.html b/proprietary/frameworks/base/tests/resources/assets/webkit/test_firstPage.html
deleted file mode 100755
index 18a55488b7e94477d0e9eb426dc20702511dca5b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/test_firstPage.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <title>First page</title>
-    <body>
-        <h1>First page</h1>
-        <a href="webView_goBackAndForward_test_secondPage.html">Go to second page</a>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/test_hello_world.html b/proprietary/frameworks/base/tests/resources/assets/webkit/test_hello_world.html
deleted file mode 100755
index 7750a0f28fe8c0c200a199dd8416971058e37cd1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/test_hello_world.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>test hello world</title>
-    </head>
-    <body>
-        <h3>hello world!</h3><br>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/test_iframeaccess.html b/proprietary/frameworks/base/tests/resources/assets/webkit/test_iframeaccess.html
deleted file mode 100755
index 1b5fc5abd6ead43411ca26b9c00e4b40090e06e2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/test_iframeaccess.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>DEFAULT TITLE</title>
-        <script type="text/javascript">
-          function load() {
-            document.title = document.getElementById('frame').contentWindow.location.href;
-          }
-         </script>
-    </head>
-    <body onload="load()">
-      <iframe id="frame" src="./test_hello_world.html"></iframe>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/test_imageaccess.html b/proprietary/frameworks/base/tests/resources/assets/webkit/test_imageaccess.html
deleted file mode 100755
index ce76c830eb55fbde08dd353a0c54f19ce1084109..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/test_imageaccess.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>TEST FAILED</title>
-    </head>
-    <body>
-        <img id='img' src="../images/tomato.png" onload="success()" />
-        <script>
-            function success() {
-              document.title=document.getElementById('img').naturalHeight;
-            }
-        </script>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/test_jsInterface.html b/proprietary/frameworks/base/tests/resources/assets/webkit/test_jsInterface.html
deleted file mode 100755
index 662dfe03590f5e5def6992f13fdb0abe8f54d6ea..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/test_jsInterface.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <title>Original title</title>
-    <!-- Calls into the javascript interface for the activity -->
-    <body onload='window.dummy.provideResult(document.title)'>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/test_queryparam.html b/proprietary/frameworks/base/tests/resources/assets/webkit/test_queryparam.html
deleted file mode 100755
index 68b54e44e0ba8fd731cb7b4fd1588ca9a9221834..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/test_queryparam.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-  <head>
-    <title>PASSING QUERY PARAM FAILED</title>
-  </head>
-  <body>
-    <script>
-      query = window.location.search.substring(1);
-      args = query.split('&');
-      param = new Array();
-      for (var i = 0; i < args.length; i++) {
-        tokens = args[i].split('=');
-        param[tokens[0]]=tokens[1];
-      }
-      if (param['val']) document.title = param['val'];
-    </script>
-  </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/test_secondPage.html b/proprietary/frameworks/base/tests/resources/assets/webkit/test_secondPage.html
deleted file mode 100755
index ea8e2a18111c4478af08682d316d413c3a6d9e2c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/test_secondPage.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <title>Second page</title>
-    <body>
-        <h1>Second page</h1>
-        <a href="webView_goBackAndForward_test_thirdPage.html">Go to third page</a>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/test_stop_loading.html b/proprietary/frameworks/base/tests/resources/assets/webkit/test_stop_loading.html
deleted file mode 100755
index 1f0fc726661c23f6616eaa3295d1dcbbd7500af8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/test_stop_loading.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>Stop Loading test</title>
-    </head>
-    <body onload="window.javabridge.pageLoaded()">
-        <h3>hello world!</h3><br>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/test_thirdPage.html b/proprietary/frameworks/base/tests/resources/assets/webkit/test_thirdPage.html
deleted file mode 100755
index 1784c3203b824333f91a1e754fd1dc0a17d10de0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/test_thirdPage.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <title>Third page</title>
-    <body>
-        <h1>Third page</h1>
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/resources/assets/webkit/test_timer.html b/proprietary/frameworks/base/tests/resources/assets/webkit/test_timer.html
deleted file mode 100755
index 5e8496fd39b72f4a5435112d8fdebf1ccef66f41..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/assets/webkit/test_timer.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<html>
-    <head>
-        <title>0</title>
-        <script type="text/javascript">
-            var counter = 0;
-
-            function updateTitle() {
-                counter += 1;
-                document.title = counter;
-                document.getElementById("COUNTER").innerHTML = counter;
-            }
-
-            function startTimer() {
-                setInterval('updateTitle()', 1000);
-            }
-        </script>
-    </head>
-    <body onload="startTimer()">
-    Timer test <span id="COUNTER">0</span>.
-    </body>
-</html>
diff --git a/proprietary/frameworks/base/tests/resources/res/anim/accelerate_alpha.xml b/proprietary/frameworks/base/tests/resources/res/anim/accelerate_alpha.xml
deleted file mode 100755
index 594652b4bbf4f303885f11c4e122439b0dee0c27..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/anim/accelerate_alpha.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/accelerate_interpolator"
-    android:fromAlpha="0.1"
-    android:toAlpha="0.9"
-    android:duration="1000" />
diff --git a/proprietary/frameworks/base/tests/resources/res/anim/accelerate_decelerate_alpha.xml b/proprietary/frameworks/base/tests/resources/res/anim/accelerate_decelerate_alpha.xml
deleted file mode 100755
index 7c892b2190eb48f36e5f413cfd4faf7331361603..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/anim/accelerate_decelerate_alpha.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
-    android:fromAlpha="0.0"
-    android:toAlpha="1.0"
-    android:duration="2000" />
diff --git a/proprietary/frameworks/base/tests/resources/res/anim/alpha.xml b/proprietary/frameworks/base/tests/resources/res/anim/alpha.xml
deleted file mode 100755
index 8893d6606829ed2fa737e86e23d8da45ce2f4b61..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/anim/alpha.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-       android:fromAlpha="0.0"
-       android:toAlpha="1.0"
-       android:duration="500" />
diff --git a/proprietary/frameworks/base/tests/resources/res/anim/anim_alpha.xml b/proprietary/frameworks/base/tests/resources/res/anim/anim_alpha.xml
deleted file mode 100755
index b5794c31c926511b935d2504975b5b09b83cc530..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/anim/anim_alpha.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-       android:interpolator="@android:anim/accelerate_interpolator"
-       android:fromAlpha="0.0"
-       android:toAlpha="1.0"
-       android:duration="500" />
-
diff --git a/proprietary/frameworks/base/tests/resources/res/anim/anim_gridlayout.xml b/proprietary/frameworks/base/tests/resources/res/anim/anim_gridlayout.xml
deleted file mode 100755
index be42d76e474331c70a489e8541a43bf209647cdd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/anim/anim_gridlayout.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<gridLayoutAnimation xmlns:android="http://schemas.android.com/apk/res/android"
-        android:delay="10%"
-        android:rowDelay="50%"
-        android:directionPriority="column"
-        android:animation="@anim/anim_alpha" />
diff --git a/proprietary/frameworks/base/tests/resources/res/anim/anim_rotate.xml b/proprietary/frameworks/base/tests/resources/res/anim/anim_rotate.xml
deleted file mode 100755
index 4fbadcff6130d3254556b91f13ec5ecf15d0d4be..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/anim/anim_rotate.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/decelerate_interpolator"
-    android:fromDegrees="0"
-    android:toDegrees="-45"
-    android:toYScale="0.0"
-    android:pivotX="50%"
-    android:pivotY="50%"
-    android:duration="700" />
diff --git a/proprietary/frameworks/base/tests/resources/res/anim/anim_scale.xml b/proprietary/frameworks/base/tests/resources/res/anim/anim_scale.xml
deleted file mode 100755
index 96a3e28e13317d980e7bac1769b858c259135ef8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/anim/anim_scale.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<scale xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
-    android:fromXScale="1.0"
-    android:toXScale="1.4"
-    android:fromYScale="1.0"
-    android:toYScale="0.6"
-    android:pivotX="50%"
-    android:pivotY="50%"
-    android:fillAfter="false"
-    android:duration="600" />
diff --git a/proprietary/frameworks/base/tests/resources/res/anim/anim_set.xml b/proprietary/frameworks/base/tests/resources/res/anim/anim_set.xml
deleted file mode 100755
index 7d139a8947b0a5988732b8edb057326ce0799abe..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/anim/anim_set.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false">
-
-    <scale
-        android:interpolator="@android:anim/accelerate_decelerate_interpolator"
-        android:fromXScale="1.0"
-        android:toXScale="1.4"
-        android:fromYScale="1.0"
-        android:toYScale="0.6"
-        android:pivotX="50%"
-        android:pivotY="50%"
-        android:fillAfter="false"
-        android:duration="900" />
-
-    <set
-        android:interpolator="@android:anim/accelerate_interpolator"
-                android:startOffset="700">
-
-        <scale
-            android:fromXScale="1.4"
-            android:toXScale="0.0"
-            android:fromYScale="0.6"
-            android:toYScale="0.0"
-            android:pivotX="50%"
-            android:pivotY="50%"
-            android:duration="400" />
-
-        <rotate
-            android:fromDegrees="0"
-            android:toDegrees="-45"
-            android:toYScale="0.0"
-            android:pivotX="50%"
-            android:pivotY="50%"
-            android:duration="400" />
-    </set>
-
-</set>
diff --git a/proprietary/frameworks/base/tests/resources/res/anim/anim_translate.xml b/proprietary/frameworks/base/tests/resources/res/anim/anim_translate.xml
deleted file mode 100755
index 6659c2bafff5ccefd910edafa7df95dddcfb3ec3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/anim/anim_translate.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/accelerate_interpolator"
-    android:fromXDelta="100%p"
-    android:toXDelta="0"
-    android:fromYDelta="100%p"
-    android:toYDelta="0"
-    android:duration="800" />
diff --git a/proprietary/frameworks/base/tests/resources/res/anim/cycle_alpha.xml b/proprietary/frameworks/base/tests/resources/res/anim/cycle_alpha.xml
deleted file mode 100755
index 0a3b53c8d88d88d45f65f535e22910607e7a65c1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/anim/cycle_alpha.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-       android:interpolator="@anim/cycle_interpolator"
-       android:fromAlpha="0.0"
-       android:toAlpha="1.0"
-       android:duration="2000" />
diff --git a/proprietary/frameworks/base/tests/resources/res/anim/cycle_interpolator.xml b/proprietary/frameworks/base/tests/resources/res/anim/cycle_interpolator.xml
deleted file mode 100755
index d1586e5301ad636f7660a4d34652d32a369b3a6e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/anim/cycle_interpolator.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
- <cycleInterpolator xmlns:android="http://schemas.android.com/apk/res/android" android:cycles="1" />
diff --git a/proprietary/frameworks/base/tests/resources/res/anim/decelerate_alpha.xml b/proprietary/frameworks/base/tests/resources/res/anim/decelerate_alpha.xml
deleted file mode 100755
index 793807ee9831a1f629451c51c57d1273cc59ee00..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/anim/decelerate_alpha.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/decelerate_interpolator"
-    android:fromAlpha="0.0"
-    android:toAlpha="1.0"
-    android:duration="2000" />
diff --git a/proprietary/frameworks/base/tests/resources/res/anim/layout_anim_controller_animation.xml b/proprietary/frameworks/base/tests/resources/res/anim/layout_anim_controller_animation.xml
deleted file mode 100755
index 1e3608c6fb1dc042e7a15a6dd2080eb091f70149..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/anim/layout_anim_controller_animation.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-       android:interpolator="@android:anim/accelerate_interpolator"
-       android:fillAfter="true"
-       android:fromAlpha="0.0"
-       android:toAlpha="1.0"
-       android:duration="1000" />
diff --git a/proprietary/frameworks/base/tests/resources/res/anim/lineartest.xml b/proprietary/frameworks/base/tests/resources/res/anim/lineartest.xml
deleted file mode 100755
index 7a4162889ef54ce2c850e58227d3e055336d4fe9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/anim/lineartest.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<screenplay>
-     <paint id="paint" antiAlias="true">
-         <color id="col" color="gray"/>
-     </paint>
-     <event kind="onLoad">
-         <add id="addPaint" use="paint"/>
-         <text y="15" text="hello"/>
-     </event>
-     <event kind="keyPress" code="up">
-         <apply scope="addPaint">
-             <set target="paint" field="linearText" to="true"/>
-             <set target="col" field="color" to="black"/>
-             <animate target="paint" id="grow" field="textSize" from="12" to="15" dur=".25"/>
-         </apply>
-     </event>
-     <event kind="onEnd" target="grow">
-         <apply scope="addPaint">
-             <set target="paint" field="linearText" to="false"/>
-         </apply>
-     </event>
-     <event kind="keyPress" code="down">
-         <apply scope="addPaint">
-             <set target="col" field="color" to="gray"/>
-             <animate target="paint" id="shrink" field="textSize" from="15" to="12" dur=".25"/>
-         </apply>
-     </event>
-     <event kind="onEnd" target="shrink">
-         <apply scope="addPaint">
-             <set target="paint" field="linearText" to="false"/>
-         </apply>
-     </event>
- </screenplay>
diff --git a/proprietary/frameworks/base/tests/resources/res/anim/move_ani.xml b/proprietary/frameworks/base/tests/resources/res/anim/move_ani.xml
deleted file mode 100755
index b691c0d226c98ec149d80996d3119b7fb8130af8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/anim/move_ani.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-           android:fromXDelta="0"
-           android:toXDelta="4"
-           android:duration="2000"
-           android:interpolator="@anim/move_cycle" />
diff --git a/proprietary/frameworks/base/tests/resources/res/anim/move_cycle.xml b/proprietary/frameworks/base/tests/resources/res/anim/move_cycle.xml
deleted file mode 100755
index 2e2233a3a7c1bd77b59a90398e6defbd41d7f862..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/anim/move_cycle.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<cycleInterpolator xmlns:android="http://schemas.android.com/apk/res/android" android:cycles="20" />
diff --git a/proprietary/frameworks/base/tests/resources/res/anim/movie_test.xml b/proprietary/frameworks/base/tests/resources/res/anim/movie_test.xml
deleted file mode 100755
index dcebd16c065ea547ad0f5a54f8cc7a8826bac527..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/anim/movie_test.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<screenplay>
-    <event kind="onLoad">
-        <movie src="lineartest.xml"/>
-    </event>
-</screenplay>
diff --git a/proprietary/frameworks/base/tests/resources/res/color/color1.xml b/proprietary/frameworks/base/tests/resources/res/color/color1.xml
deleted file mode 100755
index 87034fa2aeb0574083807f0c668fb7b20aecd698..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/color/color1.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true" android:color="@color/testcolor1"/>
-    <item android:color="@color/testcolor2"/>
-</selector>
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_clip_path_1_golden.png b/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_clip_path_1_golden.png
deleted file mode 100755
index be487d1118f6e41ec6ad898f35401514b34ad128..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_clip_path_1_golden.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_create_golden.png b/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_create_golden.png
deleted file mode 100755
index 943fce5392c1f032b0858ba8e50fdb3f8a690cba..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_create_golden.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_delete_golden.png b/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_delete_golden.png
deleted file mode 100755
index b46363e3b9c55c5bcca42d6126aa8836e053fb29..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_delete_golden.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_heart_golden.png b/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_heart_golden.png
deleted file mode 100755
index 745075164d0cd4032236c415e06844e6f2d86523..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_heart_golden.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_random_path_1_golden.png b/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_random_path_1_golden.png
deleted file mode 100755
index 91776a969325ad369e873959c18716e2df097ae1..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_random_path_1_golden.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_random_path_2_golden.png b/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_random_path_2_golden.png
deleted file mode 100755
index 9af40a34f83a331345d5669981ed3c3bbdd147b0..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_random_path_2_golden.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_render_order_1_golden.png b/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_render_order_1_golden.png
deleted file mode 100755
index ea3be9436f64e00cee595909c81815e8d683778e..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_render_order_1_golden.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_render_order_2_golden.png b/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_render_order_2_golden.png
deleted file mode 100755
index f317901554a195b9736dd7802f583740830ba543..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_render_order_2_golden.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_repeated_a_1_golden.png b/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_repeated_a_1_golden.png
deleted file mode 100755
index b3acfe780f4473eda8692d2b786ea69ea7a26f1d..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_repeated_a_1_golden.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_repeated_a_2_golden.png b/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_repeated_a_2_golden.png
deleted file mode 100755
index bbc84b97b5768fdf0865084ec9c89d02c0eb820c..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_repeated_a_2_golden.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_repeated_cq_golden.png b/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_repeated_cq_golden.png
deleted file mode 100755
index 8d73cfdffc8aab19c60183cd0e7f751e663b119b..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_repeated_cq_golden.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_repeated_st_golden.png b/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_repeated_st_golden.png
deleted file mode 100755
index 6094a9a91438a910d1e318f8286b419c508ff980..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_repeated_st_golden.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_schedule_golden.png b/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_schedule_golden.png
deleted file mode 100755
index 9822bc2ca602bd5a48fd69a1840ac66d87012844..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_schedule_golden.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_settings_golden.png b/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_settings_golden.png
deleted file mode 100755
index d12b142ed20eaa1483a370943dd008edc672456b..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_settings_golden.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_stroke_1_golden.png b/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_stroke_1_golden.png
deleted file mode 100755
index c57ad20e0dcd0de78118ce529252f407ef0fd6ad..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_stroke_1_golden.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_stroke_2_golden.png b/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_stroke_2_golden.png
deleted file mode 100755
index aee8ff5ac30046f9f778670da975047b2f1030c0..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_stroke_2_golden.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_stroke_3_golden.png b/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_stroke_3_golden.png
deleted file mode 100755
index 1212fb3573bd87f1463c8e8e500a6af179a9e889..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_stroke_3_golden.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_transformation_1_golden.png b/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_transformation_1_golden.png
deleted file mode 100755
index baf418dbe3022c2f16e14cc857bf508ae081e22f..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_transformation_1_golden.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_transformation_2_golden.png b/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_transformation_2_golden.png
deleted file mode 100755
index e0e14f3a44c8007c4a41da92fc92ee97ebb1ecea..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_transformation_2_golden.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_transformation_3_golden.png b/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_transformation_3_golden.png
deleted file mode 100755
index b6798c2159961cf9056d502e0e2646fbb08356a8..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_transformation_3_golden.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_transformation_4_golden.png b/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_transformation_4_golden.png
deleted file mode 100755
index a5d4d33596955252b1ae29e83facb130fe0bb445..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_transformation_4_golden.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_transformation_5_golden.png b/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_transformation_5_golden.png
deleted file mode 100755
index 0d8ded1da4595463dac1fd7437e3efe2e8e298ed..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_transformation_5_golden.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_transformation_6_golden.png b/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_transformation_6_golden.png
deleted file mode 100755
index 64d07fada5606546ea46d468a264c0f57e3635e7..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable-nodpi/vector_icon_transformation_6_golden.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/alpha.png b/proprietary/frameworks/base/tests/resources/res/drawable/alpha.png
deleted file mode 100755
index 8a88548739d1249f1fb960773da9ca414c495235..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/alpha.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/animated.gif b/proprietary/frameworks/base/tests/resources/res/drawable/animated.gif
deleted file mode 100755
index 51baf1586394be7feae3bd475fb31e96f47c0f86..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/animated.gif and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/animationdrawable.xml b/proprietary/frameworks/base/tests/resources/res/drawable/animationdrawable.xml
deleted file mode 100755
index 67569661b187f4b241ff459d97a5cbee00a9f9bb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/animationdrawable.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android" android:oneshot="false">
-    <item android:drawable="@drawable/testimage" android:duration="3000"/>
-    <item android:drawable="@drawable/pass" android:duration="2000"/>
-    <item android:drawable="@drawable/scenery" android:duration="1000"/>
-</animation-list>
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/baseline_jpeg.jpg b/proprietary/frameworks/base/tests/resources/res/drawable/baseline_jpeg.jpg
deleted file mode 100755
index ed5251c846b9832d4984aa575d9ee8369e6f6681..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/baseline_jpeg.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/baseline_restart_jpeg.jpg b/proprietary/frameworks/base/tests/resources/res/drawable/baseline_restart_jpeg.jpg
deleted file mode 100755
index 00dcc5b2eae25bc6bc830a464c497dad296f9e78..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/baseline_restart_jpeg.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/bitmapdrawable_theme.xml b/proprietary/frameworks/base/tests/resources/res/drawable/bitmapdrawable_theme.xml
deleted file mode 100755
index 6df36b36408e66dd82f3aa2305de51f8260a3fc5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/bitmapdrawable_theme.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
-    
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-    
-          http://www.apache.org/licenses/LICENSE-2.0
-    
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:antialias="?attr/themeBoolean"
-    android:autoMirrored="?attr/themeBoolean"
-    android:dither="?attr/themeBoolean"
-    android:filter="?attr/themeBoolean"
-    android:gravity="?attr/themeGravity"
-    android:mipMap="?attr/themeBoolean"
-    android:src="?attr/themeBitmap"
-    android:tileMode="?attr/themeTileMode" />
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/bmp_test.bmp b/proprietary/frameworks/base/tests/resources/res/drawable/bmp_test.bmp
deleted file mode 100755
index 5ec6dd4d93bc0dfda5810fdc9ed43fba2beb4559..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/bmp_test.bmp and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/colordrawable_test.xml b/proprietary/frameworks/base/tests/resources/res/drawable/colordrawable_test.xml
deleted file mode 100755
index 9d2f390e6bf638744b2db72dca4e0d1aae791234..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/colordrawable_test.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<ColorDrawable xmlns:android="http://schemas.android.com/apk/res/android" android:color="#02000000">
-    <solid android:color="#02000000"/>
-</ColorDrawable>
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/colordrawable_theme.xml b/proprietary/frameworks/base/tests/resources/res/drawable/colordrawable_theme.xml
deleted file mode 100755
index 00c6fe712061d31e65a0663e1ea13b5b5728e1c1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/colordrawable_theme.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
-    
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-    
-          http://www.apache.org/licenses/LICENSE-2.0
-    
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<color xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?attr/themeColor" />
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/colorstatelist_test.xml b/proprietary/frameworks/base/tests/resources/res/drawable/colorstatelist_test.xml
deleted file mode 100755
index c86a1a78df2b0876a9e2c26229370622fd3fe4c6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/colorstatelist_test.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-   <item android:state_focused="true" android:color="@color/resource_test_color"/>
-   <item android:state_pressed="true" android:state_enabled="false" android:color="@color/resource_test_color"/>
-   <item android:state_enabled="false" android:color="@color/resource_test_color"/>
-   <item android:state_active="true" android:color="@color/resource_test_color"/>
-   <item android:color="@color/resource_test_color"/>
- </selector>
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/faces.jpg b/proprietary/frameworks/base/tests/resources/res/drawable/faces.jpg
deleted file mode 100755
index 0672022bc4afa6e44ff83169d7d61a4dc3c5b960..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/faces.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/failed.jpg b/proprietary/frameworks/base/tests/resources/res/drawable/failed.jpg
deleted file mode 100755
index 1bb9b5280f87d7350d43a24d5b8d7d0b89a8c908..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/failed.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/gif_test.gif b/proprietary/frameworks/base/tests/resources/res/drawable/gif_test.gif
deleted file mode 100755
index d1c2815db8cf0b985684fc72b2c292a52c0ebf68..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/gif_test.gif and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/google_logo_1.png b/proprietary/frameworks/base/tests/resources/res/drawable/google_logo_1.png
deleted file mode 100755
index 6e038fc818c0d39a047e8cea2c043f5bb61dc5b3..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/google_logo_1.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/google_logo_2.webp b/proprietary/frameworks/base/tests/resources/res/drawable/google_logo_2.webp
deleted file mode 100755
index f92c42bfbe2d291debead206675c1108bb0dac26..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/google_logo_2.webp and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/gradientdrawable.xml b/proprietary/frameworks/base/tests/resources/res/drawable/gradientdrawable.xml
deleted file mode 100755
index ed8ff961a48b047bc68649963c5a9b602c46df15..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/gradientdrawable.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient android:startColor="#ffffffff" android:centerColor="#ffff0000"
-              android:endColor="#0000ffff" />
-    <corners android:radius="8px" />
-    <padding android:left="4px" android:top="2px"
-             android:right="6px" android:bottom="10px" />
-    <size android:width="42px" android:height="63px"/>
-</shape>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/gradientdrawable_radius_base.xml b/proprietary/frameworks/base/tests/resources/res/drawable/gradientdrawable_radius_base.xml
deleted file mode 100755
index ecd50f8dae1930c866883a532956ec3eff7c44f2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/gradientdrawable_radius_base.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <gradient
-        android:centerColor="#ffff0000"
-        android:endColor="#0000ffff"
-        android:gradientRadius="50%"
-        android:startColor="#ffffffff"
-        android:type="radial" />
-
-    <corners android:radius="8px" />
-
-    <padding
-        android:bottom="10px"
-        android:left="4px"
-        android:right="6px"
-        android:top="2px" />
-
-    <size
-        android:height="50px"
-        android:width="50px" />
-
-</shape>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/gradientdrawable_radius_parent.xml b/proprietary/frameworks/base/tests/resources/res/drawable/gradientdrawable_radius_parent.xml
deleted file mode 100755
index 73d116a8cf8da88b52a966cc4a1dbfaa432a044b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/gradientdrawable_radius_parent.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <gradient
-        android:centerColor="#ffff0000"
-        android:endColor="#0000ffff"
-        android:gradientRadius="50%p"
-        android:startColor="#ffffffff"
-        android:type="radial" />
-
-    <corners android:radius="8px" />
-
-    <padding
-        android:bottom="10px"
-        android:left="4px"
-        android:right="6px"
-        android:top="2px" />
-
-    <size
-        android:height="50px"
-        android:width="50px" />
-
-</shape>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/gradientdrawable_theme.xml b/proprietary/frameworks/base/tests/resources/res/drawable/gradientdrawable_theme.xml
deleted file mode 100755
index 68cec626a4f6829018267ba9aae1a54ca609d0c6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/gradientdrawable_theme.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
-    
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-    
-          http://www.apache.org/licenses/LICENSE-2.0
-    
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <corners
-        android:bottomLeftRadius="?attr/themeDimension"
-        android:bottomRightRadius="?attr/themeDimension"
-        android:topLeftRadius="?attr/themeDimension"
-        android:topRightRadius="?attr/themeDimension" />
-
-    <gradient
-        android:angle="?attr/themeAngle"
-        android:centerColor="?attr/themeColor"
-        android:centerX="?attr/themeFloat"
-        android:centerY="?attr/themeFloat"
-        android:endColor="?attr/themeColor"
-        android:gradientRadius="?attr/themeFloat"
-        android:startColor="?attr/themeColor"
-        android:useLevel="?attr/themeBoolean" />
-
-    <padding
-        android:bottom="?attr/themeDimension"
-        android:left="?attr/themeDimension"
-        android:right="?attr/themeDimension"
-        android:top="?attr/themeDimension" />
-
-    <size
-        android:height="?attr/themeDimension"
-        android:width="?attr/themeDimension" />
-
-    <solid android:color="?attr/themeColor" />
-
-    <stroke android:color="?attr/themeColor" />
-
-</shape>
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/ic_cts_minitab_selected.png b/proprietary/frameworks/base/tests/resources/res/drawable/ic_cts_minitab_selected.png
deleted file mode 100755
index c730050f1dfe4fa2d28d3c73dc2e04955fcf9e96..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/ic_cts_minitab_selected.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/ic_cts_selected.png b/proprietary/frameworks/base/tests/resources/res/drawable/ic_cts_selected.png
deleted file mode 100755
index 72a065cb85f1f927a9893e0b468e235245688f89..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/ic_cts_selected.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/icon_black.jpg b/proprietary/frameworks/base/tests/resources/res/drawable/icon_black.jpg
deleted file mode 100755
index 4c9062a6da91a533488f894e04f20a2e99376152..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/icon_black.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/icon_blue.jpg b/proprietary/frameworks/base/tests/resources/res/drawable/icon_blue.jpg
deleted file mode 100755
index 9e6c1c86b1f544da8568e2918b008f4dcc35ba73..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/icon_blue.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/icon_green.jpg b/proprietary/frameworks/base/tests/resources/res/drawable/icon_green.jpg
deleted file mode 100755
index 55a78f208295c8636282f47ae7fd17fbe4ce7af4..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/icon_green.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/icon_red.jpg b/proprietary/frameworks/base/tests/resources/res/drawable/icon_red.jpg
deleted file mode 100755
index 6bc9e1ff608ba23d17cdcad9f39576b408cf6dc6..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/icon_red.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/icon_yellow.jpg b/proprietary/frameworks/base/tests/resources/res/drawable/icon_yellow.jpg
deleted file mode 100755
index e74805906008dae8048faa82b439578e57bd75d4..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/icon_yellow.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/insetdrawable.xml b/proprietary/frameworks/base/tests/resources/res/drawable/insetdrawable.xml
deleted file mode 100755
index 8431c69a65a2e2a007f71933c4ab729d42dcf407..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/insetdrawable.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/testimage"/>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/layerdrawable.xml b/proprietary/frameworks/base/tests/resources/res/drawable/layerdrawable.xml
deleted file mode 100755
index 521703b32caa2342b52a9d9240cbf3bb2f32a0ee..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/layerdrawable.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/testimage"/>
-    <item android:drawable="@drawable/start"/>
-</layer-list>
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/layerdrawable_theme.xml b/proprietary/frameworks/base/tests/resources/res/drawable/layerdrawable_theme.xml
deleted file mode 100755
index 2a678ff9105ce5d13ef7d21f5c3699f893db7e90..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/layerdrawable_theme.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
-    
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-    
-          http://www.apache.org/licenses/LICENSE-2.0
-    
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:autoMirrored="?attr/themeBoolean" >
-
-    <item android:drawable="@drawable/bitmapdrawable_theme"/>
-    <item>
-        <nine-patch
-            android:autoMirrored="?attr/themeBoolean"
-            android:dither="?attr/themeBoolean"
-            android:src="?attr/themeNinePatch" />
-    </item>
-
-</layer-list>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/levellistdrawable.xml b/proprietary/frameworks/base/tests/resources/res/drawable/levellistdrawable.xml
deleted file mode 100755
index 8fa93e89046dec16cd9b99909bbb4e37db3bda8e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/levellistdrawable.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:maxLevel="50" android:drawable="@drawable/testimage"/>
-    <item android:maxLevel="100" android:drawable="@drawable/start"/>
-</level-list>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/ninepatch_0.9.png b/proprietary/frameworks/base/tests/resources/res/drawable/ninepatch_0.9.png
deleted file mode 100755
index 24019d8fda78d106d1a1607d32a6a965adc1a792..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/ninepatch_0.9.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/ninepatch_1.9.png b/proprietary/frameworks/base/tests/resources/res/drawable/ninepatch_1.9.png
deleted file mode 100755
index c56b1dbb14f2962d7c6257f1f5fb1efaa26bfd62..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/ninepatch_1.9.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/ninepatchdrawable.xml b/proprietary/frameworks/base/tests/resources/res/drawable/ninepatchdrawable.xml
deleted file mode 100755
index 6e72457ade08ddac76abcfe24686f6e814e300d5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/ninepatchdrawable.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<nine-patch xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ninepatch_0"
-    android:dither="true"
-/>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/ninepatchdrawable_theme.xml b/proprietary/frameworks/base/tests/resources/res/drawable/ninepatchdrawable_theme.xml
deleted file mode 100755
index bb031a52c373c4817f3ecce0d6e0f852c3e741d5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/ninepatchdrawable_theme.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
-    
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-    
-          http://www.apache.org/licenses/LICENSE-2.0
-    
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<nine-patch xmlns:android="http://schemas.android.com/apk/res/android"
-    android:autoMirrored="?attr/themeBoolean"
-    android:dither="?attr/themeBoolean"
-    android:src="?attr/themeNinePatch" />
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/no_padding.png b/proprietary/frameworks/base/tests/resources/res/drawable/no_padding.png
deleted file mode 100755
index 7d4c27cb4d583c54c562cce4e978c067fe9d37f6..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/no_padding.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/opaque.9.png b/proprietary/frameworks/base/tests/resources/res/drawable/opaque.9.png
deleted file mode 100755
index a60f6d84a475464cf9efd41a63188aa2294b9fd2..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/opaque.9.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/padding_0.9.png b/proprietary/frameworks/base/tests/resources/res/drawable/padding_0.9.png
deleted file mode 100755
index 0127bf4d0ccb1a55a162170c8346892edff27cc2..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/padding_0.9.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/paintdrawable_attr.xml b/proprietary/frameworks/base/tests/resources/res/drawable/paintdrawable_attr.xml
deleted file mode 100755
index 444e5e2f9c3190ee8819e0893e4b5d3ca8b0a294..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/paintdrawable_attr.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-<shape  xmlns:android="http://schemas.android.com/apk/res/android"
-        android:shape="rectangle">
-
-        <solid
-            android:color="#00000000"/>
-
-        <stroke
-            android:width="2dp"
-            android:color="#ff000000"/>
-
-        <padding
-            android:paddingLeft="1dp"
-            android:paddingRight="10dp"
-            android:paddingTop="1dp"
-            android:paddingBottom="10dp"/>
-
-        <corners
-            android:radius="9dp"
-            android:bottomRightRadius="8dp"
-            android:bottomLeftRadius="8dp"
-            android:topLeftRadius="0.5dp"
-            android:topRightRadius="0.5dp"/>
-
-</shape>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/pass.jpg b/proprietary/frameworks/base/tests/resources/res/drawable/pass.jpg
deleted file mode 100755
index 2f4b083c1890957c3e36a17225201c43eada7e49..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/pass.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/png_test.png b/proprietary/frameworks/base/tests/resources/res/drawable/png_test.png
deleted file mode 100755
index 523005168f726942e59f502a9d2d3c1da86c16a8..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/png_test.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/premul_data.png b/proprietary/frameworks/base/tests/resources/res/drawable/premul_data.png
deleted file mode 100755
index 92d7e376db271ea79e2f562f9ff8b428ebdb741d..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/premul_data.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/progressive_jpeg.jpg b/proprietary/frameworks/base/tests/resources/res/drawable/progressive_jpeg.jpg
deleted file mode 100755
index 6b58be435ae5a0cf2473e24c6d01aee7639497f2..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/progressive_jpeg.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/progressive_restart_jpeg.jpg b/proprietary/frameworks/base/tests/resources/res/drawable/progressive_restart_jpeg.jpg
deleted file mode 100755
index 352c7a82cbbeb222722cb782ac6c6a62eb9a44f1..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/progressive_restart_jpeg.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/rippledrawable_theme.xml b/proprietary/frameworks/base/tests/resources/res/drawable/rippledrawable_theme.xml
deleted file mode 100755
index a49b82029132304c09401e482f791351f474f520..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/rippledrawable_theme.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?attr/themeColor" />
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/robot.png b/proprietary/frameworks/base/tests/resources/res/drawable/robot.png
deleted file mode 100755
index 8a9e6984be96ea93dcb63ae1973e530bdfb1eda0..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/robot.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/rotatedrawable.xml b/proprietary/frameworks/base/tests/resources/res/drawable/rotatedrawable.xml
deleted file mode 100755
index b9b2cfe38c155d836d9aa3b06d14e4e8f97954d0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/rotatedrawable.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:pivotX="50%" android:pivotY="50%"
-    android:fromDegrees="0" android:toDegrees="360"
-    android:drawable="@drawable/testimage"/>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/scaled1.png b/proprietary/frameworks/base/tests/resources/res/drawable/scaled1.png
deleted file mode 100755
index 2dad42162456605cb23d57e868a8275bf564157a..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/scaled1.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/scaled2.png b/proprietary/frameworks/base/tests/resources/res/drawable/scaled2.png
deleted file mode 100755
index 6d6a94f206c72ff97538c6c5a8255b208670f481..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/scaled2.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/scaledrawable.xml b/proprietary/frameworks/base/tests/resources/res/drawable/scaledrawable.xml
deleted file mode 100755
index 7e65dce18ebbf1b13a38ae5a29eb57ebac55bca5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/scaledrawable.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<scale xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fromXScale="1.0"
-    android:toXScale="1.4"
-    android:fromYScale="1.0"
-    android:toYScale="0.6"
-    android:drawable="@drawable/testimage"/>
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/scenery.jpg b/proprietary/frameworks/base/tests/resources/res/drawable/scenery.jpg
deleted file mode 100755
index 7a6145b39348dcdf5481ee58d8640f450742a9c9..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/scenery.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/shapedrawable_test.xml b/proprietary/frameworks/base/tests/resources/res/drawable/shapedrawable_test.xml
deleted file mode 100755
index 02da9f8428f59e2a185bca778b4f0b20d6b62cc3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/shapedrawable_test.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<MockShapeDrawable xmlns:android="http://schemas.android.com/apk/res/android"
-       android:color="#00000000" android:width="42px" android:height="63px">
-    <padding android:left="1px" android:top="2px" android:right="3px" android:bottom="4px"/>
-    <testattrs android:id="@id/background"/>
-</MockShapeDrawable>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/size_48x48.jpg b/proprietary/frameworks/base/tests/resources/res/drawable/size_48x48.jpg
deleted file mode 100755
index 5c2291e3e580c9b6bfbafccd6f75ea472ecf6141..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/size_48x48.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/start.jpg b/proprietary/frameworks/base/tests/resources/res/drawable/start.jpg
deleted file mode 100755
index 54e05e0d4b238bf9a5a1f4a54161b3331f8c0554..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/start.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/statelist_testimage.jpg b/proprietary/frameworks/base/tests/resources/res/drawable/statelist_testimage.jpg
deleted file mode 100755
index 754df0ce5502e79ac8a7c114901b4dcfe7aa9104..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/statelist_testimage.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/statelistdrawable.xml b/proprietary/frameworks/base/tests/resources/res/drawable/statelistdrawable.xml
deleted file mode 100755
index b867904590726e79230aa6e7a93265e83231626e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/statelistdrawable.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-   <item android:state_focused="true" android:drawable="@drawable/statelist_testimage"/>
-   <item android:state_enabled="false" android:drawable="@drawable/statelist_testimage"/>
-</selector>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/testcolor.xml b/proprietary/frameworks/base/tests/resources/res/drawable/testcolor.xml
deleted file mode 100755
index d7b2718f6c9e931b9d8eb57f6591bca818a33225..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/testcolor.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="#FFA6C839"/>
-</selector>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/testimage.jpg b/proprietary/frameworks/base/tests/resources/res/drawable/testimage.jpg
deleted file mode 100755
index 754df0ce5502e79ac8a7c114901b4dcfe7aa9104..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/testimage.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/transition_test.xml b/proprietary/frameworks/base/tests/resources/res/drawable/transition_test.xml
deleted file mode 100755
index 3d62378f04b2ccbefbcd523c55aecd3d4f0772db..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/transition_test.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<transition xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item >
-        <color android:color="#ffff0000" />
-    </item>
-
-    <item >
-        <color android:color="#ff0000ff" />
-    </item>
-</transition>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/transparent_border.9.png b/proprietary/frameworks/base/tests/resources/res/drawable/transparent_border.9.png
deleted file mode 100755
index 2614c06be5aa71f2a1d14e5e7ecc92dd4b62f27d..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/transparent_border.9.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/transparent_right.9.png b/proprietary/frameworks/base/tests/resources/res/drawable/transparent_right.9.png
deleted file mode 100755
index a438312a48f4c7eeaa5ec4635f53c1758907e614..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/transparent_right.9.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/typeface_test.png b/proprietary/frameworks/base/tests/resources/res/drawable/typeface_test.png
deleted file mode 100755
index c337f5f6ac0d6d03f22ce4a68edda6a8039cf447..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/typeface_test.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_clip_path_1.xml b/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_clip_path_1.xml
deleted file mode 100755
index c2ab429c57224ba7e4c9331e4d98b69535a95c1c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_clip_path_1.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<!--
- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="64dp"
-        android:width="64dp"
-        android:viewportHeight="12.25"
-        android:viewportWidth="7.30625" >
-
-    <group
-        android:pivotX="3.65"
-        android:pivotY="6.125"
-        android:rotation="-30" >
-        <clip-path
-            android:name="clip1"
-            android:pathData="
-                M 0, 6.125
-                l 7.3, 0
-                l 0, 12.25
-                l -7.3, 0
-                z" />
-    </group>
-    <group>
-        <path
-            android:name="one"
-            android:fillColor="#ff88ff"
-            android:pathData="M 1.215625,9.5l 1.9375,0.0 0.0-6.671875 -2.109375,0.421875 0.0-1.078125
-                l 2.09375-0.421875 1.1874998,0.0 0.0,7.75 1.9375,0.0 0.0,1.0
-                l -5.046875,0.0 0.0-1.0Z" />
-    </group>
-    <group
-        android:pivotX="3.65"
-        android:pivotY="6.125"
-        android:rotation="-30" >
-        <clip-path
-            android:name="clip2"
-            android:pathData="
-                M 0, 0
-                l 7.3, 0
-                l 0, 6.125
-                l -7.3, 0
-                z" />
-    </group>
-    <group>
-        <path
-            android:name="two"
-            android:fillColor="#ff88ff"
-            android:pathData="M 2.534375,9.6875l 4.140625,0.0 0.0,1.0 -5.5625,0.0 0.0-1.0q 0.671875-0.6875 1.828125-1.859375
-                        q 1.1718752-1.1875 1.4687502-1.53125 0.578125-0.625 0.796875-1.0625
-                        q 0.234375-0.453125 0.234375-0.875 0.0-0.703125 -0.5-1.140625
-                        q -0.484375-0.4375 -1.2656252-0.4375 -0.5625,0.0 -1.1875,0.1875
-                        q -0.609375,0.1875 -1.3125,0.59375l 0.0-1.203125q 0.71875-0.28125 1.328125-0.421875
-                        q 0.625-0.15625 1.140625-0.15625 1.3593752,0.0 2.1718752,0.6875
-                        q 0.8125,0.671875 0.8125,1.8125 0.0,0.53125 -0.203125,1.015625
-                        q -0.203125,0.484375 -0.734375,1.140625 -0.15625,0.171875 -0.9375,0.984375
-                        q -0.78125024,0.8125 -2.2187502,2.265625Z" />
-    </group>
-
-</vector>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_create.xml b/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_create.xml
deleted file mode 100755
index 7db4ad5271742e77d126200b8275bb72a89bd20a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_create.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="64dp"
-        android:width="64dp"
-        android:viewportHeight="24"
-        android:viewportWidth="24" >
-
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3.0,17.25L3.0,21.0l3.75,0.0L17.813995,9.936001l-3.75-3.75L3.0,17.25zM20.707,7.0429993c0.391-0.391 0.391-1.023 0.0-1.414l-2.336-2.336c-0.391-0.391-1.023-0.391 -1.414,0.0l-1.832,1.832l3.75,3.75L20.707,7.0429993z" />
-
-</vector>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_delete.xml b/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_delete.xml
deleted file mode 100755
index 8d9c21cf074d530f8d8406e1af721071d407601d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_delete.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="64dp"
-        android:width="64dp"
-        android:viewportHeight="24"
-        android:viewportWidth="24" >
-
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6.0,19.0c0.0,1.104 0.896,2.0 2.0,2.0l8.0,0.0c1.104,0.0 2.0-0.896 2.0-2.0l0.0-12.0L6.0,7.0L6.0,19.0zM18.0,4.0l-2.5,0.0l-1.0-1.0l-5.0,0.0l-1.0,1.0L6.0,4.0C5.4469986,4.0 5.0,4.4469986 5.0,5.0l0.0,1.0l14.0,0.0l0.0-1.0C19.0,4.4469986 18.552002,4.0 18.0,4.0z" />
-
-</vector>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_heart.xml b/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_heart.xml
deleted file mode 100755
index ff55fe5f51c0e2e2fcf8ef3a3832be0b860ac77f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_heart.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="64dp"
-        android:width="64dp"
-        android:viewportHeight="24"
-        android:viewportWidth="24" >
-
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M16.0,5.0c-1.955,0.0 -3.83,1.268 -4.5,3.0c-0.67-1.732 -2.547-3.0 -4.5-3.0C4.4570007,5.0 2.5,6.931999 2.5,9.5c0.0,3.529 3.793,6.258 9.0,11.5c5.207-5.242 9.0-7.971 9.0-11.5C20.5,6.931999 18.543,5.0 16.0,5.0z" />
-
-</vector>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_random_path_1.xml b/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_random_path_1.xml
deleted file mode 100755
index 5c55294a165c346314383a84d64c039f0b6a0d97..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_random_path_1.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
- Copyright (C) 2014 The Android Open Source Project
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at"+
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="64dp"
-        android:width="64dp"
-        android:viewportHeight="128"
-        android:viewportWidth="128" >
-
-    <path
-        android:fillColor="#FF00FF00"
-        android:pathData="
-                 m 0.0 0.0
-                 c 58.357853 57.648304 47.260395 2.2044754 3.0 3.0
-                 s 61.29288 10.748665 6.0 6.0
-                 s 0.12015152 45.193787 9.0 9.0
-                 s 32.573513 46.862522 12.0 12.0
-                 C 52.051823 62.050003 14.197739 51.99994 15.0 15.0
-                 S 58.365482 51.877937 18.0 18.0
-                 S 26.692455 3.9604378 21.0 21.0
-                 S 21.433464 52.17514 24.0 24.0
-                 M 27.0 27.0
-                 s 0.77630234 20.606667 30.0 30.0
-                 M 33.0 33.0
-                 S 31.06879 21.506374 36.0 36.0
-                 m 39.0 39.0
-                 s 11.699013 23.684185 42.0 42.0
-                 m 45.0 45.0
-                 S 3.7642136 38.589584 48.0 48.0
-                 Q 27.203026 53.329338 51.0 51.0
-                 s 39.229023 15.1781845 54.0 54.0
-                 Q 47.946877 23.706299 57.0 57.0
-                 S 45.63452 56.15198 60.0 60.0 "
-        android:strokeColor="#FF0000FF"
-        android:strokeWidth="1" />
-
-</vector>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_random_path_2.xml b/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_random_path_2.xml
deleted file mode 100755
index 95e0a546c3579e4cab12b6cf28003ca409802f31..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_random_path_2.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
- Copyright (C) 2014 The Android Open Source Project
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at"+
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="64dp"
-        android:width="64dp"
-        android:viewportHeight="128"
-        android:viewportWidth="128" >
-
-    <path
-        android:fillColor="#FF00FF00"
-        android:pathData="
-                 m 0.0 0.0
-                 q 4.7088394 36.956432 3.0 3.0
-                 s 29.470345 16.754963 6.0 6.0
-                 q 20.278355 7.4670525 9.0 9.0
-                 S 30.897224 17.732414 12.0 12.0
-                 T 15.0 15.0
-                 s 63.47204 45.67142 18.0 18.0
-                 T 21.0 21.0
-                 S 0.3184204 24.808247 24.0 24.0
-                 t 27.0 27.0
-                 s 39.02275 38.261158 30.0 30.0
-                 t 33.0 33.0
-                 S 50.709816 16.067192 36.0 36.0
-                 a 62.50911 7.7131805 51.932335 0 0 39.0 39.0
-                 s 5.155651 15.749123 42.0 42.0
-                 a 51.87415 40.30564 49.804344 0 0 45.0 45.0
-                 S 16.16534 62.55986 48.0 48.0
-                 A 39.90161 43.904438 41.642593 1 0 51.0 51.0
-                 s 46.258068 32.12831 54.0 54.0
-                 A 22.962704 55.05604 42.912285 1 1 57.0 57.0
-                 S 36.47731 54.216763 60.0 60.0 "
-        android:strokeColor="#FF0000FF"
-        android:strokeWidth="1" />
-
-</vector>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_render_order_1.xml b/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_render_order_1.xml
deleted file mode 100755
index 8639096dfa6ff34220c064bb744e44511d37d4ed..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_render_order_1.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<!--
- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="64dp"
-        android:width="64dp"
-        android:viewportHeight="400"
-        android:viewportWidth="400" >
-
-    <group
-        android:name="FirstLevelGroup"
-        android:alpha="0.9"
-        android:translateX="100.0"
-        android:translateY="0.0" >
-        <path
-            android:fillColor="#FFFF0000"
-            android:pathData="@string/rectangle200" />
-
-        <group
-            android:name="SecondLevelGroup1"
-            android:alpha="0.9"
-            android:translateX="-100.0"
-            android:translateY="50.0" >
-            <path
-                android:fillColor="#FF00FF00"
-                android:pathData="@string/rectangle200" />
-
-            <group
-                android:name="ThridLevelGroup1"
-                android:alpha="0.9"
-                android:translateX="-100.0"
-                android:translateY="50.0" >
-                <path
-                    android:fillColor="#FF0000FF"
-                    android:pathData="@string/rectangle200" />
-            </group>
-            <group
-                android:name="ThridLevelGroup2"
-                android:alpha="0.8"
-                android:translateX="100.0"
-                android:translateY="50.0" >
-                <path
-                    android:fillColor="#FF000000"
-                    android:pathData="@string/rectangle200" />
-            </group>
-        </group>
-        <group
-            android:name="SecondLevelGroup2"
-            android:alpha="0.8"
-            android:translateX="100.0"
-            android:translateY="50.0" >
-            <path
-                android:fillColor="#FF0000FF"
-                android:pathData="@string/rectangle200" />
-
-            <group
-                android:name="ThridLevelGroup3"
-                android:alpha="0.9"
-                android:translateX="-100.0"
-                android:translateY="50.0" >
-                <path
-                    android:fillColor="#FFFF0000"
-                    android:pathData="@string/rectangle200" />
-            </group>
-            <group
-                android:name="ThridLevelGroup4"
-                android:alpha="0.8"
-                android:translateX="100.0"
-                android:translateY="50.0" >
-                <path
-                    android:fillColor="#FF00FF00"
-                    android:pathData="@string/rectangle200" />
-            </group>
-        </group>
-    </group>
-
-</vector>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_render_order_2.xml b/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_render_order_2.xml
deleted file mode 100755
index 069a53154495bc5286fafb92bdcfc03b38fb6fe4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_render_order_2.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<!--
- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="64dp"
-        android:width="64dp"
-        android:viewportHeight="400"
-        android:viewportWidth="400" >
-
-    <group
-        android:name="FirstLevelGroup"
-        android:alpha="0.9"
-        android:translateX="100.0"
-        android:translateY="0.0" >
-        <group
-            android:name="SecondLevelGroup1"
-            android:alpha="0.9"
-            android:translateX="-100.0"
-            android:translateY="50.0" >
-            <path
-                android:fillColor="#FF00FF00"
-                android:pathData="@string/rectangle200" />
-
-            <group
-                android:name="ThridLevelGroup1"
-                android:alpha="0.9"
-                android:translateX="-100.0"
-                android:translateY="50.0" >
-                <path
-                    android:fillColor="#FF0000FF"
-                    android:pathData="@string/rectangle200" />
-            </group>
-            <group
-                android:name="ThridLevelGroup2"
-                android:alpha="0.8"
-                android:translateX="100.0"
-                android:translateY="50.0" >
-                <path
-                    android:fillColor="#FF000000"
-                    android:pathData="@string/rectangle200" />
-            </group>
-        </group>
-        <group
-            android:name="SecondLevelGroup2"
-            android:alpha="0.8"
-            android:translateX="100.0"
-            android:translateY="50.0" >
-            <path
-                android:fillColor="#FF0000FF"
-                android:pathData="@string/rectangle200" />
-
-            <group
-                android:name="ThridLevelGroup3"
-                android:alpha="0.9"
-                android:translateX="-100.0"
-                android:translateY="50.0" >
-                <path
-                    android:fillColor="#FFFF0000"
-                    android:pathData="@string/rectangle200" />
-            </group>
-            <group
-                android:name="ThridLevelGroup4"
-                android:alpha="0.8"
-                android:translateX="100.0"
-                android:translateY="50.0" >
-                <path
-                    android:fillColor="#FF00FF00"
-                    android:pathData="@string/rectangle200" />
-            </group>
-        </group>
-
-        <path
-            android:fillColor="#FFFF0000"
-            android:pathData="@string/rectangle200" />
-    </group>
-
-</vector>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_repeated_a_1.xml b/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_repeated_a_1.xml
deleted file mode 100755
index e27464b7a572e03db7e64659bb00bf6923424f64..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_repeated_a_1.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
- Copyright (C) 2014 The Android Open Source Project
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at"+
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="64dp"
-        android:width="64dp"
-        android:viewportHeight="128"
-        android:viewportWidth="128" >
-
-    <path
-        android:fillColor="#FF00FF00"
-        android:pathData="m 45.712063 19.109837
-                H 24.509682
-                a 59.3415 26.877445 22.398209 1 1 3.3506432 1.6524277
-                a 34.922844 36.72583 13.569004 0 0 24.409462 20.931156
-                a 43.47134 32.61542 52.534607 1 0 7.187504 61.509724
-                A 30.621132 41.44202 50.885685 0 0 23.235489 26.638653
-                A 7.251148 15.767811 44.704533 1 1 19.989803 21.33052
-                A 55.645584 46.20288 19.40316 0 1 32.881298 53.410923
-                c 30.649612 4.8525085 21.96682 1.3304634 17.300182 14.747681
-                a 9.375069 44.365055 57.169727 0 0 56.01326 52.59596
-                A 50.071907 37.331825 56.301754 1 0 14.676102 62.04976
-                C 36.531925 4.6217957 47.59332 54.793385 13.562473 13.753647
-                A 2.3695297 42.578487 54.250687 0 1 33.1337 41.511288
-                a 39.4827 38.844944 54.52335 1 1 13.549484 46.81581
-                c 56.943657 51.96854 27.938824 61.148792 24.168636 46.642727
-                "
-        android:strokeColor="#FF0000FF"
-        android:strokeWidth="1" />
-
-</vector>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_repeated_a_2.xml b/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_repeated_a_2.xml
deleted file mode 100755
index 924ba1bf8bc2c07bd5aacdc10caeafedf4da270a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_repeated_a_2.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- Copyright (C) 2014 The Android Open Source Project
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at"+
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="64dp"
-        android:width="64dp"
-        android:viewportHeight="128"
-        android:viewportWidth="128" >
-
-    <path
-        android:fillColor="#FF00FF00"
-        android:pathData="m 45.712063 19.109837
-                H 24.509682
-                A 37.689938 2.3916092 17.462616 1 0 24.958328 48.110596
-                q 45.248383 30.396336 5.777027 3.4086685
-                a 30.966236 62.67946 50.532032 1 0 29.213684 60.63014
-                L 56.16764 8.342098
-                Q 61.172253 1.4613304 4.4721107 38.287144
-                A 6.284897 22.991482 47.409508 1 1 44.10166 60.998764
-                t 36.36881 55.68292
-                a 51.938667 35.22107 22.272938 1 1 28.572739 60.848858
-                A 19.610851 11.569599 51.407906 1 1 56.82705 24.386292
-                T 36.918854 59.542286
-                a 33.191364 10.553429 53.047726 1 0 54.874985 7.409252
-                s 30.186714 42.154182 59.73551 35.50219
-                A 47.9379 5.776497 28.307701 1 1 3.3323975 30.113499
-                a 22.462494 28.096004 55.76455 0 0 25.58981 30.816948
-                S 43.91107 54.679676 19.540264 0.34284973
-                "
-        android:strokeColor="#FF0000FF"
-        android:strokeWidth="1" />
-
-</vector>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_repeated_cq.xml b/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_repeated_cq.xml
deleted file mode 100755
index e0848f0c1c229a12dae4064d1596e1430d3ed5fe..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_repeated_cq.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
- Copyright (C) 2014 The Android Open Source Project
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at"+
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="64dp"
-        android:width="64dp"
-        android:viewportHeight="128"
-        android:viewportWidth="128" >
-
-    <path
-        android:fillColor="#FF00FF00"
-        android:pathData="m 30.81895 41.37989
-                v 31.00579
-                c 24.291603 52.03364 40.6086 24.840137 29.56704 6.5204926
-                45.133224 22.913471 33.052887 21.727486 33.369 61.60278
-                9.647232 22.098152 48.939598 47.470215 53.653687 62.32235
-                C 2.0560722 1.4615479 7.0928993 26.005287 40.137558 36.75628
-                11.246731 32.178127 59.367462 60.34823 57.254383 37.357815
-                47.75605 11.424667 3.3105545 51.886635 56.63027 17.12133
-                q 28.37534 32.85535 25.85654 33.57151
-                10.356537 51.850616 54.085087 35.653175
-                12.530029 52.87991 17.44696 11.780586
-                Q 2.585228 51.92801 60.000664 56.79912
-                54.18275 51.500694 9.375679 23.836113
-                60.35329 59.026245 31.058632 35.14934
-                "
-        android:strokeColor="#FF0000FF"
-        android:strokeWidth="1" />
-
-</vector>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_repeated_st.xml b/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_repeated_st.xml
deleted file mode 100755
index b104349a9beb24246a63e466e1795a2792723a2f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_repeated_st.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
- Copyright (C) 2014 The Android Open Source Project
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at"+
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="64dp"
-        android:width="64dp"
-        android:viewportHeight="128"
-        android:viewportWidth="128" >
-
-    <path
-        android:fillColor="#FF00FF00"
-        android:pathData="m 20.20005 8.139153
-                h 10.053165
-                s 14.2943 49.612846 35.520653 54.904068
-                50.1405 17.044182 5.470337 40.180553
-                3.125019 34.221123 53.212563 32.862965
-                S 35.985264 35.74349 0.15337753 59.27337
-                2.2951508 44.56783 51.089413 29.829689
-                8.5599785 22.649555 4.3914986 28.139206
-                t 11.932453 44.041077
-                62.629326 7.40921
-                23.302986 54.116184
-                T 43.560753 63.370514
-                40.156204 17.60786
-                40.12051 60.803394
-                "
-        android:strokeColor="#FF0000FF"
-        android:strokeWidth="1" />
-
-</vector>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_schedule.xml b/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_schedule.xml
deleted file mode 100755
index 64d19e872634419948681c1d5d944ba53ec12fc1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_schedule.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="64dp"
-        android:width="64dp"
-        android:viewportHeight="24"
-        android:viewportWidth="24" >
-
-    <path
-        android:fillColor="#E6000000"
-        android:pathData="M11.994999,2.0C6.4679985,2.0 2.0,6.4780006 2.0,12.0s4.468,10.0 9.995,10.0S22.0,17.522 22.0,12.0S17.521,2.0 11.994999,2.0zM12.0,20.0c-4.42,0.0 -8.0-3.582-8.0-8.0s3.58-8.0 8.0-8.0s8.0,3.582 8.0,8.0S16.419998,20.0 12.0,20.0z" />
-    <path
-        android:fillColor="#E6000000"
-        android:pathData="M12.5,6.0l-1.5,0.0 0.0,7.0 5.3029995,3.1819992 0.75-1.249999-4.5529995-2.7320004z" />
-
-</vector>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_settings.xml b/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_settings.xml
deleted file mode 100755
index 13d7f055c55dcad7d5e5546580e16166ebe1021a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_settings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="64dp"
-        android:width="64dp"
-        android:viewportHeight="24"
-        android:viewportWidth="24" >
-
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19.429,12.975998c0.042-0.32 0.07-0.645 0.07-0.976s-0.029-0.655-0.07-0.976l2.113-1.654c0.188-0.151 0.243-0.422 0.118-0.639l-2.0-3.463c-0.125-0.217-0.386-0.304-0.612-0.218l-2.49,1.004c-0.516-0.396-1.081-0.731-1.69-0.984l-0.375-2.648C14.456,2.1829987 14.25,2.0 14.0,2.0l-4.0,0.0C9.75,2.0 9.544,2.1829987 9.506,2.422001L9.131,5.0699997C8.521,5.322998 7.957,5.6570015 7.44,6.054001L4.952,5.0509987C4.726,4.965 4.464,5.052002 4.34,5.269001l-2.0,3.463C2.2150002,8.947998 2.27,9.219002 2.4580002,9.369999l2.112,1.653C4.528,11.344002 4.5,11.668999 4.5,12.0s0.029,0.656 0.071,0.977L2.4580002,14.630001c-0.188,0.151-0.243,0.422-0.118,0.639l2.0,3.463c0.125,0.217 0.386,0.304 0.612,0.218l2.489-1.004c0.516,0.396 1.081,0.731 1.69,0.984l0.375,2.648C9.544,21.817001 9.75,22.0 10.0,22.0l4.0,0.0c0.25,0.0 0.456-0.183 0.494-0.422l0.375-2.648c0.609-0.253 1.174-0.588 1.689-0.984l2.49,1.004c0.226,0.086 0.487-0.001 0.612-0.218l2.0-3.463c0.125-0.217 0.07-0.487-0.118-0.639L19.429,12.975998zM12.0,16.0c-2.21,0.0-4.0-1.791-4.0-4.0c0.0-2.21 1.79-4.0 4.0-4.0c2.208,0.0 4.0,1.79 4.0,4.0C16.0,14.209 14.208,16.0 12.0,16.0z" />
-
-</vector>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_stroke_1.xml b/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_stroke_1.xml
deleted file mode 100755
index af351f1dd1730ff41247daafd2217978d74e11ca..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_stroke_1.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="64dp"
-    android:viewportHeight="200"
-    android:viewportWidth="200"
-    android:width="64dp" >
-
-    <group>
-        <path
-            android:name="background1"
-            android:fillColor="#FF000000"
-            android:pathData="M 0,0 l 100,0 l 0, 100 l -100, 0 z" />
-        <path
-            android:name="background2"
-            android:fillColor="#FF000000"
-            android:pathData="M 100,100 l 100,0 l 0, 100 l -100, 0 z" />
-    </group>
-    <group
-        android:translateX="50"
-        android:translateY="50" >
-        <path
-            android:name="twoLines"
-            android:pathData="M 100,20 l 0 80 l -30 -80"
-            android:fillColor="#FF000000"
-            android:strokeColor="#FF00FF00"
-            android:strokeLineCap="butt"
-            android:strokeLineJoin="miter"
-            android:strokeMiterLimit="6"
-            android:strokeWidth="20" />
-    </group>
-
-</vector>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_stroke_2.xml b/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_stroke_2.xml
deleted file mode 100755
index f85d5fc18fc4deedf50c96ae0118ae5571fb72dd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_stroke_2.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="64dp"
-    android:viewportHeight="200"
-    android:viewportWidth="200"
-    android:width="64dp" >
-
-    <group>
-        <path
-            android:name="background1"
-            android:fillColor="#FF000000"
-            android:pathData="M 0,0 l 100,0 l 0, 100 l -100, 0 z" />
-        <path
-            android:name="background2"
-            android:fillColor="#FF000000"
-            android:pathData="M 100,100 l 100,0 l 0, 100 l -100, 0 z" />
-    </group>
-    <group
-        android:translateX="50"
-        android:translateY="50" >
-        <path
-            android:name="twoLines"
-            android:pathData="M 100,20 l 0 80 l -30 -80"
-            android:fillColor="#FF000000"
-            android:strokeColor="#FF00FF00"
-            android:strokeLineCap="round"
-            android:strokeLineJoin="round"
-            android:strokeMiterLimit="10"
-            android:strokeWidth="20" />
-    </group>
-
-</vector>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_stroke_3.xml b/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_stroke_3.xml
deleted file mode 100755
index 8f3d47ece13a67bd3c97be72474b31998648b975..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_stroke_3.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="64dp"
-    android:viewportHeight="200"
-    android:viewportWidth="200"
-    android:width="64dp" >
-
-    <group>
-        <path
-            android:name="background1"
-            android:fillColor="#FF000000"
-            android:pathData="M 0,0 l 100,0 l 0, 100 l -100, 0 z" />
-        <path
-            android:name="background2"
-            android:fillColor="#FF000000"
-            android:pathData="M 100,100 l 100,0 l 0, 100 l -100, 0 z" />
-    </group>
-    <group
-        android:translateX="50"
-        android:translateY="50" >
-        <path
-            android:name="twoLines"
-            android:pathData="M 100,20 l 0 80 l -30 -80"
-            android:fillColor="#FF000000"
-            android:strokeColor="#FF00FF00"
-            android:strokeLineCap="square"
-            android:strokeLineJoin="bevel"
-            android:strokeMiterLimit="10"
-            android:strokeWidth="20" />
-    </group>
-
-</vector>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_transformation_1.xml b/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_transformation_1.xml
deleted file mode 100755
index f6623d01df880ba34d412d8bbc7f709cd54e03ec..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_transformation_1.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="64dp"
-        android:width="64dp"
-        android:viewportHeight="500"
-        android:viewportWidth="800" >
-
-    <group
-        android:pivotX="90"
-        android:pivotY="100"
-        android:rotation="20">
-        <path
-            android:name="pie2"
-            android:pathData="M200,350 l 50,-25
-           a25,12 -30 0,1 100,-50 l 50,-25
-           a25,25 -30 0,1 100,-50 l 50,-25
-           a25,37 -30 0,1 100,-50 l 50,-25
-           a25,50 -30 0,1 100,-50 l 50,-25"
-           android:fillColor="#00000000"
-            android:strokeColor="#FF00FF00"
-            android:strokeWidth="10" />
-    </group>
-
-</vector>
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_transformation_2.xml b/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_transformation_2.xml
deleted file mode 100755
index 87da0bbee3b1cc2dad6f06d964294ce6f428e711..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_transformation_2.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="64dp"
-        android:width="64dp"
-        android:viewportHeight="200"
-        android:viewportWidth="200" >
-
-    <group>
-        <path
-            android:name="background1"
-            android:pathData="M 0,0 l 100,0 l 0, 100 l -100, 0 z"
-            android:fillColor="#FF000000"/>
-        <path
-            android:name="background2"
-            android:pathData="M 100,100 l 100,0 l 0, 100 l -100, 0 z"
-            android:fillColor="#FF000000"/>
-    </group>
-    <group
-        android:pivotX="100"
-        android:pivotY="100"
-        android:rotation="90"
-        android:scaleX="0.75"
-        android:scaleY="0.5"
-        android:translateX="0.0"
-        android:translateY="100.0">
-        <path
-            android:name="twoLines"
-            android:pathData="M 100,10 v 90 M 10,100 h 90"
-            android:fillColor="#00000000"
-            android:strokeColor="#FF00FF00"
-            android:strokeWidth="10" />
-    </group>
-
-</vector>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_transformation_3.xml b/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_transformation_3.xml
deleted file mode 100755
index fc30af3e9910262eae8a70e8b2b8df3df4257203..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_transformation_3.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="64dp"
-        android:width="64dp"
-        android:viewportHeight="200"
-        android:viewportWidth="200" >
-
-    <group>
-        <path
-            android:name="background1"
-            android:pathData="M 0,0 l 100,0 l 0, 100 l -100, 0 z"
-            android:fillColor="#FF000000"/>
-        <path
-            android:name="background2"
-            android:pathData="M 100,100 l 100,0 l 0, 100 l -100, 0 z"
-            android:fillColor="#FF000000"/>
-    </group>
-    <group
-        android:pivotX="0"
-        android:pivotY="0"
-        android:rotation="90"
-        android:scaleX="0.75"
-        android:scaleY="0.5"
-        android:translateX="100.0"
-        android:translateY="100.0">
-        <path
-            android:name="twoLines"
-            android:pathData="M 100,10 v 90 M 10,100 h 90"
-            android:fillColor="#00000000"
-            android:strokeColor="#FF00FF00"
-            android:strokeWidth="10" />
-    </group>
-
-</vector>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_transformation_4.xml b/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_transformation_4.xml
deleted file mode 100755
index 5b40d0d070133e2404bb0f7ed92a2512c021366e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_transformation_4.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<!--
- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="64dp"
-        android:width="64dp"
-        android:viewportHeight="400"
-        android:viewportWidth="400" >
-
-    <group android:name="backgroundGroup" >
-        <path
-            android:name="background1"
-            android:fillColor="#80000000"
-            android:pathData="M 0,0 l 200,0 l 0, 200 l -200, 0 z" />
-        <path
-            android:name="background2"
-            android:fillColor="#80000000"
-            android:pathData="M 200,200 l 200,0 l 0, 200 l -200, 0 z" />
-    </group>
-    <group
-        android:name="translateToCenterGroup"
-        android:translateX="50.0"
-        android:translateY="90.0" >
-        <path
-            android:name="twoLines"
-            android:pathData="M 0,0 v 100 M 0,0 h 100"
-            android:strokeColor="#FFFF0000"
-            android:strokeWidth="20" />
-
-        <group
-            android:name="rotationGroup"
-            android:pivotX="0.0"
-            android:pivotY="0.0"
-            android:rotation="-45.0" >
-            <path
-                android:name="twoLines1"
-                android:pathData="M 0,0 v 100 M 0,0 h 100"
-                android:strokeColor="#FF00FF00"
-                android:strokeWidth="20" />
-
-            <group
-                android:name="translateGroup"
-                android:translateX="130.0"
-                android:translateY="160.0" >
-                <group android:name="scaleGroup" >
-                    <path
-                        android:name="twoLines2"
-                        android:pathData="M 0,0 v 100 M 0,0 h 100"
-                        android:strokeColor="#FF0000FF"
-                        android:strokeWidth="20" />
-                </group>
-            </group>
-        </group>
-    </group>
-
-</vector>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_transformation_5.xml b/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_transformation_5.xml
deleted file mode 100755
index 4a27754d18ee612fee154aaa58f1f91e025b0da7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_transformation_5.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<!--
- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="64dp"
-        android:width="64dp"
-        android:viewportHeight="400"
-        android:viewportWidth="400" >
-
-    <group android:name="backgroundGroup" >
-        <path
-            android:name="background1"
-            android:fillColor="#80000000"
-            android:pathData="M 0,0 l 200,0 l 0, 200 l -200, 0 z" />
-        <path
-            android:name="background2"
-            android:fillColor="#80000000"
-            android:pathData="M 200,200 l 200,0 l 0, 200 l -200, 0 z" />
-    </group>
-    <group
-        android:name="translateToCenterGroup"
-        android:translateX="50.0"
-        android:translateY="90.0" >
-        <path
-            android:name="twoLines"
-            android:pathData="M 0,0 v 150 M 0,0 h 150"
-            android:strokeColor="#FFFF0000"
-            android:strokeWidth="20" />
-
-        <group
-            android:name="rotationGroup"
-            android:pivotX="0.0"
-            android:pivotY="0.0"
-            android:rotation="-45.0" >
-            <path
-                android:name="twoLines1"
-                android:pathData="M 0,0 v 100 M 0,0 h 100"
-                android:strokeColor="#FF00FF00"
-                android:strokeWidth="20" />
-
-            <group
-                android:name="translateGroup"
-                android:translateX="130.0"
-                android:translateY="160.0" >
-                <group android:name="scaleGroup" >
-                    <path
-                        android:name="twoLines3"
-                        android:pathData="M 0,0 v 100 M 0,0 h 100"
-                        android:strokeColor="#FF0000FF"
-                        android:strokeWidth="20" />
-                </group>
-            </group>
-
-            <group
-                android:name="translateGroupHalf"
-                android:translateX="65.0"
-                android:translateY="80.0" >
-                <group android:name="scaleGroup" >
-                    <path
-                        android:name="twoLines2"
-                        android:pathData="M 0,0 v 100 M 0,0 h 100"
-                        android:strokeColor="#FF0000FF"
-                        android:strokeWidth="20" />
-                </group>
-            </group>
-        </group>
-    </group>
-
-</vector>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_transformation_6.xml b/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_transformation_6.xml
deleted file mode 100755
index 5e60c4aeec0e3045974adf374cfae1b0bb61165c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/vector_icon_transformation_6.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<!--
- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="64dp"
-        android:width="64dp"
-        android:viewportHeight="400"
-        android:viewportWidth="400" >
-
-    <group android:name="backgroundGroup"
-        android:alpha = "0.5" >
-        <path
-            android:name="background1"
-            android:fillColor="#FF000000"
-            android:pathData="M 0,0 l 200,0 l 0, 200 l -200, 0 z" />
-        <path
-            android:name="background2"
-            android:fillColor="#FF000000"
-            android:pathData="M 200,200 l 200,0 l 0, 200 l -200, 0 z" />
-    </group>
-    <group
-        android:name="translateToCenterGroup"
-        android:translateX="50.0"
-        android:translateY="90.0"
-        android:alpha = "0.5" >
-        <path
-            android:name="twoLines"
-            android:pathData="M 0,0 v 100 M 0,0 h 100"
-            android:strokeColor="#FFFF0000"
-            android:strokeWidth="20" />
-
-        <group
-            android:name="rotationGroup"
-            android:pivotX="0.0"
-            android:pivotY="0.0"
-            android:rotation="-45.0"
-            android:alpha = "0.5" >
-            <path
-                android:name="twoLines1"
-                android:pathData="M 0,0 v 100 M 0,0 h 100"
-                android:strokeColor="#FF00FF00"
-                android:strokeWidth="20" />
-
-            <group
-                android:name="translateGroup"
-                android:translateX="130.0"
-                android:translateY="160.0"
-                android:alpha = "0.5">
-                <group android:name="scaleGroup" >
-                    <path
-                        android:name="twoLines3"
-                        android:pathData="M 0,0 v 100 M 0,0 h 100"
-                        android:strokeColor="#FF0000FF"
-                        android:strokeWidth="20" />
-                </group>
-            </group>
-
-            <group
-                android:name="translateGroupHalf"
-                android:translateX="65.0"
-                android:translateY="80.0"
-                android:alpha = "0.5">
-                <group android:name="scaleGroup" >
-                    <path
-                        android:name="twoLines2"
-                        android:pathData="M 0,0 v 100 M 0,0 h 100"
-                        android:strokeColor="#FF0000FF"
-                        android:strokeWidth="20" />
-                </group>
-            </group>
-        </group>
-    </group>
-
-</vector>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/webp_test.webp b/proprietary/frameworks/base/tests/resources/res/drawable/webp_test.webp
deleted file mode 100755
index 7b1009f0d90efb043899882011447c304332dc71..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/drawable/webp_test.webp and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/drawable/window_test_drawable.xml b/proprietary/frameworks/base/tests/resources/res/drawable/window_test_drawable.xml
deleted file mode 100755
index 4281cd81fad3ac00114806d80573027c21efad3a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/drawable/window_test_drawable.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#00000000"/>
-    <stroke android:width="2dp" android:color="#ff000000"/>
-    <padding android:left="1dp" android:top="1dp"
-            android:right="1dp" android:bottom="1dp" />
-</shape>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout-land/mediaplayer.xml b/proprietary/frameworks/base/tests/resources/res/layout-land/mediaplayer.xml
deleted file mode 100755
index 5dafdb9c9624403f416e5d5b79a48e71af639524..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout-land/mediaplayer.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <SurfaceView android:id="@+id/surface"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1">
-    </SurfaceView>
-
-    <SurfaceView android:id="@+id/surface2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1">
-    </SurfaceView>
-
-    <SurfaceView android:id="@+id/surface3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1">
-    </SurfaceView>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/abslistview_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/abslistview_layout.xml
deleted file mode 100755
index a090ce34c82768561fff64d8c5f8270e9ae0179e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/abslistview_layout.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ViewGroup_Layout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/abslistview_root"
-    android:layout_width="25px"
-    android:layout_height="25px" >
-
-   <GridView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-   <ListView>
-        <TextView
-            android:text="@string/table_layout_first"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_second"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_third"
-            android:padding="3dip" />
-    </ListView>
-</ViewGroup_Layout>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/absolute_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/absolute_layout.xml
deleted file mode 100755
index 6cec61bb270dd416a669b17981c5f55a7f70f440..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/absolute_layout.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <AbsoluteLayout
-        android:id="@+id/absolute_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_x="1dip"
-        android:layout_y="2dip">
-
-        <TextView
-            android:id="@+id/absolute_textview"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_x="10dip"
-            android:layout_y="20dip"
-            android:background="@drawable/red"
-            android:text="@string/hello_world"/>
-
-    </AbsoluteLayout>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/adapterview_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/adapterview_layout.xml
deleted file mode 100755
index e118500e4a111e38671041e8405bc2fb3db3ec3c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/adapterview_layout.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/adapterview_tv"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/alert_dialog_text_entry.xml b/proprietary/frameworks/base/tests/resources/res/layout/alert_dialog_text_entry.xml
deleted file mode 100755
index 8b87a5d5e5b9e067b6e31f77a271d508a1155f18..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/alert_dialog_text_entry.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/username_view"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginLeft="20dip"
-        android:layout_marginRight="20dip"
-        android:text="@string/alert_dialog_username"
-        android:gravity="left"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <EditText
-        android:id="@+id/username_edit"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_marginLeft="20dip"
-        android:layout_marginRight="20dip"
-        android:scrollHorizontally="true"
-        android:autoText="false"
-        android:capitalize="none"
-        android:gravity="fill_horizontal"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <TextView
-        android:id="@+id/password_view"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginLeft="20dip"
-        android:layout_marginRight="20dip"
-        android:text="@string/alert_dialog_password"
-        android:gravity="left"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <EditText
-        android:id="@+id/password_edit"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_marginLeft="20dip"
-        android:layout_marginRight="20dip"
-        android:scrollHorizontally="true"
-        android:autoText="false"
-        android:capitalize="none"
-        android:gravity="fill_horizontal"
-        android:password="true"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/alert_dialog_text_entry_2.xml b/proprietary/frameworks/base/tests/resources/res/layout/alert_dialog_text_entry_2.xml
deleted file mode 100755
index 848b3424aae2337981668f26762efd11de982f95..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/alert_dialog_text_entry_2.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/username_view"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginLeft="20dip"
-        android:layout_marginRight="20dip"
-        android:text="@string/alert_dialog_username"
-        android:gravity="left" />
-
-    <EditText
-        android:id="@+id/username_edit"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_marginLeft="20dip"
-        android:layout_marginRight="20dip"
-        android:scrollHorizontally="true"
-        android:autoText="false"
-        android:capitalize="none"
-        android:gravity="fill_horizontal" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/alertdialog_custom_title.xml b/proprietary/frameworks/base/tests/resources/res/layout/alertdialog_custom_title.xml
deleted file mode 100755
index ff36f2a91674101f72bdc2c20c7c8be11f75e026..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/alertdialog_custom_title.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/alertdialog_custom_title"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_vertical|center_horizontal"
-    android:textAppearance="?android:attr/textAppearanceMedium"
-    android:text="@string/hello_world"/>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/alertdialog_custom_title2.xml b/proprietary/frameworks/base/tests/resources/res/layout/alertdialog_custom_title2.xml
deleted file mode 100755
index 51c154d60c509b5e70b6ff0e0b1ba3d9bdcd124c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/alertdialog_custom_title2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/alertdialog_custom_title"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_vertical|center_horizontal"
-    android:text="@string/hello_android"/>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/analogclock.xml b/proprietary/frameworks/base/tests/resources/res/layout/analogclock.xml
deleted file mode 100755
index 7d862c35611e9a68086cc41162ca563d0710e81a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/analogclock.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<AnalogClock android:id="@+id/clock"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="96dip"
-    android:layout_gravity="center_horizontal"
-    android:layout_height="wrap_content"/>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/anim_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/anim_layout.xml
deleted file mode 100755
index b6aa9066f1404628fe7005d40dbf5265cbe86fbb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/anim_layout.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:id="@+id/anim_window_parent">
-
-    <TextView android:id="@+id/anim_window"
-        android:layout_width="100dip"
-        android:layout_height="20dip"
-        android:text="@string/text_view_hello"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/animation_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/animation_layout.xml
deleted file mode 100755
index 13228d1495382e24fba1437dad20008249bb3481..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/animation_layout.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <ImageButton android:id="@+id/scenery"
-        android:src="@drawable/scenery"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"/>
-
-    <ImageButton android:id="@+id/start"
-        android:src="@drawable/start"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_below="@id/scenery"/>
-
-    <TextView android:id="@+id/explain"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="18sp"
-        android:autoText="true"
-        android:capitalize="sentences"
-        android:text="@string/explain"
-        android:layout_centerHorizontal="true"
-        android:layout_below="@id/start"/>
-
-    <LinearLayout android:id="@+id/button_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_centerHorizontal="true"
-        android:layout_alignParentBottom="true">
-
-        <ImageButton android:id="@+id/pass"
-            android:src="@drawable/pass"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="20px"/>
-
-        <ImageButton android:id="@+id/failed"
-            android:src="@drawable/failed"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="40px"/>
-
-    </LinearLayout>
-
-</RelativeLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/app_activity.xml b/proprietary/frameworks/base/tests/resources/res/layout/app_activity.xml
deleted file mode 100755
index 8b7206f658999ea15c32691974d8f49fa6fcca0a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/app_activity.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<!-- Demonstrates receiving activity results.
-     See corresponding Java code com.android.sdk.app.ReceiveResult.java. -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
-    android:gravity="center_horizontal"
-    android:layout_width="match_parent" android:layout_height="match_parent">
-
-    <TextView
-        android:layout_width="match_parent" android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:paddingBottom="4dip"
-        android:text="@string/forwarding"/>
-
-    <Button android:id="@+id/go"
-        android:layout_width="wrap_content" android:layout_height="wrap_content"
-        android:text="@string/go">
-        <requestFocus />
-    </Button>
-
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/app_another.xml b/proprietary/frameworks/base/tests/resources/res/layout/app_another.xml
deleted file mode 100755
index f4574a274b7588e7a66ab8ccdbc8818e0e7a6750..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/app_another.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<!-- Demonstrates receiving activity results.
-     See corresponding Java code com.android.sdk.app.ReceiveResult.java. -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
-    android:gravity="center_horizontal"
-    android:layout_width="match_parent" android:layout_height="match_parent">
-
-    <TextView
-        android:layout_width="match_parent" android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:paddingBottom="4dip"
-        android:text="@string/forwarding"/>
-
-    <Button android:id="@+id/back"
-        android:layout_width="wrap_content" android:layout_height="wrap_content"
-        android:text="@string/back">
-        <requestFocus />
-    </Button>
-
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/autocompletetextview_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/autocompletetextview_layout.xml
deleted file mode 100755
index be1d2845a8fb447cae7d13ff293b6bc7306a6e0a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/autocompletetextview_layout.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/autocompletetv_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/notify" />
-
-    <AutoCompleteTextView android:id="@+id/autocompletetv_edit"
-        android:completionThreshold="1"
-        android:completionHint="@string/tabs_1"
-        android:layout_width="match_parent" 
-        android:layout_height="wrap_content" />
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/available_intents_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/available_intents_layout.xml
deleted file mode 100755
index 5415657e741783adceb8658f1b0427645cdc998b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/available_intents_layout.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-    <TextView android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="4dip"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:text="@string/text_view_hello"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/checkbox_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/checkbox_layout.xml
deleted file mode 100755
index a1f17184557b3aaf4301c8fe6783779c2c80b0ea..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/checkbox_layout.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-    <CheckBox android:id="@+id/check_box"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/hello_world" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/checkedtextview_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/checkedtextview_layout.xml
deleted file mode 100755
index d5b9c1f9a3301cab8af17f278af95fdea2a61b00..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/checkedtextview_layout.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-    <ListView android:id="@+id/checkedtextview_listview"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    </ListView>
-
-    <CheckedTextView android:id="@+id/checkedtextview_test"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    </CheckedTextView>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/chronometer_stub_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/chronometer_stub_layout.xml
deleted file mode 100755
index 487f2f80abdfa87bd0325a19bf31ebf0858434ce..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/chronometer_stub_layout.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/screen"
-    android:layout_width="match_parent" android:layout_height="match_parent"
-    android:orientation="vertical">
-    <LinearLayout
-        android:id="@+id/chronometer_view_group"
-        android:layout_width="match_parent" android:layout_height="match_parent"
-        android:orientation="vertical">
-        <Chronometer
-            android:id="@+id/test_chronometer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/chronometer_text"
-            />
-    </LinearLayout>
-</ScrollView>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/context_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/context_layout.xml
deleted file mode 100755
index 6ec6c76804cc71bc9ae850457eb80223cc04d661..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/context_layout.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <DatePicker
-        android:id="@+id/contextdatepicker_dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true" />
-
-</RelativeLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/cursoradapter_group0.xml b/proprietary/frameworks/base/tests/resources/res/layout/cursoradapter_group0.xml
deleted file mode 100755
index f6406868d39b723bb3f2e75477aea1099259ba87..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/cursoradapter_group0.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:id="@+id/cursorAdapter_group0">
-</ImageView>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/cursoradapter_group1.xml b/proprietary/frameworks/base/tests/resources/res/layout/cursoradapter_group1.xml
deleted file mode 100755
index d1dfa3cf0de23cd8fdd82477ad0b8113950e2671..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/cursoradapter_group1.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:id="@+id/cursorAdapter_group1">
-</ImageView>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/cursoradapter_host.xml b/proprietary/frameworks/base/tests/resources/res/layout/cursoradapter_host.xml
deleted file mode 100755
index 82ac72b21fac31a48b7dfd0676e67cbb37f7eec1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/cursoradapter_host.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/cursorAdapter_host">
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/cursoradapter_item0.xml b/proprietary/frameworks/base/tests/resources/res/layout/cursoradapter_item0.xml
deleted file mode 100755
index 5ecd4968a909b3faa8e8fb3050a1d4fb2c319e29..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/cursoradapter_item0.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:id="@+id/cursorAdapter_item0">
-</TextView>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/cursoradapter_item1.xml b/proprietary/frameworks/base/tests/resources/res/layout/cursoradapter_item1.xml
deleted file mode 100755
index 44037b0dae0738fcb05fa7831e8af1e87c4b5e5c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/cursoradapter_item1.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:id="@+id/cursorAdapter_item1">
-</TextView>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/datepicker.xml b/proprietary/frameworks/base/tests/resources/res/layout/datepicker.xml
deleted file mode 100755
index 6a7b51c80ab7d4b3d3c8d21b0f477650e6db45b9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/datepicker.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <DatePicker android:id="@+id/datePicker1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:spinnersShown="false"
-                xmlns:android="http://schemas.android.com/apk/res/android">
-    </DatePicker>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/datepicker_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/datepicker_layout.xml
deleted file mode 100755
index 925674c43ced26d26e30283a9158a73e92b258b4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/datepicker_layout.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <DatePicker
-        android:id="@+id/datePicker_dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true" />
-
-</RelativeLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/dialerfilter_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/dialerfilter_layout.xml
deleted file mode 100755
index 46edbd71ecfc3cf547f65862910a55109643b0ea..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/dialerfilter_layout.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<DialerFilter android:id="@+id/dialer_filter"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <EditText android:id="@android:id/hint"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@android:drawable/editbox_background"/>
-
-    <EditText android:id="@android:id/primary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@android:id/hint"/>
-
-</DialerFilter>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/dialog_stub_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/dialog_stub_layout.xml
deleted file mode 100755
index b0a88613aefdb7b558bb4ed97316ec75c2c91cc9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/dialog_stub_layout.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
-        android:layout_width="match_parent" 
-        android:layout_height="match_parent"
-        >
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/digitalclock_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/digitalclock_layout.xml
deleted file mode 100755
index cbdb84dba4efb38fefec79f3809837e3e23aaabc..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/digitalclock_layout.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<com.android.cts.stub.alarmclock.DigitalClock android:id="@+id/digitalClock"
-     xmlns:android="http://schemas.android.com/apk/res/android"
-     android:layout_width="wrap_content"
-     android:layout_height="208dip"
-     android:gravity="center">
-     <!-- Includes vertical padding so animated background doesn't
-          stretch much -->
-     <TextView android:id="@+id/timeDisplay"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content"
-         android:textSize="64sp"
-         android:paddingRight="4dip"
-         android:paddingTop="48dip"
-         android:paddingBottom="48dip"/>
-     <LinearLayout android:id="@+id/am_pm"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content"
-         android:orientation="vertical">
-         <TextView android:id="@+id/am"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:layout_marginTop="-7dp"
-             android:text="@string/am"
-             android:textSize="28sp"/>
-         <TextView android:id="@+id/pm"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:layout_marginTop="-4dp"
-             android:text="@string/pm"
-             android:textSize="28sp"/>
-     </LinearLayout>
-</com.android.cts.stub.alarmclock.DigitalClock>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/digitalclock_simplelayout.xml b/proprietary/frameworks/base/tests/resources/res/layout/digitalclock_simplelayout.xml
deleted file mode 100755
index 16f7b454ce452dc15708cbfa8d744c2986729c5f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/digitalclock_simplelayout.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/digitalclock_root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/edittext_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/edittext_layout.xml
deleted file mode 100755
index 398d3be4c5b7f6be8b94800d5d66a0bfda9a6957..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/edittext_layout.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <LinearLayout android:id="@+id/edit_text"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <EditText android:id="@+id/edittext1"
-            style="@android:style/Widget.EditText"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginTop="10dip"
-            android:scrollHorizontally="true"
-            android:capitalize="sentences"
-            android:autoText="false"
-            android:maxLines="3"
-            android:textColor="#FF0000"
-            android:text="@string/edit_text"
-        />
-    </LinearLayout>
-</ScrollView>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/expandablelistview_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/expandablelistview_layout.xml
deleted file mode 100755
index 3a3ebb7779595e955f9ec9df626b56ebd2d65493..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/expandablelistview_layout.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<ExpandableListView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/expandablelistview_test"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:drawSelectorOnTop="false" />
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/focus_finder_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/focus_finder_layout.xml
deleted file mode 100755
index 0502fd812d331085771d95e83f43804d5ad75a9d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/focus_finder_layout.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    <TableLayout android:id="@+id/layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true">
-        <TableRow>
-            <android.view.cts.TestButton android:id="@+id/top_left_button"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:text="TL" />
-            <android.view.cts.TestButton android:id="@+id/top_right_button"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:text="TR" />
-        </TableRow>
-        <TableRow>
-            <android.view.cts.TestButton android:id="@+id/bottom_left_button"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:text="BL" />
-            <android.view.cts.TestButton android:id="@+id/bottom_right_button"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:text="BR" />
-        </TableRow>  
-    </TableLayout>
-</RelativeLayout>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/focus_handling_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/focus_handling_layout.xml
deleted file mode 100755
index 84c8e6a87914da35730ebf260891b357d40b5292..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/focus_handling_layout.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <View
-        android:id="@+id/view1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/id_ok"/>
-
-    <View
-        android:id="@+id/view2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/view1"
-        android:layout_alignTop="@id/view1"
-        android:nextFocusLeft="@id/view1"
-        android:text="@string/id_ok"/>
-
-    <View
-        android:id="@+id/view3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/view1"
-        android:layout_alignLeft="@id/view1"
-        android:nextFocusUp="@id/view1"
-        android:text="@string/id_ok"/>
-
-    <View
-        android:id="@+id/view4"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/view3"
-        android:layout_alignTop="@id/view3"
-        android:layout_alignRight="@id/view2"
-        android:nextFocusUp="@id/view2"
-        android:nextFocusLeft="@id/view3"
-        android:text="@string/id_ok"/>
-</RelativeLayout>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/framelayout_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/framelayout_layout.xml
deleted file mode 100755
index 78b7b470e0ad2c1f183a70d4a65c012a05fdea02..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/framelayout_layout.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/framelayout_container"
-                android:background="@drawable/red"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="bottom"
-                android:orientation="vertical">
-
-    <FrameLayout
-        android:layout_width="100dip"
-        android:layout_height="100dip"
-        android:background="@drawable/yellow"
-        android:id="@+id/framelayout">
-    </FrameLayout>
-
-    <FrameLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@drawable/yellow"
-        android:id="@+id/framelayout_measureall">
-
-        <TextView android:id="@+id/framelayout_textview"
-            android:background="@drawable/blue"
-            android:layout_width="60dip"
-            android:layout_height="30dip"
-            android:text="@string/hello_world"/>
-
-        <Button android:id="@+id/framelayout_button"
-            android:layout_width="50dip"
-            android:layout_height="15dip"
-            android:text="@string/go"/>
-
-    </FrameLayout>
-
-    <FrameLayout
-        android:id="@+id/foreground_tint"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:foregroundTint="@android:color/white"
-        android:foregroundTintMode="src_over" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/gallery_test.xml b/proprietary/frameworks/base/tests/resources/res/layout/gallery_test.xml
deleted file mode 100755
index 03f0e6059a691efc9bf7ba0ff87515a9ec046ab7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/gallery_test.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <android.widget.cts.MyGallery xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/gallery_test"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    </android.widget.cts.MyGallery>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/gridlayout_anim_controller_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/gridlayout_anim_controller_layout.xml
deleted file mode 100755
index 0ff2d4661202f76f8b8b74f31b2085e435003a2a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/gridlayout_anim_controller_layout.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<GridView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/gridlayout_anim_gridview"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="10dp"
-    android:verticalSpacing="20dp"
-    android:horizontalSpacing="20dp"
-    android:numColumns="3"
-    android:columnWidth="60dp"
-    android:stretchMode="columnWidth"
-    android:gravity="center"
-/>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/gridlayout_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/gridlayout_layout.xml
deleted file mode 100755
index 54b3b2c0ec5a426f9eafc6b4a0c0792191b3c8ad..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/gridlayout_layout.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2012 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<GridLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    >
-</GridLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/gridview_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/gridview_layout.xml
deleted file mode 100755
index c7774a327cbd7f25baf29dc3278103c57f4f8c0a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/gridview_layout.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<GridView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/gridview"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-/>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/home_activity.xml b/proprietary/frameworks/base/tests/resources/res/layout/home_activity.xml
deleted file mode 100755
index 49174daee713d8be9531f31e4ca4fd1bd520f46c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/home_activity.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-      <Button android:text="@string/holo_test"
-              android:id="@+id/button_holo"
-              android:onClick="onHoloTestClick"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content">
-      </Button>
-      <Button android:text="@string/holo_generator"
-              android:id="@+id/button2"
-              android:onClick="onHoloGenClick"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content">
-      </Button>
-      <Button android:text="@string/holo_light_test"
-              android:id="@+id/button3"
-              android:onClick="onHoloLightTestClick"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content">
-      </Button>
-      <Button android:text="@string/holo_light_generator"
-              android:id="@+id/button4"
-              android:onClick="onHoloLightGenClick"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content">
-      </Button>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/horizontal_scrollview.xml b/proprietary/frameworks/base/tests/resources/res/layout/horizontal_scrollview.xml
deleted file mode 100755
index 0f88ab3fc5d9100e344186168e72a59590565fc1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/horizontal_scrollview.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<android.widget.cts.MyHorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/horizontal_scroll_view"
-    android:layout_width="100px"
-    android:layout_height="100px">
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="250px"
-        android:layout_height="wrap_content">
-
-        <Button
-            android:id="@+id/first_horizontal_child"
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_1"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_2"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_3"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_1"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_2"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_3"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_1"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_2"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_3"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_1"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_2"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_3"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_1"/>
-
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_2"/>
-
-        <Button
-            android:id="@+id/last_horizontal_child"
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_3"/>
-    </LinearLayout>
-
-</android.widget.cts.MyHorizontalScrollView>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/imagebutton_test.xml b/proprietary/frameworks/base/tests/resources/res/layout/imagebutton_test.xml
deleted file mode 100755
index 7d4b691a412db5226a547563ce0fad80fdc1055f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/imagebutton_test.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/imagebutton"
-    android:layout_width="96px"
-    android:layout_height="76px"
-    android:soundEffectsEnabled="false"
-/>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/imageswitcher_test.xml b/proprietary/frameworks/base/tests/resources/res/layout/imageswitcher_test.xml
deleted file mode 100755
index 496b2bae21718a33fb4bbfaf76946771ba77ae43..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/imageswitcher_test.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ImageSwitcher android:id="@+id/switcher"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
-    />
-</RelativeLayout>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/imageview_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/imageview_layout.xml
deleted file mode 100755
index e56a9c9c4af41ad8e55280c3e2d817a52b4780da..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/imageview_layout.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ImageView
-        android:id="@+id/imageview"
-        android:layout_width="320px"
-        android:layout_height="240px"/>
-
-    <ImageView
-        android:id="@+id/image_tint"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:tint="@android:color/white"
-        android:tintMode="src_over" />
-
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/inflater_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/inflater_layout.xml
deleted file mode 100755
index cff224e303f68c6fb816454abe3f586ee71cf8d5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/inflater_layout.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/numeric_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:editable="true"/>
-
-    <TextView android:id="@+id/numeric_integer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="integer"/>
-
-    <TextView android:id="@+id/numeric_signed"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="signed"/>
-
-    <TextView android:id="@+id/numeric_decimal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="decimal"/>
-
-    <TextView android:id="@+id/numeric_signed_integer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="signed|integer"/>
-
-    <TextView android:id="@+id/numeric_integer_decimal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="integer|decimal"/>
-
-    <TextView android:id="@+id/numeric_signed_decimal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="signed|decimal"/>
-
-    <TextView android:id="@+id/numeric_signed_decimal_integer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="signed|integer|decimal"/>
-
-     <android.view.cts.MockViewStub class="android.view.cts.MockViewStub"
-        android:id="@+id/autotext_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/inflater_layout_tags.xml b/proprietary/frameworks/base/tests/resources/res/layout/inflater_layout_tags.xml
deleted file mode 100755
index dc3eb29d29cbd8d1b8613ae327e572592aedce84..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/inflater_layout_tags.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/viewlayout_root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <tag
-        android:id="@+id/tag_viewlayout_root"
-        android:value="@string/tag1" />
-
-    <View
-        android:id="@+id/mock_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" >
-
-        <tag
-            android:id="@+id/tag_mock_view"
-            android:value="@string/tag2" />
-    </View>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/inflater_override_theme_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/inflater_override_theme_layout.xml
deleted file mode 100755
index 2d2a578e66c145afd4e2a301b7f6f9a6a88c61ba..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/inflater_override_theme_layout.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:theme="@style/Theme_OverrideOuter" >
-
-    <View
-        android:id="@+id/view_outer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:theme="@style/Theme_OverrideInner" >
-
-        <View
-            android:id="@+id/view_inner"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-        <View
-            android:id="@+id/view_attr"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:theme="?attr/themeOverrideAttr" />
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/inputmethod_edittext.xml b/proprietary/frameworks/base/tests/resources/res/layout/inputmethod_edittext.xml
deleted file mode 100755
index 849b411884be5f31aa13f10809553fb18f872747..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/inputmethod_edittext.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:background="@drawable/blue"
-                android:padding="10px">
-
-    <EditText android:id="@+id/entry"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:background="@android:drawable/editbox_background"/>
-
-</RelativeLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/keylistener_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/keylistener_layout.xml
deleted file mode 100755
index 96a419df4a6f600ab508dcd6dc66b1e62706020c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/keylistener_layout.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/keylistener_textview"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-/>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/layoutdirection_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/layoutdirection_layout.xml
deleted file mode 100755
index e506dc11e6fd46e42e32951b2ad294a215a7d7f7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/layoutdirection_layout.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2012 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:orientation="vertical">
-
-    <LinearLayout android:id="@+id/layout_linearlayout_ltr"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layoutDirection="ltr">
-
-        <LinearLayout android:id="@+id/layout_linearlayout_ltr_child_1"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="ltr" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_ltr_child_2"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="rtl" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_ltr_child_3"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="inherit" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_ltr_child_4"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="locale" />
-
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/layout_linearlayout_rtl"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layoutDirection="rtl">
-
-        <LinearLayout android:id="@+id/layout_linearlayout_rtl_child_1"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="ltr" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_rtl_child_2"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="rtl" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_rtl_child_3"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="inherit" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_rtl_child_4"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="locale" />
-
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/layout_linearlayout_locale"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layoutDirection="locale">
-
-        <LinearLayout android:id="@+id/layout_linearlayout_locale_child_1"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="ltr" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_locale_child_2"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="rtl" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_locale_child_3"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="inherit" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_locale_child_4"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="locale" />
-
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/layout_linearlayout_inherit"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layoutDirection="inherit">
-
-        <LinearLayout android:id="@+id/layout_linearlayout_inherit_child_1"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="ltr" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_inherit_child_2"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="rtl" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_inherit_child_3"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="inherit" />
-
-        <LinearLayout android:id="@+id/layout_linearlayout_inherit_child_4"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layoutDirection="locale" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/linearlayout_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/linearlayout_layout.xml
deleted file mode 100755
index c70937dfc6eb3934f960e86097ca6023f673e1a0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/linearlayout_layout.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-    <LinearLayout android:id="@+id/horizontal"
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="100dip"
-        android:background="#FF909090">
-
-        <TextView android:id="@+id/gravity_top"
-            android:background="#FF00FF00"
-            android:layout_width="wrap_content"
-            android:layout_height="50dip"
-            android:layout_gravity="top"
-            android:text="@string/horizontal_text_1"/>
-
-        <TextView android:id="@+id/gravity_center_vertical"
-            android:background="#FF00FF00"
-            android:layout_width="wrap_content"
-            android:layout_height="50dip"
-            android:layout_gravity="center_vertical"
-            android:text="@string/horizontal_text_2"/>
-
-        <TextView android:id="@+id/gravity_bottom"
-            android:background="#FF00FF00"
-            android:layout_width="wrap_content"
-            android:layout_height="50dip"
-            android:layout_gravity="bottom"
-            android:text="@string/horizontal_text_3"/>
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/vertical"
-        android:orientation="vertical"
-        android:layout_width="100dip"
-        android:layout_height="wrap_content"
-        android:background="#FFFF0909">
-
-        <TextView android:id="@+id/gravity_left"
-            android:background="#FF00FF00"
-            android:layout_width="wrap_content"
-            android:layout_height="20dip"
-            android:layout_gravity="left"
-            android:text="@string/vertical_text_1"/>
-
-        <TextView android:id="@+id/gravity_center_horizontal"
-            android:background="#FF0000FF"
-            android:layout_width="wrap_content"
-            android:layout_height="20dip"
-            android:layout_gravity="center_horizontal"
-            android:text="@string/vertical_text_2"/>
-
-        <TextView android:id="@+id/gravity_right"
-            android:background="#FF00FF00"
-            android:layout_width="wrap_content"
-            android:layout_height="20dip"
-            android:layout_gravity="right"
-            android:text="@string/vertical_text_3"/>
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/weightsum"
-        android:orientation="horizontal"
-        android:weightSum="1.0"
-        android:baselineAligned="false"
-        android:layout_width="100dip"
-        android:layout_height="100dip"
-        android:background="#FF909090">
-
-        <TextView android:id="@+id/weight_0_2"
-            android:background="#FF0000FF"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.2"
-            android:text="@string/horizontal_text_1"/>
-
-        <TextView android:id="@+id/weight_0_5"
-            android:background="#FFF00F0F"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.5"
-            android:text="@string/horizontal_text_2"/>
-
-        <TextView android:id="@+id/weight_0_3"
-            android:background="#FF0000FF"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.3"
-            android:text="@string/horizontal_text_3"/>
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/baseline_aligned_child_index"
-        android:orientation="vertical"
-        android:baselineAlignedChildIndex="1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="#FFFF0909">
-
-        <TextView android:id="@+id/textview1"
-            android:background="#FF00FF00"
-            android:layout_width="wrap_content"
-            android:layout_height="20dip"
-            android:layout_gravity="left"
-            android:text="@string/vertical_text_1"/>
-
-        <TextView android:id="@+id/textview2"
-            android:background="#FF0000FF"
-            android:layout_width="wrap_content"
-            android:layout_height="20dip"
-            android:layout_gravity="center_horizontal"
-            android:text="@string/vertical_text_2"/>
-
-        <TextView android:id="@+id/textview3"
-            android:background="#FF00FF00"
-            android:layout_width="wrap_content"
-            android:layout_height="20dip"
-            android:layout_gravity="right"
-            android:text="@string/vertical_text_3"/>
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/list_activity_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/list_activity_layout.xml
deleted file mode 100755
index 0486cf0be988dd441f4bdcc9efe08e5d82f4d83a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/list_activity_layout.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/text1"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-/>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/listview_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/listview_layout.xml
deleted file mode 100755
index ee8b6de3d010b8bd84d9ba4ec7c76fa1dde89641..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/listview_layout.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/headerview1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/header_view" />
-
-    <TextView android:id="@+id/headerview2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/header_view" />
-
-    <ListView android:id="@+id/listview_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <TextView android:id="@+id/footerview1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/footer_view" />
-
-    <TextView android:id="@+id/footerview2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/footer_view" />
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/local_sample.xml b/proprietary/frameworks/base/tests/resources/res/layout/local_sample.xml
deleted file mode 100755
index 6f02e7827268872a70c92049e601a79d29a4f0a4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/local_sample.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:padding="4dip"
-    android:gravity="center_horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:paddingBottom="4dip"
-        android:text="@string/text"/>
-
-    <Button android:id="@+id/go"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/text">
-        <requestFocus />
-    </Button>
-
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/mediacontroller_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/mediacontroller_layout.xml
deleted file mode 100755
index 871adf46710162cef76033f94a88a8ef0b481561..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/mediacontroller_layout.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <VideoView
-        android:id="@+id/mediacontroller_videoview"
-        android:layout_width="320px"
-        android:layout_height="240px"/>
-
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/multi_auto_complete_text_view_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/multi_auto_complete_text_view_layout.xml
deleted file mode 100755
index 50109c838901180c9e2aa1cc50a238c375b6b127..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/multi_auto_complete_text_view_layout.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/text_country" />
-
-    <MultiAutoCompleteTextView android:id="@+id/country_edit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/text_name" />
-
-    <MultiAutoCompleteTextView android:id="@+id/name_edit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/multi_view.xml b/proprietary/frameworks/base/tests/resources/res/layout/multi_view.xml
deleted file mode 100755
index 4f335d3be3ce6fb58e9b543f6b0a9373cd01f08d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/multi_view.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextureView
-        android:id="@+id/texture_view_1"
-        android:layout_width="160dp"
-        android:layout_height="120dp"/>
-
-    <TextureView
-        android:id="@+id/texture_view_2"
-        android:layout_width="160dp"
-        android:layout_height="120dp"/>
-    <SurfaceView
-        android:id="@+id/surface_view_1"
-        android:layout_width="160dp"
-        android:layout_height="120dp"/>
-
-    <SurfaceView
-        android:id="@+id/surface_view_2"
-        android:layout_width="160dp"
-        android:layout_height="120dp"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/popupwindow.xml b/proprietary/frameworks/base/tests/resources/res/layout/popupwindow.xml
deleted file mode 100755
index e6b0aedde5129a9f812cb2df54be2a15a8d56be8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/popupwindow.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-    <TextView android:id="@+id/anchor_upper"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/text_view_hint"
-        android:layout_weight="1"/>
-
-    <LinearLayout android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1">
-
-        <TextView android:id="@+id/anchor_middle_left"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:text="@string/text_view_hint"
-            android:layout_weight="1"/>
-
-        <TextView android:id="@+id/anchor_middle_right"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:text="@string/text_view_hint"
-            android:layout_weight="1"/>
-
-    </LinearLayout>
-
-    <TextView android:id="@+id/anchor_lower"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/text_view_hint"
-        android:layout_weight="1"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/progressbar_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/progressbar_layout.xml
deleted file mode 100755
index a1786b8d582e590dca829f1e0d69dff161c9802a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/progressbar_layout.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ProgressBar
-        android:id="@+id/progress_tint"
-        android:progressTint="@android:color/white"
-        android:progressTintMode="src_over"
-        android:progressBackgroundTint="@android:color/white"
-        android:progressBackgroundTintMode="src_over"
-        android:secondaryProgressTint="@android:color/white"
-        android:secondaryProgressTintMode="src_over"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="@android:style/Widget.ProgressBar.Horizontal" />
-
-    <ProgressBar
-        android:id="@+id/indeterminate_tint"
-        android:indeterminateTint="@android:color/white"
-        android:indeterminateTintMode="src_over"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="@android:style/Widget.ProgressBar.Large" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/radiogroup_1.xml b/proprietary/frameworks/base/tests/resources/res/layout/radiogroup_1.xml
deleted file mode 100755
index 1e9db839052145d86995943c908c5685b4a514bd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/radiogroup_1.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:layout_weight="0.5"
-    android:layout_gravity="bottom"
-    android:layout_margin="5px">
-</RadioGroup>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/ratingbar_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/ratingbar_layout.xml
deleted file mode 100755
index acc7fa8cea6b446a41247162a3c5736cfb24f6e6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/ratingbar_layout.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-
-    <RatingBar android:id="@+id/ratingbar_constructor"
-        android:isIndicator="false"
-        android:numStars="50"
-        android:rating="1.2"
-        android:stepSize="0.2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/relative_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/relative_layout.xml
deleted file mode 100755
index db4b2e8b28619ce49ff2840f82a9b3e651acec74..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/relative_layout.xml
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <RelativeLayout
-        android:id="@+id/relative_sublayout_attrs"
-        android:background="@drawable/blue"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <!-- view1, centered within its parent. -->
-        <TextView
-            android:id="@+id/relative_view1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:text="@string/relative_view1"/>
-
-        <!-- view2, below view1 and has same left position with view1. -->
-        <TextView
-            android:id="@+id/relative_view2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/relative_view1"
-            android:layout_alignLeft="@id/relative_view1"
-            android:text="@string/relative_view2"/>
-
-        <!-- view3, has same top position with view1 and same bottom position with view2,
-             and on the right of view1. -->
-        <TextView
-            android:id="@+id/relative_view3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@id/relative_view1"
-            android:layout_alignBottom="@id/relative_view2"
-            android:layout_toRightOf="@id/relative_view1"
-            android:text="@string/relative_view3"/>
-
-        <!-- view4, has same right position with view3 and above view3. -->
-        <TextView
-            android:id="@+id/relative_view4"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignRight="@id/relative_view3"
-            android:layout_above="@id/relative_view3"
-            android:text="@string/relative_view4"/>
-
-        <!-- view5 goes on the left-bottom -->
-        <TextView
-            android:id="@+id/relative_view5"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentLeft="true"
-            android:text="@string/relative_view5"/>
-
-        <!-- view6 goes on the top-right -->
-        <TextView
-            android:id="@+id/relative_view6"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentRight="true"
-            android:text="@string/relative_view6"/>
-
-        <!-- view7, has same baseline with view6 and centered horizontally within its parent. -->
-        <TextView
-            android:id="@+id/relative_view7"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBaseline="@id/relative_view6"
-            android:layout_centerHorizontal="true"
-            android:text="@string/relative_view7"/>
-
-        <!-- view8, centered vertically within its parent and on the left of view1. -->
-        <TextView
-            android:id="@+id/relative_view8"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toLeftOf="@id/relative_view1"
-            android:layout_centerVertical="true"
-            android:text="@string/relative_view8"/>
-
-        <!-- view9, has same top and bottom position with view3 and same left position
-             with its parent. -->
-        <TextView
-            android:id="@+id/relative_view9"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignLeft="@id/gravity_bottom"
-            android:layout_alignTop="@id/relative_view3"
-            android:layout_alignBottom="@id/relative_view3"
-            android:layout_alignWithParentIfMissing="true"
-            android:text="@string/relative_view9"/>
-
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/relative_sublayout_gravity"
-        android:background="@drawable/yellow"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <!-- view10 -->
-        <TextView
-            android:id="@+id/relative_view10"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/relative_view10"/>
-
-        <!-- view11 -->
-        <TextView
-            android:id="@+id/relative_view11"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/relative_view10"
-            android:text="@string/relative_view11"/>
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/relative_sublayout_ignore_gravity"
-        android:background="@drawable/red"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:ignoreGravity="@+id/relative_view12"
-        android:gravity="right">
-
-        <!-- view12 -->
-        <TextView
-            android:id="@id/relative_view12"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/relative_view12"/>
-
-        <!-- view13 -->
-        <TextView
-            android:id="@+id/relative_view13"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/relative_view13"/>
-    </RelativeLayout>
-
-    <Spinner
-        android:id="@+id/spinner1"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:prompt="@string/text_view_hello"/>
-
-    <RelativeLayout
-            android:id="@+id/relative_sublayout_attrs_2"
-            android:background="@drawable/blue"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-        <!-- view21, centered within its parent. -->
-        <TextView
-                android:id="@+id/relative_view21"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:text="@string/relative_view1"/>
-
-        <!-- view22, below view1 and has same start position with view21. -->
-        <TextView
-                android:id="@+id/relative_view22"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/relative_view21"
-                android:layout_alignStart="@id/relative_view21"
-                android:text="@string/relative_view2"/>
-
-        <!-- view23, has same top position with view21 and same bottom position with view22,
-             and on the end of view1. -->
-        <TextView
-                android:id="@+id/relative_view23"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignTop="@id/relative_view21"
-                android:layout_alignBottom="@id/relative_view22"
-                android:layout_toEndOf="@id/relative_view21"
-                android:text="@string/relative_view3"/>
-
-        <!-- view24, has same end position with view23 and above view23. -->
-        <TextView
-                android:id="@+id/relative_view24"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignEnd="@id/relative_view23"
-                android:layout_above="@id/relative_view23"
-                android:text="@string/relative_view4"/>
-
-        <!-- view25 goes on the start-bottom -->
-        <TextView
-                android:id="@+id/relative_view25"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_alignParentStart="true"
-                android:text="@string/relative_view5"/>
-
-        <!-- view26 goes on the top-end -->
-        <TextView
-                android:id="@+id/relative_view26"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentEnd="true"
-                android:text="@string/relative_view6"/>
-
-        <!-- view27, has same baseline with view26 and centered horizontally within its parent. -->
-        <TextView
-                android:id="@+id/relative_view27"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignBaseline="@id/relative_view26"
-                android:layout_centerHorizontal="true"
-                android:text="@string/relative_view7"/>
-
-        <!-- view28, centered vertically within its parent and on the start of view21. -->
-        <TextView
-                android:id="@+id/relative_view28"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_toStartOf="@id/relative_view21"
-                android:layout_centerVertical="true"
-                android:text="@string/relative_view8"/>
-
-        <!-- view29, has same top and bottom position with view23 and same start position
-             with its parent. -->
-        <TextView
-                android:id="@+id/relative_view29"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignStart="@id/gravity_bottom"
-                android:layout_alignTop="@id/relative_view23"
-                android:layout_alignBottom="@id/relative_view23"
-                android:layout_alignWithParentIfMissing="true"
-                android:text="@string/relative_view9"/>
-
-    </RelativeLayout>
-
-</RelativeLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/remote_view_test_bad_1.xml b/proprietary/frameworks/base/tests/resources/res/layout/remote_view_test_bad_1.xml
deleted file mode 100755
index a65a5eca7c9e716c5ad3539894e2a5f84e705aae..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/remote_view_test_bad_1.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/linear"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <EditText android:id="@+id/edit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/remote_view_test_bad_2.xml b/proprietary/frameworks/base/tests/resources/res/layout/remote_view_test_bad_2.xml
deleted file mode 100755
index 92623d810aa83d8f99ef3c9dca16a98c29d3c5fa..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/remote_view_test_bad_2.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/linear"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <WebView android:id="@+id/web"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/remote_view_test_good.xml b/proprietary/frameworks/base/tests/resources/res/layout/remote_view_test_good.xml
deleted file mode 100755
index 3df9d6240018cba24b2915581780cfdecbf339be..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/remote_view_test_good.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/linear"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <ImageView android:id="@+id/image"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <FrameLayout android:id="@+id/frame"
-        android:layout_width="10dip"
-        android:layout_height="10dip" />
-
-    <RelativeLayout android:id="@+id/relative"
-        android:layout_width="10dip"
-        android:layout_height="10dip" />
-
-    <AbsoluteLayout android:id="@+id/absolute"
-        android:layout_width="10dip"
-        android:layout_height="10dip" />
-
-    <ProgressBar android:id="@+id/progress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <ImageButton android:id="@+id/image_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/remoteviews_good.xml b/proprietary/frameworks/base/tests/resources/res/layout/remoteviews_good.xml
deleted file mode 100755
index 8fdbc645a33bc4c085907dc3b2727bf256701969..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/remoteviews_good.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/remoteViews_good"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout android:id="@+id/remoteView_linear"
-        android:layout_width="10dip"
-        android:layout_height="10dip" />
-
-    <TextView android:id="@+id/remoteView_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <ImageView android:id="@+id/remoteView_image"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <FrameLayout android:id="@+id/remoteView_frame"
-        android:layout_width="10dip"
-        android:layout_height="10dip" />
-
-    <RelativeLayout android:id="@+id/remoteView_relative"
-        android:layout_width="10dip"
-        android:layout_height="10dip" />
-
-    <AbsoluteLayout android:id="@+id/remoteView_absolute"
-        android:layout_width="10dip"
-        android:layout_height="10dip" />
-
-    <ProgressBar android:id="@+id/remoteView_progress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="?android:attr/progressBarStyleHorizontal" />
-
-    <Chronometer android:id="@+id/remoteView_chronometer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/remoteviews_host.xml b/proprietary/frameworks/base/tests/resources/res/layout/remoteviews_host.xml
deleted file mode 100755
index ace59037bd246a5b82b082135551b6a74d4722c4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/remoteviews_host.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/remoteView_host">
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/scrollview_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/scrollview_layout.xml
deleted file mode 100755
index 3c9a474c78447bde5d8130a606d479cc5271e764..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/scrollview_layout.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<android.widget.cts.MyScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/scroll_view"
-    android:layout_width="100dip"
-    android:layout_height="100dip">
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="250dip"
-        android:layout_height="wrap_content">
-
-        <Button
-            android:id="@+id/first_child"
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_1"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_2"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_3"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_1"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_2"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_3"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_1"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_2"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_3"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_1"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_2"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_3"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_1"/>
-
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_2"/>
-
-        <Button
-            android:id="@+id/last_child"
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_3"/>
-    </LinearLayout>
-
-</android.widget.cts.MyScrollView>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/searchview.xml b/proprietary/frameworks/base/tests/resources/res/layout/searchview.xml
deleted file mode 100755
index dba105aeb2054b5a737d67caa5bca3fce3388ad3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/searchview.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    <SearchView android:id="@+id/searchView1"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                xmlns:android="http://schemas.android.com/apk/res/android">
-    </SearchView>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/seekbar_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/seekbar_layout.xml
deleted file mode 100755
index 5c311fd8f3d0d65a0ec17263ce3af09c89d46645..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/seekbar_layout.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-     <SeekBar android:id="@+id/seekBar"
-         android:layout_width="match_parent"
-         android:layout_height="wrap_content"
-         android:max="100"
-         android:progress="50"
-         android:secondaryProgress="75" />
-
-    <SeekBar
-        android:id="@+id/thumb_tint"
-        android:thumbTint="@android:color/white"
-        android:thumbTintMode="src_over"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/simple_dropdown_item_1line.xml b/proprietary/frameworks/base/tests/resources/res/layout/simple_dropdown_item_1line.xml
deleted file mode 100755
index 9a044b15b6e02107b966fb8150f863d3d64244ce..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/simple_dropdown_item_1line.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/text1"
-    style="?android:attr/dropDownItemStyle"
-    android:textAppearance="?android:attr/textAppearanceLargeInverse"
-    android:singleLine="true"
-    android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight" />
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/simple_spinner_item.xml b/proprietary/frameworks/base/tests/resources/res/layout/simple_spinner_item.xml
deleted file mode 100755
index 247bffa690c8b2e44188b9e1b900f02a5ddc721f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/simple_spinner_item.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License"); 
-     you may not use this file except in compliance with the License. 
-     You may obtain a copy of the License at 
-
-         http://www.apache.org/licenses/LICENSE-2.0 
-
-     Unless required by applicable law or agreed to in writing, software 
-     distributed under the License is distributed on an "AS IS" BASIS, 
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-     See the License for the specific language governing permissions and 
-     limitations under the License.
--->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" 
-    android:id="@android:id/text1"
-    style="?android:attr/spinnerItemStyle"
-    android:singleLine="true"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content" />
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/sliding_drawer_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/sliding_drawer_layout.xml
deleted file mode 100755
index 3f84d46a5eb6ba6ce8f26b0c4a4d381d208bd7ba..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/sliding_drawer_layout.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <SlidingDrawer
-        android:id="@+id/drawer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:animateOnClick="false"
-
-        android:handle="@+id/handle"
-        android:content="@+id/content">
-
-        <ImageView
-            android:id="@id/handle"
-            android:background="#FF00FF00"
-            android:layout_width="88dip"
-            android:layout_height="44dip" />
-
-        <TextView
-            android:id="@id/content"
-            android:background="#FF0000FF"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:text="@string/hello_world" />
-
-    </SlidingDrawer>
-
-</RelativeLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/surface_view.xml b/proprietary/frameworks/base/tests/resources/res/layout/surface_view.xml
deleted file mode 100755
index f4105441c60a378b79e203256da85ebfa6b77c06..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/surface_view.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <SurfaceView
-        android:id="@+id/surface_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/surface_view_2.xml b/proprietary/frameworks/base/tests/resources/res/layout/surface_view_2.xml
deleted file mode 100755
index fe53c71fcc79ffe2f211c4b886b5baea0a98e234..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/surface_view_2.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <SurfaceView
-        android:id="@+id/surface_view"
-        android:layout_width="320dp"
-        android:layout_height="240dp"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/tabhost_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/tabhost_layout.xml
deleted file mode 100755
index 1bae57a33f5d14866506aecc48d458ebe8377ad3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/tabhost_layout.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TabHost xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/tabhost"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-    <TabWidget android:id="@android:id/tabs"
-        android:layout_width="match_parent"
-        android:layout_height="68dip"
-        android:paddingLeft="1dip"
-        android:paddingRight="1dip"
-        android:paddingTop="4dip"
-    />
-
-    <FrameLayout android:id="@android:id/tabcontent"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1">
-
-        <TextView android:id="@+id/tabhost_textview"
-            android:password="true"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/hello_world"/>
-
-        <ListView android:id="@+id/tabhost_listview"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-    </FrameLayout>
-</TabHost>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/table_layout_1.xml b/proprietary/frameworks/base/tests/resources/res/layout/table_layout_1.xml
deleted file mode 100755
index 0896cd2973941376ec54ca18c1dddb2b73c7df2d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/table_layout_1.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/table1"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:collapseColumns="0"
-    android:stretchColumns="2">
-
-    <TableRow>
-        <TextView
-            android:text="@string/table_layout_first"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_second"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_third"
-            android:padding="3dip" />
-    </TableRow>
-</TableLayout>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/table_layout_2.xml b/proprietary/frameworks/base/tests/resources/res/layout/table_layout_2.xml
deleted file mode 100755
index 84750fc9a90b74381a9723f9b5e1f18e62799d63..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/table_layout_2.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/table2"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:shrinkColumns="1">
-
-    <TableRow>
-        <TextView
-            android:layout_column="1"
-            android:text="@string/table_layout_long"
-            android:padding="3dip" />
-        <TextView
-            android:layout_span="2"
-            android:text="@string/table_layout_second"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_third"
-            android:padding="3dip" />
-    </TableRow>
-</TableLayout>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/textview_autolink.xml b/proprietary/frameworks/base/tests/resources/res/layout/textview_autolink.xml
deleted file mode 100755
index 53d89f36de047ce18f4ac6531e82f351edddb823..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/textview_autolink.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/autolink_default"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-    <TextView android:id="@+id/autolink_web"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:autoLink="web"/>
-
-    <TextView android:id="@+id/autolink_email"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:autoLink="email"/>
-
-    <TextView android:id="@+id/autolink_phone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:autoLink="phone"/>
-
-    <TextView android:id="@+id/autolink_all"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:autoLink="all"/>
-
-    <TextView android:id="@+id/autolink_compound1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:autoLink="web|email"/>
-
-    <TextView android:id="@+id/autolink_compound2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:autoLink="web|phone"/>
-
-    <TextView android:id="@+id/autolink_compound3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:autoLink="email|phone"/>
-
-    <TextView android:id="@+id/autolink_compound4"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:autoLink="phone|all"/>
-
-</FrameLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/textview_autotext.xml b/proprietary/frameworks/base/tests/resources/res/layout/textview_autotext.xml
deleted file mode 100755
index 9a1e9efe2de24c6b2326bf60573e0b3bd6f7fabf..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/textview_autotext.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/autotext_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <TextView android:id="@+id/autotext_false"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:autoText="false"/>
-
-    <TextView android:id="@+id/autotext_true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:autoText="true"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/textview_buffertype.xml b/proprietary/frameworks/base/tests/resources/res/layout/textview_buffertype.xml
deleted file mode 100755
index 33b0d207f09e9306bdc9bcf40c20af7235073119..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/textview_buffertype.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/buffertype_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <TextView android:id="@+id/buffertype_normal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:bufferType="normal"/>
-
-    <TextView android:id="@+id/buffertype_spannable"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:bufferType="spannable"/>
-
-    <TextView android:id="@+id/buffertype_editable"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:bufferType="editable"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/textview_capitalize.xml b/proprietary/frameworks/base/tests/resources/res/layout/textview_capitalize.xml
deleted file mode 100755
index 4b80ce0f8fdab990f77f49688b5d5189829caf8f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/textview_capitalize.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/capitalize_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:editable="true"/>
-
-    <TextView android:id="@+id/capitalize_none"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:capitalize="none"/>
-
-    <TextView android:id="@+id/capitalize_sentences"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:capitalize="sentences"/>
-
-    <TextView android:id="@+id/capitalize_words"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:capitalize="words"/>
-
-    <TextView android:id="@+id/capitalize_characters"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:capitalize="characters"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/textview_content.xml b/proprietary/frameworks/base/tests/resources/res/layout/textview_content.xml
deleted file mode 100755
index 189f812ae47ac5d0a3b5ffd2558ba3fafabc748b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/textview_content.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/text_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <TextView android:id="@+id/text_resid"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/text_view_hello"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/textview_digits.xml b/proprietary/frameworks/base/tests/resources/res/layout/textview_digits.xml
deleted file mode 100755
index 2a0d470ba31a8bf1f68fe1727f8e346002fedcde..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/textview_digits.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/digits_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:editable="true"/>
-
-    <TextView android:id="@+id/digits_hex"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:digits="0123456789ABCDEFabcdef.-"/>
-
-    <TextView android:id="@+id/digits_blank"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:digits=""/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/textview_ellipsize.xml b/proprietary/frameworks/base/tests/resources/res/layout/textview_ellipsize.xml
deleted file mode 100755
index 0fc57793999e8faac5ffa69da1aec735cb54cfa9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/textview_ellipsize.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/ellipsize_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <TextView android:id="@+id/ellipsize_none"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ellipsize="none"/>
-
-    <TextView android:id="@+id/ellipsize_start"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ellipsize="start"/>
-
-    <TextView android:id="@+id/ellipsize_middle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ellipsize="middle"/>
-
-    <TextView android:id="@+id/ellipsize_end"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/textview_ems.xml b/proprietary/frameworks/base/tests/resources/res/layout/textview_ems.xml
deleted file mode 100755
index a169cb011a56f0e2e2eaf58aa62e88d30f557aff..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/textview_ems.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/ems_default"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:scrollHorizontally="true"/>
-
-    <TextView android:id="@+id/ems_huge"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:ems="60"
-        android:text="@string/explain"
-        android:scrollHorizontally="true"/>
-
-    <TextView android:id="@+id/ems_tiny"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:ems="1"
-        android:text="@string/explain"
-        android:scrollHorizontally="true"/>
-
-    <TextView android:id="@+id/ems_zero"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:ems="0"
-        android:text="@string/explain"
-        android:scrollHorizontally="true"/>
-
-    <TextView android:id="@+id/minEms_tiny"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minEms="1"
-        android:scrollHorizontally="true"/>
-
-    <TextView android:id="@+id/minEms_huge"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minEms="1000"
-        android:scrollHorizontally="true"/>
-
-    <TextView android:id="@+id/minEms_zero"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minEms="0"
-        android:scrollHorizontally="true"/>
-
-    <TextView android:id="@+id/maxEms_tiny"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:maxEms="1"
-        android:scrollHorizontally="true"/>
-
-    <TextView android:id="@+id/maxEms_huge"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:maxEms="1000"
-        android:scrollHorizontally="true"/>
-
-    <TextView android:id="@+id/maxEms_zero"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:maxEms="0"
-        android:scrollHorizontally="true"/>
-
-    <TextView android:id="@+id/minEms_maxEms_correct"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:maxEms="60"
-        android:minEms="10"
-        android:scrollHorizontally="true"/>
-
-    <TextView android:id="@+id/minEms_maxEms_wrong"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:maxEms="10"
-        android:minEms="60"
-        android:scrollHorizontally="true"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/textview_gravity.xml b/proprietary/frameworks/base/tests/resources/res/layout/textview_gravity.xml
deleted file mode 100755
index a4a7592179cd5cd7b4aaf12c8312b6cec3340870..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/textview_gravity.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/gravity_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <TextView android:id="@+id/gravity_bottom"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="bottom"/>
-
-    <TextView android:id="@+id/gravity_right"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="right"/>
-
-    <TextView android:id="@+id/gravity_fill"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="fill"/>
-
-    <TextView android:id="@+id/gravity_center"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"/>
-
-    <TextView android:id="@+id/gravity_center_vertical_right"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical|right"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/textview_hint_linksclickable_freezestext.xml b/proprietary/frameworks/base/tests/resources/res/layout/textview_hint_linksclickable_freezestext.xml
deleted file mode 100755
index a22e42988928205b7fe214c8528aee6322d6b0a3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/textview_hint_linksclickable_freezestext.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/hint_linksClickable_freezesText_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <TextView android:id="@+id/hint_blank"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint=""/>
-
-    <TextView android:id="@+id/hint_string"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/text_view_simple_hint"/>
-
-    <TextView android:id="@+id/hint_resid"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/text_view_hint"/>
-
-    <TextView android:id="@+id/linksClickable_true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:linksClickable="true"/>
-
-    <TextView android:id="@+id/linksClickable_false"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:linksClickable="false"/>
-
-    <TextView android:id="@+id/freezesText_true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:freezesText="true"/>
-
-    <TextView android:id="@+id/freezesText_false"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:freezesText="false"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/textview_inputmethod_blank.xml b/proprietary/frameworks/base/tests/resources/res/layout/textview_inputmethod_blank.xml
deleted file mode 100755
index 442061162bb277df4cc9c57cee1cdef482033776..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/textview_inputmethod_blank.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputMethod=""/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/textview_inputmethod_builtin.xml b/proprietary/frameworks/base/tests/resources/res/layout/textview_inputmethod_builtin.xml
deleted file mode 100755
index e09a0ea3264ea0651cb1b4ab0c86bb5aa22468de..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/textview_inputmethod_builtin.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/inputMethod_builtIn_digits"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputMethod="android.text.method.DigitsKeyListener"/>
-
-    <TextView android:id="@+id/inputMethod_builtIn_datetime"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputMethod="android.text.method.DateTimeKeyListener"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/textview_inputmethod_notexist.xml b/proprietary/frameworks/base/tests/resources/res/layout/textview_inputmethod_notexist.xml
deleted file mode 100755
index 9030b629baf4d1485dda08a442857d0b95339eec..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/textview_inputmethod_notexist.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputMethod="android.text.method.NotExistKeyListener"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/textview_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/textview_layout.xml
deleted file mode 100755
index 108e3f0ee09014ea9d4bc3c98613ac6f0fb9a7dd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/textview_layout.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/layout_textviewtest">
-
-    <ScrollView android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-        <LinearLayout android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-            <TextView android:id="@+id/textview_textAttr"
-                    android:text="@string/text_view_hello"
-                    android:textColor="@drawable/black"
-                    android:textColorHighlight="@drawable/yellow"
-                    android:textColorHint="@drawable/red"
-                    android:textColorLink="@drawable/blue"
-                    android:textScaleX="1.2"
-                    android:typeface="normal"
-                    android:textSize="20px"
-                    android:textStyle="normal"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-        
-            <TextView android:id="@+id/textview_password"
-                    android:password="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-        
-            <TextView android:id="@+id/textview_singleLine"
-                    android:singleLine="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-        
-            <TextView android:id="@+id/textview_text"
-                    android:text="@string/text_view_hello"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-            <TextView android:id="@+id/textview_text_two_lines"
-                    android:text="@string/text_view_hello_two_lines"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-            <android.widget.cts.MockTextView
-                    android:id="@+id/mock_textview_left"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:requiresFadingEdge="horizontal"
-                    android:singleLine="true"
-                    android:text="@string/long_text"
-                    android:gravity="left"
-                    />
-
-            <android.widget.cts.MockTextView
-                    android:id="@+id/mock_textview_right"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:requiresFadingEdge="horizontal"
-                    android:singleLine="true"
-                    android:text="@string/long_text"
-                    android:gravity="right"
-                    />
-
-            <android.widget.cts.MockTextView
-                    android:id="@+id/mock_textview_center"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:requiresFadingEdge="horizontal"
-                    android:singleLine="true"
-                    android:text="@string/long_text"
-                    android:gravity="center"
-                    />
-        </LinearLayout>
-
-    </ScrollView>
-
-    <TextView android:id="@+id/textview_ltr"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"/>
-
-    <TextView android:id="@+id/textview_rtl"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"/>
-
-    <TextView android:id="@+id/textview_drawable_1_1"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:drawableLeft="@drawable/icon_blue"
-              android:drawableRight="@drawable/icon_red"
-              android:drawableTop="@drawable/icon_green"
-              android:drawableBottom="@drawable/icon_yellow"
-            />
-
-    <TextView android:id="@+id/textview_drawable_1_2"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:drawableLeft="@drawable/icon_blue"
-              android:drawableRight="@drawable/icon_red"
-              android:drawableTop="@drawable/icon_green"
-              android:drawableBottom="@drawable/icon_yellow"
-              android:layoutDirection="rtl"
-            />
-
-    <TextView android:id="@+id/textview_drawable_2_1"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:drawableStart="@drawable/icon_blue"
-              android:drawableEnd="@drawable/icon_red"
-              android:drawableTop="@drawable/icon_green"
-              android:drawableBottom="@drawable/icon_yellow"
-            />
-
-    <TextView android:id="@+id/textview_drawable_2_2"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:drawableStart="@drawable/icon_blue"
-              android:drawableEnd="@drawable/icon_red"
-              android:drawableTop="@drawable/icon_green"
-              android:drawableBottom="@drawable/icon_yellow"
-              android:layoutDirection="rtl"
-            />
-
-    <TextView android:id="@+id/textview_drawable_3_1"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:drawableLeft="@drawable/icon_black"
-              android:drawableRight="@drawable/icon_black"
-              android:drawableStart="@drawable/icon_blue"
-              android:drawableEnd="@drawable/icon_red"
-              android:drawableTop="@drawable/icon_green"
-              android:drawableBottom="@drawable/icon_yellow"
-            />
-
-    <TextView android:id="@+id/textview_drawable_3_2"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:drawableLeft="@drawable/icon_black"
-              android:drawableRight="@drawable/icon_black"
-              android:drawableStart="@drawable/icon_blue"
-              android:drawableEnd="@drawable/icon_red"
-              android:drawableTop="@drawable/icon_green"
-              android:drawableBottom="@drawable/icon_yellow"
-              android:layoutDirection="rtl"
-            />
-
-
-    <LinearLayout android:orientation="vertical"
-                  android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  android:layoutDirection="ltr">
-
-        <TextView android:id="@+id/textview_drawable_4_1"
-                  android:layout_height="wrap_content"
-                  android:layout_width="wrap_content"
-                  android:drawableStart="@drawable/icon_blue"
-                  android:drawableEnd="@drawable/icon_red"
-                  android:drawableTop="@drawable/icon_green"
-                  android:drawableBottom="@drawable/icon_yellow"
-                />
-
-        <TextView android:id="@+id/textview_drawable_5_1"
-                  android:layout_height="wrap_content"
-                  android:layout_width="wrap_content"
-                  android:drawableLeft="@drawable/icon_black"
-                  android:drawableRight="@drawable/icon_black"
-                  android:drawableStart="@drawable/icon_blue"
-                  android:drawableEnd="@drawable/icon_red"
-                  android:drawableTop="@drawable/icon_green"
-                  android:drawableBottom="@drawable/icon_yellow"
-                />
-
-    </LinearLayout>
-
-    <LinearLayout android:orientation="vertical"
-                  android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  android:layoutDirection="rtl">
-
-        <TextView android:id="@+id/textview_drawable_4_2"
-                  android:layout_height="wrap_content"
-                  android:layout_width="wrap_content"
-                  android:drawableStart="@drawable/icon_blue"
-                  android:drawableEnd="@drawable/icon_red"
-                  android:drawableTop="@drawable/icon_green"
-                  android:drawableBottom="@drawable/icon_yellow"
-                />
-
-        <TextView android:id="@+id/textview_drawable_5_2"
-                  android:layout_height="wrap_content"
-                  android:layout_width="wrap_content"
-                  android:drawableLeft="@drawable/icon_black"
-                  android:drawableRight="@drawable/icon_black"
-                  android:drawableStart="@drawable/icon_blue"
-                  android:drawableEnd="@drawable/icon_red"
-                  android:drawableTop="@drawable/icon_green"
-                  android:drawableBottom="@drawable/icon_yellow"
-                />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/textview_numeric.xml b/proprietary/frameworks/base/tests/resources/res/layout/textview_numeric.xml
deleted file mode 100755
index e60cb26bb644eb3dc416159f6a429ff0fa01a2c4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/textview_numeric.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/numeric_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:editable="true"/>
-
-    <TextView android:id="@+id/numeric_integer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="integer"/>
-
-    <TextView android:id="@+id/numeric_signed"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="signed"/>
-
-    <TextView android:id="@+id/numeric_decimal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="decimal"/>
-
-    <TextView android:id="@+id/numeric_signed_integer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="signed|integer"/>
-
-    <TextView android:id="@+id/numeric_integer_decimal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="integer|decimal"/>
-
-    <TextView android:id="@+id/numeric_signed_decimal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="signed|decimal"/>
-
-    <TextView android:id="@+id/numeric_signed_decimal_integer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numeric="signed|integer|decimal"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/textview_phonenumber.xml b/proprietary/frameworks/base/tests/resources/res/layout/textview_phonenumber.xml
deleted file mode 100755
index d0975c67f6cef918e922fcba315d809a7f8205a2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/textview_phonenumber.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/phoneNumber_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:editable="true"/>
-
-    <TextView android:id="@+id/phoneNumber_true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:phoneNumber="true"/>
-
-    <TextView android:id="@+id/phoneNumber_false"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:phoneNumber="false"
-        android:editable="true"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/textview_selectallonfocus.xml b/proprietary/frameworks/base/tests/resources/res/layout/textview_selectallonfocus.xml
deleted file mode 100755
index b1c3682537c9e6c39d7195a9ddd47bd46f2dc752..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/textview_selectallonfocus.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/selectAllOnFocus_default"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:focusable="true"/>
-
-    <TextView android:id="@+id/selectAllOnFocus_true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:selectAllOnFocus="true"
-        android:focusable="true"/>
-
-    <TextView android:id="@+id/selectAllOnFocus_false"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:selectAllOnFocus="false"
-        android:focusable="true"/>
-
-        <TextView android:id="@+id/selectAllOnFocus_dummy"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:focusable="true"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/timepicker.xml b/proprietary/frameworks/base/tests/resources/res/layout/timepicker.xml
deleted file mode 100755
index 352f69be4ae150547fc32f0ed05d8d982929ce2f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/timepicker.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TimePicker xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/togglebutton_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/togglebutton_layout.xml
deleted file mode 100755
index a6c08e13fe1ccabd981b2e3f76c46815cb2216ad..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/togglebutton_layout.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <ToggleButton android:id="@+id/toggle1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <ToggleButton android:id="@+id/toggle2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <ToggleButton android:id="@+id/button_tint"
-            android:buttonTint="@android:color/white"
-            android:buttonTintMode="src_over"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-    </LinearLayout>
-
-</ScrollView>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/twolinelistitem.xml b/proprietary/frameworks/base/tests/resources/res/layout/twolinelistitem.xml
deleted file mode 100755
index ec256c1162a1a98a6f987b14a8219f27572f901d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/twolinelistitem.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TwoLineListItem xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:id="@+id/twoLineListItem">
-
-    <TextView android:id="@android:id/text1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/twolinelistitem_test_text1"/>
-
-    <TextView android:id="@android:id/text2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/twolinelistitem_test_text2"/>
-
-</TwoLineListItem>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/urlspan_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/urlspan_layout.xml
deleted file mode 100755
index 2ca95acc62a81b9e7352bb4ac27d1c03adc262cd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/urlspan_layout.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-    <TextView android:id="@+id/url"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="4dip"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:text="@string/text_view_hello"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/using_views_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/using_views_layout.xml
deleted file mode 100755
index b35aa08872e2558bae5c99d09b86a08dd1975428..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/using_views_layout.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:id="@+id/country"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/country"/>
-
-    <EditText
-        android:id="@+id/entry"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@android:drawable/editbox_background"
-        android:layout_below="@id/country"/>
-
-    <Button
-        android:id="@+id/cancel"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/entry"
-        android:layout_alignParentRight="true"
-        android:layout_marginLeft="10dip"
-        android:text="@string/id_cancel"/>
-
-    <Button
-        android:id="@+id/ok"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toLeftOf="@id/cancel"
-        android:layout_alignTop="@id/cancel"
-        android:text="@string/id_ok"/>
-
-    <TextView
-        android:id="@+id/symbol"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/ok"
-        android:text="@string/symbol"/>
-
-    <TextView
-        android:id="@+id/symbolball"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/symbol"
-        android:layout_marginLeft="20dip"/>
-
-    <TextView
-        android:id="@+id/warning"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#aa0000"
-        android:layout_below="@id/symbolball"
-        android:text="@string/country_warning"
-        android:visibility="invisible"
-        android:layout_weight="2"/>
-
-</RelativeLayout>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/videoview_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/videoview_layout.xml
deleted file mode 100755
index 9b042cbbb161571a8a84ed58e3a0cb937d56748f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/videoview_layout.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <VideoView
-        android:id="@+id/videoview"
-        android:layout_width="160px"
-        android:layout_height="120px"/>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/view_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/view_layout.xml
deleted file mode 100755
index fa817dc4dad17234c2ddc5156b5cb9eb9abb74a1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/view_layout.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 Esmertec AG.
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/viewlayout_root"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <android.view.cts.MockView
-        android:id="@+id/mock_view"
-        android:layout_width="100px"
-        android:layout_height="200px"/>
-
-    <android.view.cts.MockView
-        android:id="@+id/scroll_view"
-        android:layout_width="100px"
-        android:layout_height="200px"
-        android:scrollbars="horizontal|vertical"
-        android:fadingEdge="horizontal|vertical"
-        android:fadingEdgeLength="20px"/>
-
-    <android.view.cts.MockView
-        android:id="@+id/scroll_view_2"
-        android:layout_width="100px"
-        android:layout_height="200px"
-        android:scrollbars="horizontal|vertical"
-        android:requiresFadingEdge="horizontal|vertical"
-        android:fadingEdgeLength="20px"/>
-
-    <View
-        android:id="@+id/fit_windows"
-        android:fitsSystemWindows="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-    <android.view.cts.MockView
-            android:id="@+id/mock_view_padding_full"
-            android:layout_width="200px"
-            android:layout_height="200px"
-            android:padding="0px"
-            android:background="@drawable/padding_0" />
-
-    <android.view.cts.MockView
-            android:id="@+id/mock_view_padding_left"
-            android:layout_width="200px"
-            android:layout_height="200px"
-            android:paddingLeft="0px"
-            android:background="@drawable/padding_0" />
-
-    <android.view.cts.MockView
-            android:id="@+id/mock_view_padding_right"
-            android:layout_width="200px"
-            android:layout_height="200px"
-            android:paddingRight="0px"
-            android:background="@drawable/padding_0" />
-
-    <android.view.cts.MockView
-            android:id="@+id/mock_view_padding_top"
-            android:layout_width="200px"
-            android:layout_height="200px"
-            android:paddingTop="0px"
-            android:background="@drawable/padding_0" />
-
-    <android.view.cts.MockView
-            android:id="@+id/mock_view_padding_bottom"
-            android:layout_width="200px"
-            android:layout_height="200px"
-            android:paddingBottom="0dp"
-            android:background="@drawable/padding_0" />
-
-    <android.view.cts.MockView
-            android:id="@+id/mock_view_padding_runtime_updated"
-            android:layout_width="200px"
-            android:layout_height="200px"
-            android:paddingStart="8px"
-            android:paddingEnd="8px"
-            android:background="@drawable/no_padding" />
-
-    <View
-        android:id="@+id/background_tint"
-        android:backgroundTint="@android:color/white"
-        android:backgroundTintMode="src_over"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/view_layout_position.xml b/proprietary/frameworks/base/tests/resources/res/layout/view_layout_position.xml
deleted file mode 100755
index 7d28186afc530cc54aac190c7f6108fb18fcd44a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/view_layout_position.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 Esmertec AG.
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-            android:id="@+id/testparent"
-            android:layout_marginLeft = "1dip"
-            android:layout_marginTop = "2dip"
-            android:layout_marginRight = "3dip"
-            android:layout_marginBottom = "4dip"
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-        <View
-            android:id="@+id/testview"
-            android:layout_marginLeft = "5dip"
-            android:layout_marginTop = "6dip"
-            android:layout_marginRight = "7dip"
-            android:layout_marginBottom = "8dip"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
-
-    </LinearLayout>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/view_visibility_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/view_visibility_layout.xml
deleted file mode 100755
index 92d22ed6fece6f2b4f50ca94e31c1b0761c1d214..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/view_visibility_layout.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <View
-        android:id="@+id/textview1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="visible"/>
-
-    <View
-        android:id="@+id/textview2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="invisible"/>
-
-    <View
-        android:id="@+id/textview3"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"/>
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/viewanimator_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/viewanimator_layout.xml
deleted file mode 100755
index 96b24837d96898e96f240dce5da86bf52e430dff..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/viewanimator_layout.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<!-- Demonstrates using a relative layout to create a form -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:focusable="true"
-    android:background="@drawable/blue">
-
-    <TextView android:id="@+id/label"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
-        android:text="@string/viewanimator_test"/>
-
-    <EditText android:id="@+id/entry"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@android:drawable/editbox_background"
-        android:layout_below="@id/label"/>
-
-    <Button android:id="@+id/cancel"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/entry"
-        android:layout_alignParentRight="true"
-        android:layout_marginLeft="10px"
-        android:text="@string/id_cancel" />
-
-    <Button android:id="@+id/ok"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toLeftOf="@id/cancel"
-        android:layout_alignTop="@id/cancel"
-        android:text="@string/id_ok" />
-
-</RelativeLayout>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/viewflipper_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/viewflipper_layout.xml
deleted file mode 100755
index 6480379e29de40fae1d065bfe617ed8b25058107..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/viewflipper_layout.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-        android:padding="10dip"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-    <ViewFlipper android:id="@+id/viewflipper_test"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:flipInterval="1000"
-                android:layout_marginBottom="20dip" >
-                <TextView android:id="@+id/viewflipper_textview1"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_horizontal"
-                        android:textSize="26sp"
-                        android:visibility="gone"
-                        android:text="@string/hello_world"/>
-                <TextView android:id="@+id/viewflipper_textview2"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_horizontal"
-                        android:textSize="26sp"
-                        android:visibility="gone"
-                        android:text="@string/hello_android"/>
-    </ViewFlipper>
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/viewgroup_margin_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/viewgroup_margin_layout.xml
deleted file mode 100755
index 8e750c9d1decd8b4996ce9ff2f18cfdf86d75721..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/viewgroup_margin_layout.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:padding="10dip"
-    android:layout_width="200dip"
-    android:layout_height="300dip">
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/viewgrouptest_stub.xml b/proprietary/frameworks/base/tests/resources/res/layout/viewgrouptest_stub.xml
deleted file mode 100755
index ee591265c7634c7a5c432dafc47c67c92d860cfb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/viewgrouptest_stub.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<android.widget.cts.MockLinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/mocklinearlayout">
-
-    <!-- view1 goes on top -->
-    <TextView
-        android:id="@+id/viewgrouptest_stub"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-    />
-
-</android.widget.cts.MockLinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/viewstub_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/viewstub_layout.xml
deleted file mode 100755
index 5c7ff22d381365504c2c76911d635fc4c65b4143..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/viewstub_layout.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ViewStub android:id="@+id/viewstub"
-        android:inflatedId="@+id/inflated_id"
-        android:layout="@layout/textview_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/viewswitcher_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/viewswitcher_layout.xml
deleted file mode 100755
index 933dc325284d3186290f74e73efa63fd6d1d8fb6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/viewswitcher_layout.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ViewSwitcher android:id="@+id/viewswitcher_test"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/viewtreeobserver_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/viewtreeobserver_layout.xml
deleted file mode 100755
index 66e98b21bb24c7692f9ae2f00fca85c2870c2108..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/viewtreeobserver_layout.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/linearlayout"
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-    <View android:id="@+id/view1"
-        android:layout_width="match_parent"
-        android:layout_height="10dip"
-        android:focusable="true"/>
-
-    <View android:id="@+id/view2"
-        android:layout_width="match_parent"
-        android:layout_height="10dip"
-        android:focusable="true"/>
-
-    <Button android:id="@+id/button1"
-        android:layout_width="wrap_content"
-        android:layout_height="10dip" />
-
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/webview_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/webview_layout.xml
deleted file mode 100755
index 7a0ed0d1fa1516abe6cb153db75fb0ee9c7e021e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/webview_layout.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <WebView android:id="@+id/web_page"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/windowstub_addlayout.xml b/proprietary/frameworks/base/tests/resources/res/layout/windowstub_addlayout.xml
deleted file mode 100755
index 0d6399e9b678500b99a4de1c795d5c46f5126472..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/windowstub_addlayout.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView android:id="@+id/listview_addwindow"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</ScrollView>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/windowstub_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/windowstub_layout.xml
deleted file mode 100755
index 0cf7d6d6068b8f3f2972cfee501f5f45e116e1d3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/windowstub_layout.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/listview_window"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
-     </TextView>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/windowstub_presentation.xml b/proprietary/frameworks/base/tests/resources/res/layout/windowstub_presentation.xml
deleted file mode 100755
index 80490c412d7d5332017ca478a525dace7a498710..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/windowstub_presentation.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <Button
-        android:id="@+id/presentation_button1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_weight="1"
-        android:text="@string/vertical_text_1" />
-    <Button
-        android:id="@+id/presentation_button2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_weight="1"
-        android:text="@string/vertical_text_2" />
-    <Button
-        android:id="@+id/presentation_button3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_weight="1"
-        android:text="@string/vertical_text_3" />
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/xml_test.xml b/proprietary/frameworks/base/tests/resources/res/layout/xml_test.xml
deleted file mode 100755
index 470228172c8c4207daeebb38e361e1e35ab1b451..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/xml_test.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/resources/res/layout/zoombutton_layout.xml b/proprietary/frameworks/base/tests/resources/res/layout/zoombutton_layout.xml
deleted file mode 100755
index 1b1e0b2c9bc8c341ee44830934a4bcc0cf85e976..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/layout/zoombutton_layout.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<ZoomButton xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/zoombutton_test"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-/>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/menu/browser.xml b/proprietary/frameworks/base/tests/resources/res/menu/browser.xml
deleted file mode 100755
index 29e51496afb0e00ebe174eb60515199e3b44890c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/menu/browser.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <group android:id="@+id/MAIN_MENU">
-        <item android:id="@+id/goto_menu_id"
-            android:title="@string/hello_world"
-            android:alphabeticShortcut="l"/>
-    </group>
-
-</menu>
diff --git a/proprietary/frameworks/base/tests/resources/res/menu/category_order.xml b/proprietary/frameworks/base/tests/resources/res/menu/category_order.xml
deleted file mode 100755
index 06a69932aec49f32d197a41bbea95e21acd4db09..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/menu/category_order.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- This group uses the default category. -->
-    <group android:id="@+id/most_used_items">
-
-        <item android:id="@+id/last_most_item"
-            android:orderInCategory="5"
-            android:title="Last most often" />
-
-        <item android:id="@+id/middle_most_item"
-            android:orderInCategory="3"
-            android:title="Middle most often" />
-
-        <item android:id="@+id/first_most_item"
-            android:orderInCategory="1"
-            android:title="First most often" />
-
-    </group>
-
-    <!-- This group uses the secondary category, which is used for less oftenly used items.
-         Notice these items will show up after the above items.
-         (Furthermore, notice how the orders in each category are independent from the other
-         category.) -->
-    <group android:id="@+id/least_used_items"
-        android:menuCategory="secondary">
-
-        <item android:id="@+id/last_least_item"
-            android:orderInCategory="4"
-            android:title="Last least often" />
-
-        <item android:id="@+id/middle_least_item"
-            android:orderInCategory="2"
-            android:title="Middle least often" />
-
-        <item android:id="@+id/first_least_item"
-            android:orderInCategory="0"
-            android:title="First least often" />
-
-    </group>
-
-</menu>
diff --git a/proprietary/frameworks/base/tests/resources/res/menu/checkable.xml b/proprietary/frameworks/base/tests/resources/res/menu/checkable.xml
deleted file mode 100755
index 339d9c9cf93d1b76d448fb3006fd5d8333cc2c30..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/menu/checkable.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Checkable items appear only in submenus or context menus. -->
-
-    <!-- Carefully look at the attribute name checkableBehavior on groups, but
-         the attribute name checkable on items. The checkableBehavior encompasses
-         the number of items that will be checkable within that group. -->
-
-    <item android:title="None">
-        <menu>
-            <!-- The none checkableBehavior is default, but we explicitly show it here. -->
-            <group android:id="@+id/noncheckable_group"
-                    android:checkableBehavior="none">
-                <!-- Notice how these items inherit from the group. -->
-                <item android:id="@+id/noncheckable_item_1"
-                        android:title="Item 1" />
-                <item android:id="@+id/noncheckable_item_2"
-                        android:title="Item 2" />
-                <item android:id="@+id/noncheckable_item_3"
-                        android:title="Item 3" />
-            </group>
-        </menu>
-    </item>
-
-    <item android:title="All">
-        <menu>
-            <group android:id="@+id/checkable_group"
-                    android:checkableBehavior="all">
-                <!-- Notice how these items inherit from the group. -->
-                <item android:id="@+id/checkable_item_1"
-                        android:title="Item 1" />
-                <item android:id="@+id/checkable_item_2"
-                        android:title="Item 2"
-                        android:checked="true" />
-                <item android:id="@+id/checkable_item_3"
-                        android:title="Item 3"
-                        android:checked="true" />
-            </group>
-        </menu>
-    </item>
-
-    <item android:title="Single">
-        <menu>
-            <group android:id="@+id/exclusive_checkable_group"
-                    android:checkableBehavior="single">
-                <!-- Notice how these items inherit from the group. -->
-                <item android:id="@+id/exclusive_checkable_item_1"
-                        android:title="Item 1" />
-                <item android:id="@+id/exclusive_checkable_item_2"
-                        android:title="Item 2" />
-                <item android:id="@+id/exclusive_checkable_item_3"
-                        android:title="Item 3"
-                        android:checked="true" />
-            </group>
-        </menu>
-    </item>
-
-    <item android:title="All without group"
-            android:id="@+id/submenu">
-        <menu>
-            <!-- Notice how these items have each set. -->
-            <item android:id="@+id/nongroup_checkable_item_1"
-                    android:title="Item 1"
-                    android:checkable="true" />
-            <item android:id="@+id/nongroup_checkable_item_2"
-                    android:title="Item 2"
-                    android:checkable="true"
-                    android:checked="true" />
-            <item android:id="@+id/nongroup_checkable_item_3"
-                    android:title="Item 3"
-                    android:checkable="true"
-                    android:checked="true" />
-        </menu>
-    </item>
-
-</menu>
diff --git a/proprietary/frameworks/base/tests/resources/res/menu/menu_searchview.xml b/proprietary/frameworks/base/tests/resources/res/menu/menu_searchview.xml
deleted file mode 100755
index d9f64755d5f444286e2cd103774b0895762f8246..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/menu/menu_searchview.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/menu_search"
-        android:title="Search"
-        android:icon="@android:drawable/ic_menu_search"
-        android:showAsAction="ifRoom"
-        android:actionLayout="@layout/searchview" />
-</menu>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/menu/title_icon.xml b/proprietary/frameworks/base/tests/resources/res/menu/title_icon.xml
deleted file mode 100755
index d8cdc52e9ecafb28ccda55fdb1e8344e2017505c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/menu/title_icon.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:id="@+id/start"
-        android:title="Start"
-        android:icon="@drawable/start" />
-
-    <item android:id="@+id/pass"
-        android:title="Pass"
-        android:icon="@drawable/pass" />
-
-    <item android:id="@+id/failed"
-        android:title="Failed"
-        android:icon="@drawable/failed" />
-
-</menu>
diff --git a/proprietary/frameworks/base/tests/resources/res/menu/visible_shortcut.xml b/proprietary/frameworks/base/tests/resources/res/menu/visible_shortcut.xml
deleted file mode 100755
index 4d6f3620f6861416a5212d82804155bf24fb7f1f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/menu/visible_shortcut.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:id="@+id/visible_item"
-        android:title="Visible"
-        android:alphabeticShortcut="a" />
-
-    <item android:id="@+id/hidden_item"
-        android:title="Hidden"
-        android:visible="false"
-        android:alphabeticShortcut="b" />
-
-    <group android:id="@+id/hidden_group"
-        android:visible="false">
-
-        <item android:id="@+id/hidden_by_group"
-            android:title="Hidden by group"
-            android:alphabeticShortcut="c" />
-
-    </group>
-
-</menu>
diff --git a/proprietary/frameworks/base/tests/resources/res/raw/basetex.png b/proprietary/frameworks/base/tests/resources/res/raw/basetex.png
deleted file mode 100755
index c47a8a5dfee29d5ec48f54d83428d0311e908166..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/raw/basetex.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/raw/ddstex.dds b/proprietary/frameworks/base/tests/resources/res/raw/ddstex.dds
deleted file mode 100755
index a865693fb56cdb8019c8c562861e0a136a4bf81e..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/raw/ddstex.dds and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/raw/pvrtex.pvr b/proprietary/frameworks/base/tests/resources/res/raw/pvrtex.pvr
deleted file mode 100755
index c92962d0b47e40f31e992f75cc49d928a5d869af..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/raw/pvrtex.pvr and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/raw/samplefont.ttf b/proprietary/frameworks/base/tests/resources/res/raw/samplefont.ttf
deleted file mode 100755
index 49f1c620b548e3abd34cf3bd8f0fd73b86b0199e..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/raw/samplefont.ttf and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/raw/scenery.jpg b/proprietary/frameworks/base/tests/resources/res/raw/scenery.jpg
deleted file mode 100755
index 7d1f5e18f4a8b6143ad2da065f00bf6a6b713926..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/raw/scenery.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/raw/sphere.a3d b/proprietary/frameworks/base/tests/resources/res/raw/sphere.a3d
deleted file mode 100755
index 3d78b0195f27068151ad225451af57ffb8c8c464..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/raw/sphere.a3d and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/raw/test1.obb b/proprietary/frameworks/base/tests/resources/res/raw/test1.obb
deleted file mode 100755
index a6b3e1c84cd57a9d970feb1ca450d8e7a6aff9d7..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/raw/test1.obb and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/raw/test1_nosig.obb b/proprietary/frameworks/base/tests/resources/res/raw/test1_nosig.obb
deleted file mode 100755
index 5c3573f72a1eb09b3b7de669c15754a0ba4c308d..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/raw/test1_nosig.obb and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/raw/test1_wrongpackage.obb b/proprietary/frameworks/base/tests/resources/res/raw/test1_wrongpackage.obb
deleted file mode 100755
index d0aafe16e1ac351f67a60f3f42475b7becd681be..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/raw/test1_wrongpackage.obb and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/raw/testimage.jpg b/proprietary/frameworks/base/tests/resources/res/raw/testimage.jpg
deleted file mode 100755
index d3dae03217989761015af1434b69ae588a96f860..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/raw/testimage.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/raw/testmp3.mp3 b/proprietary/frameworks/base/tests/resources/res/raw/testmp3.mp3
deleted file mode 100755
index 657faf77186fbe5b80ab6d79fc94a418e5e0053f..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/raw/testmp3.mp3 and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/raw/testmp3_2.mp3 b/proprietary/frameworks/base/tests/resources/res/raw/testmp3_2.mp3
deleted file mode 100755
index 6a70c69c9d54b71d022260b1d5bd6c10ed79cd28..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/raw/testmp3_2.mp3 and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/raw/testvideo.3gp b/proprietary/frameworks/base/tests/resources/res/raw/testvideo.3gp
deleted file mode 100755
index 1503272e6a8fe49cc7cee197a5487f993495438d..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/resources/res/raw/testvideo.3gp and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/resources/res/raw/text.txt b/proprietary/frameworks/base/tests/resources/res/raw/text.txt
deleted file mode 100755
index 3d8c5195bffcf0a36aec4727d59d344b722fa2e9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/raw/text.txt
+++ /dev/null
@@ -1 +0,0 @@
-OneTwoThreeFourFiveSixSevenEightNineTen
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/values-12key-63x57/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-12key-63x57/configVarying.xml
deleted file mode 100755
index 5229f28f2dff385dba3d78e2aaa96d0e18da729c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-12key-63x57/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 12key 63x57</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 12key 63x57</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-12key-dpad/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-12key-dpad/configVarying.xml
deleted file mode 100755
index 4622574ca5fc60929bb1df4241fa883701a35489..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-12key-dpad/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 12key dpad</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 12key dpad</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-12key/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-12key/configVarying.xml
deleted file mode 100755
index 38174d7aa0e83eb1d55b2f0348ed38b2d89217f4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-12key/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 12key</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 12key</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-240dpi/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-240dpi/configVarying.xml
deleted file mode 100755
index 3b437998c3d5e735f16a2e5511bbecb838fc3f1e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-240dpi/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 240dpi</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 240dpi</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-32dpi-keysexposed/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-32dpi-keysexposed/configVarying.xml
deleted file mode 100755
index 67dd4a5b8f124f213fdeb67ad5759eb02379a45e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-32dpi-keysexposed/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 32dpi keysexposed</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 32dpi keysexposed</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-32dpi-stylus/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-32dpi-stylus/configVarying.xml
deleted file mode 100755
index 948784a25945256f0b11842633c89a265425193e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-32dpi-stylus/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 32dpi stylus</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 32dpi stylus</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-32dpi/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-32dpi/configVarying.xml
deleted file mode 100755
index f903f0fdf7a101e1cf7656f53fd59329c24b191e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-32dpi/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 32dpi</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 32dpi</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-480x320/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-480x320/configVarying.xml
deleted file mode 100755
index ade144bbcb53f62ae5c372a0ecafd3f17b125725..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-480x320/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 480x320</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 480x320</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-640x400/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-640x400/configVarying.xml
deleted file mode 100755
index 30332c0967b0ee55144b2a9e0845efaae7155976..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-640x400/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 640x400</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 640x400</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-b+kok+419+VARIANT/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-b+kok+419+VARIANT/configVarying.xml
deleted file mode 100755
index 3560279ef1676ca680185939c8f011755f2e8002..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-b+kok+419+VARIANT/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple kok 419 VARIANT</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag kok 419 VARIANT</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-b+kok+419/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-b+kok+419/configVarying.xml
deleted file mode 100755
index b6f37f9db409bf2221e5c36d8710e70b43b78a88..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-b+kok+419/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple kok 419</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag kok 419</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-b+kok+IN/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-b+kok+IN/configVarying.xml
deleted file mode 100755
index 967ea470d1110ac3c9e5dfaa7bab0add57a34a94..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-b+kok+IN/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple kok IN</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag kok IN</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-b+kok+Knda+419+VARIANT/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-b+kok+Knda+419+VARIANT/configVarying.xml
deleted file mode 100755
index 2b2bcea991ba1f1628f46c29928e2a8a923afaed..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-b+kok+Knda+419+VARIANT/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple kok Knda 419 VARIANT</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag kok Knda 419 VARIANT</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-b+kok+Knda+419/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-b+kok+Knda+419/configVarying.xml
deleted file mode 100755
index cbc53b95ba720810584eb616e91de049decd10ed..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-b+kok+Knda+419/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple kok Knda 419</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag kok Knda 419</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-b+kok+Knda/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-b+kok+Knda/configVarying.xml
deleted file mode 100755
index f73574961cf4c2f1d7c63cc80c625009eebd1685..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-b+kok+Knda/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple kok Knda</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag kok Knda</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-b+kok+VARIANT/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-b+kok+VARIANT/configVarying.xml
deleted file mode 100755
index 6743b7f45cebd094e23ccc88bb9ec4f939d0c881..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-b+kok+VARIANT/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple kok VARIANT</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag kok VARIANT</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-b+kok/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-b+kok/configVarying.xml
deleted file mode 100755
index e1bafa142bf69bb2a4d716f884ed56b42570cf71..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-b+kok/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple kok</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag kok</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-b+tgl+PH/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-b+tgl+PH/configVarying.xml
deleted file mode 100755
index e6b9e2546ee4e4987d8c9ec67d60932031770508..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-b+tgl+PH/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple tgl PH</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag tgl PH</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-b+tgl/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-b+tgl/configVarying.xml
deleted file mode 100755
index ac7e051175875e5169040c1d0e47aa039314296f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-b+tgl/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple tgl</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag tgl</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-cs/strings.xml b/proprietary/frameworks/base/tests/resources/res/values-cs/strings.xml
deleted file mode 100755
index 396bebd4e081b28ce0da7bba2b1b51cf4b1181e5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-cs/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <plurals name="plurals_test">
-        <item quantity="one">A Czech dog</item>
-        <item quantity="few">Few Czech dogs</item>
-        <item quantity="other">Some Czech dogs</item>
-    </plurals>
-</resources>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/values-dpad-63x57/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-dpad-63x57/configVarying.xml
deleted file mode 100755
index 6b93c7d14f42c878921dab8181131783746ab285..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-dpad-63x57/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple dpad 63x57</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag dpad 63x57</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-dpad/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-dpad/configVarying.xml
deleted file mode 100755
index 0b0760fa133c4dc0eb5263f34346e95aa47e369e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-dpad/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple dpad</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag dpad</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-fr-rFR/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-fr-rFR/configVarying.xml
deleted file mode 100755
index 5ecac7caff8adc75437536118e0e2ede7f2dbd02..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-fr-rFR/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple fr FR</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag fr FR</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-fr/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-fr/configVarying.xml
deleted file mode 100755
index 8413b5a7008693ce6e7a1ec2bf3c3e78ae584fdd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-fr/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple fr</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag fr</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-h550dp/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-h550dp/configVarying.xml
deleted file mode 100755
index 2faab0edfc847bdc8fb1d0b61120de8e2b47c8b2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-h550dp/configVarying.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple h550</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag h550</item>
-    </bag>
-    <item type="configVarying" name="h">550</item>
-    <item type="configVarying" name="wh">550</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-h670dp/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-h670dp/configVarying.xml
deleted file mode 100755
index 21ade5bde1b6f703a66fff652d4a64b71ec2c75f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-h670dp/configVarying.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple h670</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag h670</item>
-    </bag>
-    <item type="configVarying" name="h">670</item>
-    <item type="configVarying" name="wh">670</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-keysexposed-12key/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-keysexposed-12key/configVarying.xml
deleted file mode 100755
index 311d5db5726801820e4c3b8e367c64e28533dea3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-keysexposed-12key/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple keysexposed 12key</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag keysexposed 12key</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-keysexposed-dpad/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-keysexposed-dpad/configVarying.xml
deleted file mode 100755
index 7c6caeb1dcd7d630ca432d74714355411e9b814e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-keysexposed-dpad/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple keysexposed dpad</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag keysexposed dpad</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-keysexposed/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-keysexposed/configVarying.xml
deleted file mode 100755
index befd5352df0f6fde3ffe5fc4172fcdf79edfdb34..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-keysexposed/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple keysexposed</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag keysexposed</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-land/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-land/configVarying.xml
deleted file mode 100755
index d5ece199bfed254960eada34260819c6a1fbbf07..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-land/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple landscape</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag landscape</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-land/dimens.xml b/proprietary/frameworks/base/tests/resources/res/values-land/dimens.xml
deleted file mode 100755
index 88220fa831a75ca5ae068d0a769569f8dd1a5529..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-land/dimens.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources>
-    <dimen name="reference_width">480dp</dimen>
-    <dimen name="reference_height">320dp</dimen>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-large/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-large/configVarying.xml
deleted file mode 100755
index 7b2df7c1d11122e84772904817e9d7eef88b7375..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-large/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple large</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag large</item>
-    </bag>
-    <item type="configVarying" name="large">large</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-mcc110-xx/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-mcc110-xx/configVarying.xml
deleted file mode 100755
index 82e24355d035bb424e4f050925913a4adbde2e39..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-mcc110-xx/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mcc110 xx</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mcc110 xx</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-mcc111-mnc222/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-mcc111-mnc222/configVarying.xml
deleted file mode 100755
index 7f85a14f2e9fffecad5480832812edb2d523200b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-mcc111-mnc222/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mcc111 mnc222</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mcc111 mnc222</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-mcc111-xx-rYY/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-mcc111-xx-rYY/configVarying.xml
deleted file mode 100755
index 6b094dc1683246f8b3054e3cd654cff43cf5db50..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-mcc111-xx-rYY/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mcc111 xx-rYY</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mcc111 xx-rYY</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-mcc111-xx/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-mcc111-xx/configVarying.xml
deleted file mode 100755
index 6d01bcee8aed2868ddaefe88c097ce3d1d38d997..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-mcc111-xx/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mcc111 xx</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mcc111 xx</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-mcc111/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-mcc111/configVarying.xml
deleted file mode 100755
index 656c2bdce32b3fe692fbbcdb6ca10512220cb661..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-mcc111/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mcc111</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mcc111</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-mcc112/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-mcc112/configVarying.xml
deleted file mode 100755
index 9c05d77b6d7b7425efc453d623c095c21461fe75..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-mcc112/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mcc112</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mcc112</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-mnc220-xx/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-mnc220-xx/configVarying.xml
deleted file mode 100755
index fbc78882d8aa5d3142238aff54bf3926ada27cdc..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-mnc220-xx/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mnc220 xx</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mnc220 xx</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-mnc222-32dpi/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-mnc222-32dpi/configVarying.xml
deleted file mode 100755
index 03bea33ae2d07af0ca3bfaaf600990748e01935b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-mnc222-32dpi/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mnc222 32dpi</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mnc222 32dpi</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-mnc222-square/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-mnc222-square/configVarying.xml
deleted file mode 100755
index 4a64117de261e12731421ea74680e80b217eb01d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-mnc222-square/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mnc222 square</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mnc222 square</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-mnc222-xx/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-mnc222-xx/configVarying.xml
deleted file mode 100755
index 80570f549e35756f1626494a301e4f54ea99e7a9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-mnc222-xx/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mnc222 xx</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mnc222 xx</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-mnc222/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-mnc222/configVarying.xml
deleted file mode 100755
index 54bb47e6083a5f22e269703ca443c11e3a23be93..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-mnc222/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mnc222</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mnc222</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-mnc223/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-mnc223/configVarying.xml
deleted file mode 100755
index 8936cbcb09bfc54ab5c83bbcc021d799d8178397..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-mnc223/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple mnc223</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag mnc223</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-nokeys/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-nokeys/configVarying.xml
deleted file mode 100755
index e0b23bcf603a30ae3b4c8b5cf3d871e14703cbb0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-nokeys/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple nokeys</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag nokeys</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-nonav/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-nonav/configVarying.xml
deleted file mode 100755
index 1ec8520729a366a7a4a39ac418d4fb972fc773c2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-nonav/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple nonav</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag nonav</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-normal/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-normal/configVarying.xml
deleted file mode 100755
index b45ee49dddf90b7a510afcfcc7ec04c6328b9d99..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-normal/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple normal</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag normal</item>
-    </bag>
-    <item type="configVarying" name="normal">normal</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-notouch/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-notouch/configVarying.xml
deleted file mode 100755
index ed0833b09310f20f6e1e67dfcbe2323b47682520..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-notouch/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple notouch</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag notouch</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-small/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-small/configVarying.xml
deleted file mode 100755
index 15a9f8f1bb9feac4de815afb333c222762a620ee..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-small/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple small</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag small</item>
-    </bag>
-    <item type="configVarying" name="small">small</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-square-32dpi/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-square-32dpi/configVarying.xml
deleted file mode 100755
index f205f46fccf37d968dcbfc6530f4e9c18422b96f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-square-32dpi/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple square 32dpi</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag square 32dpi</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-square-stylus/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-square-stylus/configVarying.xml
deleted file mode 100755
index 861c21590b4d238b3d885fde1e47327eafab031c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-square-stylus/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple square stylus</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag square stylus</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-square/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-square/configVarying.xml
deleted file mode 100755
index 055fd35153273e00f05f1a8701c318543e2226e9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-square/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple square</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag square</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-stylus-12key/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-stylus-12key/configVarying.xml
deleted file mode 100755
index 47db444dfefad1849499f6aa29fd3411a924c9b8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-stylus-12key/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple stylus 12key</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag stylus 12key</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-stylus-keysexposed/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-stylus-keysexposed/configVarying.xml
deleted file mode 100755
index cf5598f6267856308dd2d50daf6cc3da33a818e8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-stylus-keysexposed/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple stylus keysexposed</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag stylus keysexposed</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-stylus/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-stylus/configVarying.xml
deleted file mode 100755
index 862c2bcd7ef45b9ae1c374f2a8a157720120f2b0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-stylus/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple stylus</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag stylus</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-sw590dp-hdpi/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-sw590dp-hdpi/configVarying.xml
deleted file mode 100755
index 9864e505a38ad88b727f29fcf15a5e510143fd85..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-sw590dp-hdpi/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple sw590 hdpi</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag sw590 hdpi</item>
-    </bag>
-    <item type="configVarying" name="sw">590 hdpi</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-sw590dp-mdpi/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-sw590dp-mdpi/configVarying.xml
deleted file mode 100755
index 7089ca95ae82fc5cb5b785a2d5c96050e58cc08b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-sw590dp-mdpi/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple sw590 mdpi</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag sw590 mdpi</item>
-    </bag>
-    <item type="configVarying" name="sw">590 mdpi</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-sw590dp-xhdpi/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-sw590dp-xhdpi/configVarying.xml
deleted file mode 100755
index 5c55f2c2e068972824b1955b866504b86b10771e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-sw590dp-xhdpi/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple sw590 xhdpi</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag sw590 xhdpi</item>
-    </bag>
-    <item type="configVarying" name="sw">590 xhdpi</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-sw590dp/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-sw590dp/configVarying.xml
deleted file mode 100755
index 85639214d535e90f48e0ed370f6c1c44c33ce72e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-sw590dp/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple sw590</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag sw590</item>
-    </bag>
-    <item type="configVarying" name="sw">590</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-sw591dp-hdpi/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-sw591dp-hdpi/configVarying.xml
deleted file mode 100755
index 880dced27963223352c72fd5ff730cee6bee22e8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-sw591dp-hdpi/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple sw591 hdpi</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag sw591 hdpi</item>
-    </bag>
-    <item type="configVarying" name="sw">591 hdpi</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-sw591dp/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-sw591dp/configVarying.xml
deleted file mode 100755
index 4a0ee8533e5161b3c840708fa09d8992fadac8bb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-sw591dp/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple sw591</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag sw591</item>
-    </bag>
-    <item type="configVarying" name="sw">591</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-sw600dp-land/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-sw600dp-land/configVarying.xml
deleted file mode 100755
index c18dda6a3b3510b523cdeb1f9b1157bb4d6dc972..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-sw600dp-land/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple sw600 land</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag sw600 land</item>
-    </bag>
-    <item type="configVarying" name="sw">600 land</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-sw600dp-land/dimens.xml b/proprietary/frameworks/base/tests/resources/res/values-sw600dp-land/dimens.xml
deleted file mode 100755
index 1b1c95e20edef59a3d869e5919ac8eae21b2a8b8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-sw600dp-land/dimens.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources>
-    <dimen name="reference_width">1024dip</dimen>
-    <dimen name="reference_height">600dip</dimen>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-sw600dp/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-sw600dp/configVarying.xml
deleted file mode 100755
index 5ecea456dfc061d9c0761b7867e0bb09dd9e01d8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-sw600dp/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple sw600</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag sw600</item>
-    </bag>
-    <item type="configVarying" name="sw">600</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-sw600dp/dimens.xml b/proprietary/frameworks/base/tests/resources/res/values-sw600dp/dimens.xml
deleted file mode 100755
index ab7b46423f41fea97058975b0315c371d5db55eb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-sw600dp/dimens.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources>
-    <dimen name="reference_width">600dp</dimen>
-    <dimen name="reference_height">1024dp</dimen>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-sw720dp/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-sw720dp/configVarying.xml
deleted file mode 100755
index 99af476750cb9df38ae0b5cc80cf7c65678e0443..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-sw720dp/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple sw720</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag sw720</item>
-    </bag>
-    <item type="configVarying" name="sw">720</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-tl-rPH/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-tl-rPH/configVarying.xml
deleted file mode 100755
index 034d2ab84d3441d31afc3a7de82cf56c23b2e828..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-tl-rPH/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple tl PH</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag tl PH</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-tl/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-tl/configVarying.xml
deleted file mode 100755
index 4fc50124f947232a9d0b8fc8052f7b039e9d5d3f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-tl/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple tl</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag tl</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-v10/strings.xml b/proprietary/frameworks/base/tests/resources/res/values-v10/strings.xml
deleted file mode 100755
index 6cd55fa2a3e95c03e208feca0873747c82252658..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-v10/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v10cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-v11/strings.xml b/proprietary/frameworks/base/tests/resources/res/values-v11/strings.xml
deleted file mode 100755
index d4d75ff6f69397ce9833f3dcce558e8a50905a4e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-v11/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v11cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-v12/strings.xml b/proprietary/frameworks/base/tests/resources/res/values-v12/strings.xml
deleted file mode 100755
index ab421fa29b141c7f551615fd3275cbb2007b478a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-v12/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v12cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-v13/strings.xml b/proprietary/frameworks/base/tests/resources/res/values-v13/strings.xml
deleted file mode 100755
index c3f723c95bf3ab21f50c24a99d933c2879a19500..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-v13/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v13cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-v14/strings.xml b/proprietary/frameworks/base/tests/resources/res/values-v14/strings.xml
deleted file mode 100755
index 45f5fbeaf94ed8795cca0616941dd681c0dd3a38..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-v14/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v14cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-v15/strings.xml b/proprietary/frameworks/base/tests/resources/res/values-v15/strings.xml
deleted file mode 100755
index c1d5e483f5db5919e2a82e75d4d3d66ca98abd09..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-v15/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v15cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-v16/strings.xml b/proprietary/frameworks/base/tests/resources/res/values-v16/strings.xml
deleted file mode 100755
index e7a3e8e1a241419290b6d36771e73be9ca077cb5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-v16/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v16cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-v17/strings.xml b/proprietary/frameworks/base/tests/resources/res/values-v17/strings.xml
deleted file mode 100755
index fcf9d917730aee14a3109f39f7b301382646a402..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-v17/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v17cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-v18/strings.xml b/proprietary/frameworks/base/tests/resources/res/values-v18/strings.xml
deleted file mode 100755
index d03c5cba10282aeae29025a7bcd94efe4645ec1b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-v18/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v18cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-v19/strings.xml b/proprietary/frameworks/base/tests/resources/res/values-v19/strings.xml
deleted file mode 100755
index 833ca082201ae2cf90840a395571b15a89e63535..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-v19/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v19cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-v20/strings.xml b/proprietary/frameworks/base/tests/resources/res/values-v20/strings.xml
deleted file mode 100755
index f47207aeeed6e054d3da8aef165ff28d932dfa82..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-v20/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v20cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-v21/strings.xml b/proprietary/frameworks/base/tests/resources/res/values-v21/strings.xml
deleted file mode 100755
index ac8f8a764e1ecebbde9e58c721bfe2b29b8657c5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-v21/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v21cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-v22/strings.xml b/proprietary/frameworks/base/tests/resources/res/values-v22/strings.xml
deleted file mode 100755
index 6b51a01970543ec61131580b69a4da4d56aa7104..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-v22/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v22cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-v23/strings.xml b/proprietary/frameworks/base/tests/resources/res/values-v23/strings.xml
deleted file mode 100755
index 4ed1aaa179bdfd7371c899188627cd51ca393dd3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-v23/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v23cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-v3/strings.xml b/proprietary/frameworks/base/tests/resources/res/values-v3/strings.xml
deleted file mode 100755
index a4d012abb24de3948118ac9cc0cc7ddeda9e0ddd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-v3/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v3cur</string>
-   <string name="version_v3">v3</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-v4/strings.xml b/proprietary/frameworks/base/tests/resources/res/values-v4/strings.xml
deleted file mode 100755
index e6d414a5898cdc0e997ac0e2ed8ede5ebfa0817d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-v4/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v4cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-v5/strings.xml b/proprietary/frameworks/base/tests/resources/res/values-v5/strings.xml
deleted file mode 100755
index ef3a564658b743b1ddfb9c8bb688d964105b75a2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-v5/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v5cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-v6/strings.xml b/proprietary/frameworks/base/tests/resources/res/values-v6/strings.xml
deleted file mode 100755
index fb1f15dff66a67bd155c6093b31e4549f8819b36..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-v6/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v6cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-v7/strings.xml b/proprietary/frameworks/base/tests/resources/res/values-v7/strings.xml
deleted file mode 100755
index 4c3df45b5b1010b068f0ea38bf9ee4a5d6dda480..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-v7/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v7cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-v8/strings.xml b/proprietary/frameworks/base/tests/resources/res/values-v8/strings.xml
deleted file mode 100755
index b4e1d88c15ee1328ca7bd576e5e2cf16161a2821..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-v8/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v8cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-v9/strings.xml b/proprietary/frameworks/base/tests/resources/res/values-v9/strings.xml
deleted file mode 100755
index a03ea12b24764a4829486ac4dcdfbc431c3f3ade..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-v9/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-   <string name="version_cur">v9cur</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-w600dp-h550dp/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-w600dp-h550dp/configVarying.xml
deleted file mode 100755
index d4361a86e8163e8a49a20eef011ecee479fd57e3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-w600dp-h550dp/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple sw600</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag sw600</item>
-    </bag>
-    <item type="configVarying" name="wh">600-550</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-w600dp/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-w600dp/configVarying.xml
deleted file mode 100755
index b8248a63063abc6752907e0baa17ed9200319eb5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-w600dp/configVarying.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple w600</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag w600</item>
-    </bag>
-    <item type="configVarying" name="w">600</item>
-    <item type="configVarying" name="wh">600</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-w720dp-h670dp/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-w720dp-h670dp/configVarying.xml
deleted file mode 100755
index c2057864f44fbc9b7027f7cbb279248a9e6c16b8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-w720dp-h670dp/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple 720-670</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag 720-670</item>
-    </bag>
-    <item type="configVarying" name="wh">720-670</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-w720dp/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-w720dp/configVarying.xml
deleted file mode 100755
index 3211ad4634c4f885d9b2f29b3ba5dc8c6ba61011..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-w720dp/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple w720</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag w720</item>
-    </bag>
-    <item type="configVarying" name="w">720</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-wheel/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-wheel/configVarying.xml
deleted file mode 100755
index 64173a899cfb90440e55d331c08458fed780d352..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-wheel/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple wheel</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag wheel</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-xlarge/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-xlarge/configVarying.xml
deleted file mode 100755
index fb9cad7c78f7da633e9568a7c9fceb110b63888a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-xlarge/configVarying.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple xlarge</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag xlarge</item>
-    </bag>
-    <item type="configVarying" name="xlarge">xlarge</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-xx-32dpi/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-xx-32dpi/configVarying.xml
deleted file mode 100755
index dc17c6b2dbaa34cb575c997788ee42fec068a33f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-xx-32dpi/configVarying.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <item type="configVarying" name="simple">simple xx 32dpi</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag xx 32dpi</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-xx-rYY/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-xx-rYY/configVarying.xml
deleted file mode 100755
index 903d008aa0214d38f940e91208b266ac37142628..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-xx-rYY/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple xx-rYY</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag xx-rYY</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-xx-square/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-xx-square/configVarying.xml
deleted file mode 100755
index 6ef5d431f299821c2fe56cbad2923e48b44787ac..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-xx-square/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple xx square</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag xx square</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values-xx/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values-xx/configVarying.xml
deleted file mode 100755
index 191e4f763a3cc0fd4eba07717851c2eeb1d5b839..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values-xx/configVarying.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple xx</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag xx</item>
-    </bag>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values/arrays.xml b/proprietary/frameworks/base/tests/resources/res/values/arrays.xml
deleted file mode 100755
index 71e013317f3bf9c91f3ad260c014d325a7687b02..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values/arrays.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources>
-    <item type="integer" name="reference" format="integer">101</item>
-
-      <string-array name="strings">
-        <item>zero</item>
-        <item>1</item>
-        <item>@string/reference</item>
-    </string-array>
-
-    <integer-array name="integers">
-        <item>0</item>
-        <item>1</item>
-        <item>@integer/reference</item>
-    </integer-array>
-
-    <array name="difficultyLevel">
-        <item>Easy</item>
-        <item>Medium</item>
-        <item>Hard</item>
-    </array>
-
-    <string-array name="string">
-        <item>Test String 1</item>
-        <item>Test String 2</item>
-        <item>Test String 3</item>
-    </string-array>
-
-    <integer-array name="table_row_layout">
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-        <item>8</item>
-        <item>9</item>
-        <item>10</item>
-    </integer-array>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values/attrs.xml b/proprietary/frameworks/base/tests/resources/res/values/attrs.xml
deleted file mode 100755
index 4c3d9db8fedd5e668f0195c5287428843f2ef99a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values/attrs.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources>
-    <declare-styleable name="Style1">
-        <attr name="Type1" format="integer">
-            <enum name="type" value="28" />
-            <enum name="data" value="0xff00ff00" />
-            <enum name="asset_cookie" value="0" />
-            <enum name="resource_id" value="0" />
-            <enum name="changing_config" value="0" />
-        </attr>
-        <attr name="Type2" format="integer">
-            <enum name="type" value="28" />
-            <enum name="data" value="0xff0000ff" />
-            <enum name="asset_cookie" value="0" />
-            <enum name="resource_id" value="0" />
-            <enum name="changing_config" value="0" />
-        </attr>
-    </declare-styleable>
-    <attr name="type1" format="boolean"/>
-    <attr name="type2" format="boolean"/>
-    <attr name="type3" format="color"/>
-    <attr name="type4" format="reference|color"/>
-    <attr name="type5" format="dimension"/>
-    <attr name="type6" format="dimension"/>
-    <attr name="type7" format="dimension"/>
-    <attr name="type8" format="reference"/>
-    <attr name="type9" format="float"/>
-    <attr name="type10" format="fraction"/>
-    <attr name="type11" format="integer"/>
-    <attr name="type12" format="integer"/>
-    <attr name="type13" format="reference|string"/>
-    <attr name="type14" format="string"/>
-    <attr name="type15" format="reference"/>
-    <attr name="type16" format="string"/>
-    <declare-styleable name="style1">
-        <attr name="type1"/>
-        <attr name="type2"/>
-        <attr name="type3"/>
-        <attr name="type4"/>
-        <attr name="type5"/>
-        <attr name="type6"/>
-        <attr name="type7"/>
-        <attr name="type8"/>
-        <attr name="type9"/>
-        <attr name="type10"/>
-        <attr name="type11"/>
-        <attr name="type12"/>
-        <attr name="type13"/>
-        <attr name="type14"/>
-        <attr name="type15"/>
-        <attr name="type16"/>
-    </declare-styleable>
-    <attr name="testEnum">
-        <enum name="val1" value="1" />
-        <enum name="val2" value="2" />
-        <enum name="val10" value="10" />
-    </attr>
-    <attr name="testFlags">
-        <flag name="bit1" value="0x1" />
-        <flag name="bit2" value="0x2" />
-        <flag name="bit31" value="0x40000000" />
-    </attr>
-    <attr name="testString" format="string" />
-    <declare-styleable name="EnumStyle">
-        <attr name="testEnum" />
-    </declare-styleable>
-    <declare-styleable name="FlagStyle">
-        <attr name="testFlags" />
-    </declare-styleable>
-    <declare-styleable name="TestConfig">
-        <attr name="testString" />
-    </declare-styleable>
-    <!-- Size of text. Recommended dimension type for text is "sp" for scaled-pixels (example: 15sp).
-         Supported values include the following:<p/>
-    <ul>
-        <li><b>px</b> Pixels</li>
-        <li><b>sp</b> Scaled pixels (scaled to relative pixel size on screen). See {@link android.util.DisplayMetrics} for more information.</li>
-        <li><b>pt</b> Points</li>
-        <li><b>dip</b> Device independent pixels. See {@link android.util.DisplayMetrics} for more information.</li>
-    </ul>
-    -->
-    <attr name="textSize" format="dimension" />
-    <attr name="typeface">
-        <enum name="normal" value="0" />
-        <enum name="sans" value="1" />
-        <enum name="serif" value="2" />
-        <enum name="monospace" value="3" />
-    </attr>
-    <!-- Default text typeface style. -->
-    <attr name="textStyle">
-        <flag name="normal" value="0" />
-        <flag name="bold" value="1" />
-        <flag name="italic" value="2" />
-    </attr>
-    <!-- Color of text (usually same as colorForeground). -->
-    <attr name="textColor" format="reference|color" />
-    <!-- Color of highlighted text. -->
-    <attr name="textColorHighlight" format="reference|color" />
-    <!-- Color of hint text (displayed when the field is empty). -->
-    <attr name="textColorHint" format="reference|color" />
-    <!-- Color of link text (URLs). -->
-    <attr name="textColorLink" format="reference|color" />
-    <declare-styleable name="TextAppearance">
-        <attr name="textColor"/>
-        <attr name="textSize"/>
-        <attr name="textStyle"/>
-        <attr name="typeface"/>
-        <attr name="textColorHighlight"/>
-        <attr name="textColorHint"/>
-        <attr name="textColorLink"/>
-    </declare-styleable>
-    <!-- Integer used to uniquely identify theme overrides. -->
-    <attr name="themeType" format="integer"/>
-    <!-- Theme reference used to override parent theme. -->
-    <attr name="themeOverrideAttr" format="reference"/>
-
-    <!-- Drawable theming attributes -->
-    <attr name="themeBoolean" />
-    <attr name="themeColor" />
-    <attr name="themeFloat" />
-    <attr name="themeInteger" />
-    <attr name="themeDimension" />
-    <attr name="themeDrawable" />
-    <attr name="themeBitmap" />
-    <attr name="themeNinePatch" />
-    <attr name="themeGravity" />
-    <attr name="themeTileMode" />
-    <attr name="themeAngle" />
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values/bools.xml b/proprietary/frameworks/base/tests/resources/res/values/bools.xml
deleted file mode 100755
index f119cda25a81f8489c157882d190be576f109495..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values/bools.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources>
-	<bool name="trueRes">true</bool>
-	<bool name="falseRes">false</bool>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values/colors.xml b/proprietary/frameworks/base/tests/resources/res/values/colors.xml
deleted file mode 100755
index f3cc3255e58e96c02d8288a2c1aab696b2814719..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values/colors.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources>
-    <drawable name="red">#7f00</drawable>
-    <drawable name="blue">#770000ff</drawable>
-    <drawable name="black">#77ffffff</drawable>
-    <drawable name="yellow">#77ffff00</drawable>
-    <color name="testcolor1">#ff00ff00</color>
-    <color name="testcolor2">#ffff0000</color>
-    <color name="failColor">#ff0000ff</color>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values/configVarying.xml b/proprietary/frameworks/base/tests/resources/res/values/configVarying.xml
deleted file mode 100755
index 7b7d576a2b34eb703b4d3f8a8adc2ace7bf917df..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values/configVarying.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <item type="configVarying" name="simple">simple default</item>
-    <bag type="configVarying" name="bag">
-        <item name="testString">bag default</item>
-    </bag>
-    <item type="configVarying" name="small">default</item>
-    <item type="configVarying" name="normal">default</item>
-    <item type="configVarying" name="large">default</item>
-    <item type="configVarying" name="xlarge">default</item>
-    <item type="configVarying" name="sw">default</item>
-    <item type="configVarying" name="w">default</item>
-    <item type="configVarying" name="h">default</item>
-    <item type="configVarying" name="wh">default</item>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values/dimens.xml b/proprietary/frameworks/base/tests/resources/res/values/dimens.xml
deleted file mode 100755
index bae216f14d5bf93ef8f45e3bb8715f6d15e38359..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values/dimens.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<resources>
-    <item name="frac100perc" type="dimen" format="fraction">100%</item>
-    <item name="frac1perc" type="dimen" format="fraction">1%</item>
-    <item name="fracp1perc" type="dimen" format="fraction">.1%</item>
-    <item name="fracp01perc" type="dimen" format="fraction">.01%</item>
-    <item name="frac0perc" type="dimen" format="fraction">0%</item>
-    <item name="frac1p1perc" type="dimen" format="fraction">1.1%</item>
-    <item name="frac100p1perc" type="dimen" format="fraction">100.1%</item>
-    <item name="frac25510perc" type="dimen" format="fraction">25510%</item>
-    <item name="frac25610perc" type="dimen" format="fraction">25610%</item>
-    <item name="frac6553510perc" type="dimen" format="fraction">6553510%</item>
-    <item name="frac6553610perc" type="dimen" format="fraction">6553610%</item>
-
-    <item name="frac100pperc" type="dimen" format="fraction">100%p</item>
-    <item name="frac1pperc" type="dimen" format="fraction">1%p</item>
-    <item name="fracp1pperc" type="dimen" format="fraction">.1%p</item>
-    <item name="fracp01pperc" type="dimen" format="fraction">.01%p</item>
-    <item name="frac0pperc" type="dimen" format="fraction">0%p</item>
-    <item name="frac1p1pperc" type="dimen" format="fraction">1.1%p</item>
-    <item name="frac100p1pperc" type="dimen" format="fraction">100.1%p</item>
-    <item name="frac25510pperc" type="dimen" format="fraction">25510%p</item>
-    <item name="frac25610pperc" type="dimen" format="fraction">25610%p</item>
-    <item name="frac6553510pperc" type="dimen" format="fraction">6553510%p</item>
-    <item name="frac6553610pperc" type="dimen" format="fraction">6553610%p</item>
-</resources>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/values/ids.xml b/proprietary/frameworks/base/tests/resources/res/values/ids.xml
deleted file mode 100755
index 30e081bba1abd91047309468967566e4bea86046..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values/ids.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-  <item type="id" name="background" />
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values/resources_test.xml b/proprietary/frameworks/base/tests/resources/res/values/resources_test.xml
deleted file mode 100755
index 91c2c4aa92dd75ce738e5b954bdb84d25de83d45..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values/resources_test.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-     <!-- The width that is used when creating thumbnails of applications. -->
-     <dimen name="thumbnail_width">84dp</dimen>
-     <!-- The height that is used when creating thumbnails of applications. -->
-     <dimen name="thumbnail_height">63dp</dimen>
-     <!-- The standard size (both width and height) of an application icon that
-          will be displayed in the app launcher and elsewhere. -->
-     <dimen name="app_icon_size">48px</dimen>
-     <dimen name="toast_y_offset">64dip</dimen>
-     <plurals name="plurals_test">
-        <item quantity="one">A dog</item>
-        <item quantity="other">Some dogs</item>
-      </plurals>
-     <color name="resource_test_color">#003B3B3B</color>
-     <integer name="resource_test_int">10</integer>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values/strings.xml b/proprietary/frameworks/base/tests/resources/res/values/strings.xml
deleted file mode 100755
index c1672783e6f90df9215a1f7c16f42719f840d647..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values/strings.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permlab_testGranted">Test Granted</string>
-    <string name="permdesc_testGranted">Used for running CTS tests, for testing operations
-        where we have the permission.</string>
-    <string name="permlab_testDynamic">Test Dynamic</string>
-    <string name="permdesc_testDynamic">Used for running CTS tests, for testing adding
-        dynamic permissions.</string>
-    <string name="permlab_testDenied">Test Denied</string>
-    <string name="permdesc_testDenied">Used for running CTS tests, for testing operations
-        where we do not have the permission.</string>
-    <string name="explain">1. click start. \n2. if above image shaked, then press pass button,
-         else press failed button.</string>
-    <string name="text_view_hello">Hello! Text view!</string>
-    <string name="text_view_hello_two_lines">Hello! \nText view!</string>
-    <string name="text_view_simple_hint">This is a hint.</string>
-    <string name="text_view_hint">This is a string for testing hint of textview.</string>
-    <string name="activity_forwarding">App/Forwarding</string>
-    <string name="forwarding">$$$</string>
-    <string name="go">Go</string>
-    <string name="back">Back</string>
-    <string name="forward_target">
-        Press back button and notice we don\'t see the previous activity.
-    </string>
-    <string name="edit_text">testing</string>
-    <string name="text">DialogTest</string>
-    <string name="text_country">Country</string>
-    <string name="text_name">Name</string>
-    <string name="hello_world">Hello, World!</string>
-    <string name="hello_android">Hello, Android!</string>
-    <string name="alert_dialog_username">Name:</string>
-    <string name="alert_dialog_password">Password:</string>
-    <string name="alert_dialog_positive">Positive</string>
-    <string name="alert_dialog_negative">Negative</string>
-    <string name="alert_dialog_neutral">Neutral</string>
-    <string name="notify">Notify </string>
-    <string name="tabs_1">testing</string>
-    <string name="table_layout_first">first</string>
-    <string name="table_layout_second">second</string>
-    <string name="table_layout_third">third</string>
-    <string name="table_layout_long">Very long to make the string out of the screen</string>
-    <string name="chronometer_text">Test Chronometer</string>
-    <string name="am">AM</string>
-    <string name="pm">PM</string>
-    <string name="viewgroup_test">ViewGroup test</string>
-    <string name="viewanimator_test">ViewAnimator test</string>
-    <string name="id_ok">OK</string>
-    <string name="id_cancel">Cancel</string>
-    <string name="context_test_string1">This is %s string.</string>
-    <string name="context_test_string2">This is test string.</string>
-    <string name="animationutils_test_instructions">Choose different animations</string>
-    <string name="animationutils_test_alpha">Alpha animation</string>
-    <string name="animationutils_test_scale">Scale animation</string>
-    <string name="animationutils_test_rotate">Rotate animation</string>
-    <string name="animationutils_test_translate">Translate animation</string>
-    <string name="animationutils_test_set">Animation set</string>
-    <string name="animationutils_test_layout">Layout animation</string>
-    <string name="animationutils_test_gridlayout">Grid layout animation</string>
-    <string name="twolinelistitem_test_text1">text1</string>
-    <string name="twolinelistitem_test_text2">text2</string>
-    <string name="metadata_text">metadata text</string>
-    <string name="horizontal_text_1">horizontal 1</string>
-    <string name="horizontal_text_2">horizontal 2</string>
-    <string name="horizontal_text_3">horizontal 3</string>
-    <string name="vertical_text_1">vertical 1</string>
-    <string name="vertical_text_2">vertical 2</string>
-    <string name="vertical_text_3">vertical 3</string>
-    <string name="reference">here</string>
-    <string name="coerceIntegerToString">100</string>
-    <string name="coerceBooleanToString">true</string>
-    <string name="coerceColorToString">#fff</string>
-    <string name="coerceFloatToString">100.0</string>
-    <string name="coerceDimensionToString">100px</string>
-    <string name="coerceFractionToString">100<xliff:g id="percent">%</xliff:g></string>
-    <string name="formattedStringNone">Format[]</string>
-    <string name="formattedStringOne">Format[<xliff:g id="format">%d</xliff:g>]</string>
-    <string name="formattedStringTwo">Format[<xliff:g id="format">%3$d,%2$s</xliff:g>]</string>
-    <string name="checkboxpref_key">checkboxpref_key</string>
-   <string name="checkboxpref_title">title of preference</string>
-   <string name="checkboxpref_summary">summary of preference</string>
-   <string name="checkboxpref_summary_on">summary on of preference</string>
-   <string name="checkboxpref_summary_off">summary off of preference</string>
-   <string name="checkboxpref_depend">checkboxpref_depend</string>
-   <string name="checkboxpref_depend_title"> depend title of preference</string>
-   <string name="checkboxpref_depend_summary"> depend summary of preference</string>
-   <string name="edittextpref_key">edittextpref_key</string>
-   <string name="edittextpref_default_value">default value of preference</string>
-   <string name="edittextpref_title">title of edit text preference</string>
-   <string name="edittextpref_summary">summary of edit text preference</string>
-   <string name="edittextpref_dialog_title">dialog title of edit text preference</string>
-   <string name="edittextpref_text">text of  edit text preference</string>
-   <string name="listpref_key">listpref_key</string>
-   <string name="listpref_title">title of list preference</string>
-   <string name="listpref_summary">summary of list preference</string>
-   <string name="listpref_dialogtitle">dialog title of list preference</string>
-   <string name="easy">Easy</string>
-   <string name="medium">Medium</string>
-   <string name="hard">Hard</string>
-   <string name="footer_view">Footer view</string>
-   <string name="header_view">Header view</string>
-   <string name="dialogpref_title">title of dialog preference </string>
-   <string name="dialogpref_dialog_title">dialog title of dialog preference </string>
-   <string name="dialogpref_key">dialogpref_key</string>
-   <string name="dialogpref_default_value">default value of dialog preference</string>
-   <string name="dialogpref_summary">summary of dialog preference</string>
-   <string name="dialogpref_message">message of dialog preference</string>
-   <string name="dialogpref_sure">Sure</string>
-   <string name="dialogpref_cancel">Cancel</string>
-   <string name="pref_key">pref_key</string>
-   <string name="pref_title">title of preference</string>
-   <string name="pref_summary">summary of preference</string>
-   <string name="pref_depend_key">pref_depend_key</string>
-   <string name="pref_depend_title"> depend title of preference</string>
-   <string name="pref_depend_summary"> depend summary of preference</string>
-   <string name="android_intent_action_preference">android.intent.action.PREFERENCE</string>
-   <string name="def_pref_key">def_pref_key</string>
-   <string name="def_pref_title">default preference</string>
-   <string name="def_pref_summary">This is default preference of cts</string>
-   <string name="relative_view1">view 1</string>
-   <string name="relative_view2">view 2</string>
-   <string name="relative_view3">view 3</string>
-   <string name="relative_view4">view 4</string>
-   <string name="relative_view5">view 5</string>
-   <string name="relative_view6">view 6</string>
-   <string name="relative_view7">view 7</string>
-   <string name="relative_view8">view 8</string>
-   <string name="relative_view9">view 9</string>
-   <string name="relative_view10">view 10</string>
-   <string name="relative_view11">view 11</string>
-   <string name="relative_view12">view 12</string>
-   <string name="relative_view13">view 13</string>
-   <string name="country">Country:</string>
-   <string name="symbol">Symbol:</string>
-   <string name="country_warning">No such country registered</string>
-   <string name="version_cur">base</string>
-   <string name="version_old">base</string>
-   <string name="version_v3">base</string>
-   <string name="authenticator_label">Android CTS</string>
-   <string name="search_label">Android CTS</string>
-   <string name="tag1">tag 1</string>
-   <string name="tag2">tag 2</string>
-
-   <string name="button">Button</string>
-   <string name="holo_test">Holo Test</string>
-   <string name="holo_generator">Holo Generator</string>
-   <string name="holo_light_test">Holo Light Test</string>
-   <string name="holo_light_generator">Holo Light Generator</string>
-   <string name="reference_image">Reference Image: </string>
-   <string name="generated_image">Generated Image: </string>
-   <string name="themes_prompt">Select a Theme:</string>
-   <string name="sample_text">Sample text goes here. I wanted something creative and whimsical
-but then I just got bored...</string>
-    <string name="long_text">This is a really long string which exceeds the width of the view.
-New devices have a much larger screen which actually enables long strings to be displayed
-with no fading. I have made this string longer to fix this case. If you are correcting this
-text, I would love to see the kind of devices you guys now use! Guys, maybe some devices need longer string!
-I think so, so how about double this string, like copy and paste!
-This is a really long string which exceeds the width of the view.
-New devices have a much larger screen which actually enables long strings to be displayed
-with no fading. I have made this string longer to fix this case. If you are correcting this
-text, I would love to see the kind of devices you guys now use! Guys, maybe some devices need longer string!
-I think so, so how about double this string, like copy and paste! </string>
-    <string name="rectangle200">"M 0,0 l 200,0 l 0, 200 l -200, 0 z"</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/values/styles.xml b/proprietary/frameworks/base/tests/resources/res/values/styles.xml
deleted file mode 100755
index 20c80f8c2215265d6672014c81d9f46e37f4e9bb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/values/styles.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <style name="Whatever">
-        <item name="type1">true</item>
-        <item name="type2">false</item>
-        <item name="type3">#ff0000ff</item>
-        <item name="type4">#ff00ff00</item>
-        <item name="type5">0.75px</item>
-        <item name="type6">10px</item>
-        <item name="type7">18px</item>
-        <item name="type8">@drawable/pass</item>
-        <item name="type9">3.14</item>
-        <item name="type10">100%</item>
-        <item name="type11">365</item>
-        <item name="type12">86400</item>
-        <item name="type13">@string/hello_android</item>
-        <item name="type14">TypedArray Test!</item>
-        <item name="type15">@array/difficultyLevel</item>
-        <item name="type16">Typed Value!</item>
-    </style>
-
-    <style name="TextViewWithoutColorAndAppearance">
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <style name="TextViewWithColorButWithOutAppearance">
-        <item name="android:textColor">#ff0000ff</item>
-    </style>
-
-    <style name="TextViewWithColorAndAppearance">
-        <item name="android:textColor">#ff0000ff</item>
-        <item name="android:textAppearance">@style/TextAppearance.WithColor</item>
-    </style>
-
-    <style name="TextViewWithoutColorButWithAppearance">
-        <item name="android:textAppearance">@style/TextAppearance.WithColor</item>
-    </style>
-
-    <style name="TextAppearance" parent="android:TextAppearance">
-    </style>
-
-    <style name="TextAppearance.WithColor">
-        <item name="android:textColor">#ffff0000</item>
-    </style>
-
-    <style name="TextAppearance.All">
-        <item name="android:textColor">@drawable/black</item>
-        <item name="android:textSize">20px</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textColorHint">@drawable/red</item>
-        <item name="android:textColorLink">@drawable/blue</item>
-        <item name="android:textColorHighlight">@drawable/yellow</item>
-    </style>
-
-    <style name="TextAppearance.Colors">
-        <item name="android:textColor">@drawable/black</item>
-        <item name="android:textColorHint">@drawable/blue</item>
-        <item name="android:textColorLink">@drawable/yellow</item>
-        <item name="android:textColorHighlight">@drawable/red</item>
-    </style>
-
-    <style name="TextAppearance.NotColors">
-        <item name="android:textSize">17px</item>
-        <item name="android:typeface">sans</item>
-        <item name="android:textStyle">normal</item>
-    </style>
-
-    <style name="TextAppearance.Style">
-        <item name="android:textStyle">normal</item>
-    </style>
-
-    <style name="TestEnum1">
-        <item name="testEnum">val1</item>
-    </style>
-
-    <style name="TestEnum2">
-        <item name="testEnum">val2</item>
-    </style>
-
-    <style name="TestEnum10">
-        <item name="testEnum">val10</item>
-    </style>
-
-    <style name="TestFlag1">
-        <item name="testFlags">bit1</item>
-    </style>
-
-    <style name="TestFlag2">
-        <item name="testFlags">bit2</item>
-    </style>
-
-    <style name="TestFlag31">
-        <item name="testFlags">bit31</item>
-    </style>
-
-    <style name="TestFlag1And2">
-        <item name="testFlags">bit1|bit2</item>
-    </style>
-
-    <style name="TestFlag1And2And31">
-        <item name="testFlags">bit1|bit2|bit31</item>
-    </style>
-
-    <style name="TestEnum1.EmptyInherit" />
-
-    <style name="Theme_AlertDialog">
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <style name="TestProgressBar">
-        <item name="android:indeterminateOnly">false</item>
-        <item name="android:progressDrawable">?android:drawable/progress_horizontal</item>
-        <item name="android:indeterminateDrawable">?android:drawable/progress_horizontal</item>
-        <item name="android:minHeight">20dip</item>
-        <item name="android:maxHeight">20dip</item>
-        <item name="android:focusable">true</item>
-    </style>
-
-    <style name="Test_Theme">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:panelColorForeground">#ff000000</item>
-        <item name="android:panelColorBackground">#ffffffff</item>
-    </style>
-
-    <style name="Theme_OverrideOuter">
-        <item name="themeType">1</item>
-    </style>
-
-    <style name="Theme_OverrideInner">
-        <item name="themeType">2</item>
-        <item name="themeOverrideAttr">@style/Theme_OverrideAttr</item>
-    </style>
-
-    <style name="Theme_OverrideAttr">
-        <item name="themeType">3</item>
-    </style>
-    
-    <style name="Theme_ThemedDrawableTest">
-        <item name="themeBoolean">true</item>
-        <item name="themeColor">@android:color/black</item>
-        <item name="themeFloat">1.0</item>
-        <item name="themeAngle">45.0</item>
-        <item name="themeInteger">1</item>
-        <item name="themeDimension">1px</item>
-        <item name="themeDrawable">@drawable/icon_black</item>
-        <item name="themeBitmap">@drawable/icon_black</item>
-        <item name="themeNinePatch">@drawable/ninepatch_0</item>
-        <item name="themeGravity">48</item>
-        <item name="themeTileMode">2</item>
-    </style>
-
-    <style name="Theme_NoSwipeDismiss">
-        <item name="android:windowSwipeToDismiss">false</item>
-    </style>
-
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/alias.xml b/proprietary/frameworks/base/tests/resources/res/xml/alias.xml
deleted file mode 100755
index f88f3dc4299568de641a8e040d08cabfc8e567fd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/alias.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<alias xmlns:android="http://schemas.android.com/apk/res/android">
-    <intent android:action="android.intent.action.MAIN"
-        android:targetPackage="com.android.cts.stub"
-        android:targetClass="android.app.cts.ChildActivity"
-        android:data="http://www.google.com/">
-    </intent>
-</alias>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/anim_list_correct.xml b/proprietary/frameworks/base/tests/resources/res/xml/anim_list_correct.xml
deleted file mode 100755
index 660aa96e96a102c25d2d81dc52d60a52a40a01ad..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/anim_list_correct.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:visible="false"
-    android:variablePadding="true"
-    android:oneshot="true" >
-
-    <item android:drawable="@drawable/testimage"
-        android:duration="2000" />
-
-    <item android:duration="1000" >
-        <color android:color="#77ffffff" />
-    </item>
-</animation-list>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/anim_list_missing_item_drawable.xml b/proprietary/frameworks/base/tests/resources/res/xml/anim_list_missing_item_drawable.xml
deleted file mode 100755
index 99052f4f0a2426a7dddd52e31064f1eea3ca1ca4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/anim_list_missing_item_drawable.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:duration="2000" />
-</animation-list>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/anim_list_missing_item_duration.xml b/proprietary/frameworks/base/tests/resources/res/xml/anim_list_missing_item_duration.xml
deleted file mode 100755
index e3986c2f5dfcc083514ba856733ec19932bbf668..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/anim_list_missing_item_duration.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:drawable="@drawable/testimage" />
-</animation-list>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/anim_list_missing_list_attrs.xml b/proprietary/frameworks/base/tests/resources/res/xml/anim_list_missing_list_attrs.xml
deleted file mode 100755
index 25d2dfec1dc326535e39501a8fa3d6083a5a4869..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/anim_list_missing_list_attrs.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:drawable="@drawable/testimage"
-        android:duration="2000" />
-</animation-list>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/authenticator.xml b/proprietary/frameworks/base/tests/resources/res/xml/authenticator.xml
deleted file mode 100755
index 1e298b133b5dbe1569af0dc59ac746491ec653f5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/authenticator.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright (c) 2009, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<!-- The attributes in this XML file provide configuration information -->
-<!-- for the Account Manager. -->
-
-<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="android.content.cts.account.type"
-    android:icon="@drawable/ic_cts_selected"
-    android:smallIcon="@drawable/ic_cts_minitab_selected"
-    android:label="@string/authenticator_label"
-/>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/base_attributes.xml b/proprietary/frameworks/base/tests/resources/res/xml/base_attributes.xml
deleted file mode 100755
index adb44de32e2e101af692c59ebb96522a3c778449..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/base_attributes.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<alias xmlns:android="http://schemas.android.com/apk/res/android">
-    <base_attr_pixel>
-        <Attributes xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="400px"
-            android:layout_height="600px"/>
-    </base_attr_pixel>
-    <base_attr_fillwrap>
-        <Attributes xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
-    </base_attr_fillwrap>
-    <base_attr_noheight>
-        <Attributes xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="600px"/>
-    </base_attr_noheight>
-</alias>
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/bitmapdrawable.xml b/proprietary/frameworks/base/tests/resources/res/xml/bitmapdrawable.xml
deleted file mode 100755
index f9001aa9e4821540f83b335622379950e060cf39..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/bitmapdrawable.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<alias xmlns:android="http://schemas.android.com/apk/res/android">
-    <bitmap_allattrs>
-        <bitmap android:src="@drawable/testimage"
-            android:gravity="top|right"
-            android:dither="true"
-            android:antialias="true"
-            android:filter="false"
-            android:tileMode="repeat"/>
-    </bitmap_allattrs>
-
-    <bitmap_partattrs>
-        <bitmap android:src="@drawable/size_48x48"
-            android:gravity="center"
-            android:tileMode="mirror"/>
-    </bitmap_partattrs>
-
-    <bitmap_wrongsrc>
-        <bitmap android:src="@drawable/colorstatelist_test"/>
-    </bitmap_wrongsrc>
-
-    <bitmap_nosrc>
-        <bitmap android:gravity="center"/>
-    </bitmap_nosrc>
-</alias>
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/colors.xml b/proprietary/frameworks/base/tests/resources/res/xml/colors.xml
deleted file mode 100755
index 8c44a667aec3cb8c53e424d7c7b9b31a8de57048..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/colors.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-<resources>
-    <color name="testcolor1">#ff00ff00</color>
-    <color name="testcolor2">#ffff0000</color>
-    <color name="failColor">#ff0000ff</color>
-</resources>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/drawable_test.xml b/proprietary/frameworks/base/tests/resources/res/xml/drawable_test.xml
deleted file mode 100755
index f2a2e5d2ed20a0e8b9538ab08978cbdd0193c13f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/drawable_test.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<drawable xmlns:android="http://schemas.android.com/apk/res/android" android:visible="false">
-</drawable>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/extra.xml b/proprietary/frameworks/base/tests/resources/res/xml/extra.xml
deleted file mode 100755
index b3bffb4ce403616af81e7f9a973a2eba75b25b40..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/extra.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<tag xmlns:android="http://schemas.android.com/apk/res/android" android:name="Bruce" android:value="Lee">
-    <extra android:name="google" android:value="android">
-    </extra>
-</tag>
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/input_extras.xml b/proprietary/frameworks/base/tests/resources/res/xml/input_extras.xml
deleted file mode 100755
index ce5eb5eea0dddbd3730fadeccfb17512920e1d37..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/input_extras.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<input-extras xmlns:android="http://schemas.android.com/apk/res/android">
-    <extra android:name="google" android:value="android"/>
-    <extra android:name="test" android:value="cts"/>
-</input-extras>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/intentfilter.xml b/proprietary/frameworks/base/tests/resources/res/xml/intentfilter.xml
deleted file mode 100755
index 7ed3a534112ae83c6128973dbef1d2eaf7c36067..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/intentfilter.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-<intent-filter xmlns="http://schemas.android.com/apk/res/android">
-    <action name="testAction"/>
-    <cat name="testCategory" />
-    <type name="vnd.android.cursor.dir/person"/>
-    <scheme name="testScheme"/>
-    <auth host="testHost" port="80"/>
-    <path name="testPath" literal="test"/>
-    <path name="testPath" prefix="test"/>
-    <path name="testPath" sglob="test"/>
-</intent-filter>
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/layerdrawable.xml b/proprietary/frameworks/base/tests/resources/res/xml/layerdrawable.xml
deleted file mode 100755
index 9bb1268f6d717f5407b5476fbf8ea96c8f3bb5c8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/layerdrawable.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<alias xmlns:android="http://schemas.android.com/apk/res/android">
-    <layer-list_full>
-        <layer-list>
-            <item><color android:color="#88ffffff">
-                <padding android:left="1px" android:top="2px" android:right="3px"
-                    android:bottom="4px"/>
-            </color></item>
-            <item android:drawable="@drawable/testimage"/>
-            <item>
-                <rotate
-                    android:pivotX="50%" android:pivotY="50%"
-                    android:fromDegrees="0" android:toDegrees="360"
-                    android:drawable="@drawable/testimage"/>
-                <padding android:left="4px" android:top="3px"
-                    android:right="2px" android:bottom="1px" />
-            </item>
-            <bitmap android:src="@drawable/testimage"/>
-            <item android:id="@id/background"
-                android:drawable="@drawable/window_test_drawable" />
-        </layer-list>
-    </layer-list_full>
-    <layer-list_empty>
-        <layer-list>
-            <bitmap android:src="@drawable/testimage"/>
-        </layer-list>
-    </layer-list_empty>
-    <layer-list_exception>
-        <layer-list>
-            <item android:id="@id/background"/>
-        </layer-list>
-    </layer-list_exception>
-</alias>
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/layout.xml b/proprietary/frameworks/base/tests/resources/res/xml/layout.xml
deleted file mode 100755
index 6bcb27deaa1bb39f3477bd149f718b6968bd3cdc..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/layout.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<alias xmlns:android="http://schemas.android.com/apk/res/android">
-    <AbsoluteLayout    android:layout_width="20dip"
-               android:layout_height="30dip"
-               android:layout_x="10dip"
-               android:layout_y="20dip">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_x="0dip"
-                android:layout_y="0dip"
-                android:text="@string/notify">
-                <requestFocuse/>
-            </TextView>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_x="0dip"
-                android:layout_y="0dip"
-                android:text="@string/notify"/>
-
-            <View
-                android:id="@+id/fit_windows"
-                android:fitsSystemWindows="true"
-                android:layout_height="wrap_content"/>
-            <include layout="@xml/merge" />
-    </AbsoluteLayout>
-
-</alias>
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/level_list_correct.xml b/proprietary/frameworks/base/tests/resources/res/xml/level_list_correct.xml
deleted file mode 100755
index 241ec16f1e2c1c42def95a96fc3ae38167080a86..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/level_list_correct.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<level-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:drawable="@drawable/testimage"
-        android:minLevel="100"
-        android:maxLevel="200" />
-
-    <item android:minLevel="200"
-        android:maxLevel="300" >
-        <color android:color="#77ffffff" />
-    </item>
-</level-list>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/level_list_missing_item_drawable.xml b/proprietary/frameworks/base/tests/resources/res/xml/level_list_missing_item_drawable.xml
deleted file mode 100755
index 506b10f952600e87690fad93badd3b1f1cc87c8f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/level_list_missing_item_drawable.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<level-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:minLevel="100"
-        android:maxLevel="200"/>
-</level-list>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/level_list_missing_item_minlevel_maxlevel.xml b/proprietary/frameworks/base/tests/resources/res/xml/level_list_missing_item_minlevel_maxlevel.xml
deleted file mode 100755
index f77bfd5cd4d020224b083176f7e9bc3207904e2f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/level_list_missing_item_minlevel_maxlevel.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<level-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:drawable="@drawable/testimage" />
-</level-list>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/merge.xml b/proprietary/frameworks/base/tests/resources/res/xml/merge.xml
deleted file mode 100755
index 710e9040aa2b4b1be0b2198b0f877c4ff079b839..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/merge.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-   <AbsoluteLayout    android:layout_width="20dip"
-               android:layout_height="30dip"
-               android:layout_x="10dip"
-               android:layout_y="20dip">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_x="0dip"
-                android:layout_y="0dip"
-                android:text="@string/notify"/>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_x="0dip"
-                android:layout_y="0dip"
-                android:text="@string/notify"/>
-
-    </AbsoluteLayout>
-
-</merge>
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/metadata.xml b/proprietary/frameworks/base/tests/resources/res/xml/metadata.xml
deleted file mode 100755
index 336b931db7c918b373355f4e0e40005388885b27..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<thedata xmlns:android="http://schemas.android.com/apk/res/android"
-    rawText="some raw text"
-    rawColor="#ffffff00"
-    android:color="#f00"
-    android:text="@string/metadata_text"/>
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/method.xml b/proprietary/frameworks/base/tests/resources/res/xml/method.xml
deleted file mode 100755
index 763faa5ca636c8b624b129dc9c30859e738cdc67..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/method.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<input-method xmlns:android="http://schemas.android.com/apk/res/android"
-        android:settingsActivity="android.view.inputmethod.cts.InputMethodInfoStub"
-/>
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/pm_test.xml b/proprietary/frameworks/base/tests/resources/res/xml/pm_test.xml
deleted file mode 100755
index 4db24cf3246512619a82cb57a1c61e6c8ef285e1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/pm_test.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
- <!-- This xml is just test for PackageManager Test -->
-<resources>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/scaledrawable.xml b/proprietary/frameworks/base/tests/resources/res/xml/scaledrawable.xml
deleted file mode 100755
index d8d5f73bfdb3c3f20a61787d66569811326d29c7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/scaledrawable.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<alias xmlns:android="http://schemas.android.com/apk/res/android">
-    <scale_allattrs>
-        <scale
-            android:scaleWidth="0.4"
-            android:scaleHeight="0.3"
-            android:scaleGravity="center"
-            android:drawable="@drawable/testimage">
-            <color android:color="#88ffffff"/>
-            <bitmap android:src="@drawable/size_48x48"/>
-        </scale>
-    </scale_allattrs>
-
-    <scale_nodrawable>
-        <scale
-            android:scaleWidth="0.7"
-            android:scaleHeight="0.3"
-            android:scaleGravity="center"/>
-    </scale_nodrawable>
-</alias>
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/searchable.xml b/proprietary/frameworks/base/tests/resources/res/xml/searchable.xml
deleted file mode 100755
index f526341b5570ac30598579a8098d87a6efcd9233..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/searchable.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<searchable xmlns:android="http://schemas.android.com/apk/res/android"
-    android:label="@string/search_label"
-/>
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/selector_correct.xml b/proprietary/frameworks/base/tests/resources/res/xml/selector_correct.xml
deleted file mode 100755
index 917833f2ecaee544e2cc6f2fe6f4d47a3222c281..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/selector_correct.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:visible="false"
-    android:variablePadding="true"
-    android:constantSize="true" >
-
-    <item android:state_focused="true"
-        android:state_pressed="false"
-        android:drawable="@drawable/testimage" />
-
-    <item >
-        <color android:color="#77ffffff" />
-    </item>
-</selector>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/selector_missing_item_drawable.xml b/proprietary/frameworks/base/tests/resources/res/xml/selector_missing_item_drawable.xml
deleted file mode 100755
index 35bef42245f8d0e2efa8e31ec64cfb4cf6d46d0e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/selector_missing_item_drawable.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:visible="false"
-    android:variablePadding="true"
-    android:constantSize="true" >
-
-    <item android:state_focused="true"
-        android:state_pressed="false" />
-</selector>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/selector_missing_selector_attrs.xml b/proprietary/frameworks/base/tests/resources/res/xml/selector_missing_selector_attrs.xml
deleted file mode 100755
index 87ccc3c26b893edc89898440965aa5b4d61e4c44..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/selector_missing_selector_attrs.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:drawable="@drawable/testimage"
-        android:state_focused="true"
-        android:state_pressed="false" />
-</selector>
-
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/syncadapter.xml b/proprietary/frameworks/base/tests/resources/res/xml/syncadapter.xml
deleted file mode 100755
index 1c0bb72dc03baa01f97631819a09780f015816bc..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/syncadapter.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright (c) 2009, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<!-- The attributes in this XML file provide configuration information -->
-<!-- for the SyncAdapter. -->
-
-<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:contentAuthority="android.content.cts.authority"
-    android:accountType="android.content.cts.account.type"
-/>
diff --git a/proprietary/frameworks/base/tests/resources/res/xml/test_color.xml b/proprietary/frameworks/base/tests/resources/res/xml/test_color.xml
deleted file mode 100755
index 97f7dec9a00ffe8466e5720d4140fcd0222a16ee..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/res/xml/test_color.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-        android:versionName="testNonResourcesString">
-    <color name="testcolor1">#ff00ff00</color>
-    <color name="testcolor2">#ffff0000</color>
-    <color name="failColor">#ff0000ff</color>
-</resources>
diff --git a/proprietary/frameworks/base/tests/resources/src/mediatek/app/cts/MockActivity.java b/proprietary/frameworks/base/tests/resources/src/mediatek/app/cts/MockActivity.java
deleted file mode 100755
index 1496e2efcccc8128c65cffa1bbd3c0732776e084..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/src/mediatek/app/cts/MockActivity.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.app.cts;
-
-import android.app.Activity;
-
-public class MockActivity extends Activity {
-
-}
diff --git a/proprietary/frameworks/base/tests/resources/src/mediatek/app/cts/MockApplication.java b/proprietary/frameworks/base/tests/resources/src/mediatek/app/cts/MockApplication.java
deleted file mode 100755
index 0a19460bcb16719fb7e8a49651c9c03b32bfd3c8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/src/mediatek/app/cts/MockApplication.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.app.cts;
-
-import android.app.Application;
-import android.content.res.Configuration;
-
-
-public class MockApplication extends Application {
-
-    public boolean isOnCreateCalled;
-    public boolean isConstructorCalled;
-    public boolean isOnConfigurationChangedCalled;
-    public boolean isOnLowMemoryCalled;
-
-    public MockApplication() {
-        super();
-        isConstructorCalled = true;
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        isOnCreateCalled = true;
-    }
-
-    @Override
-    public void onTerminate() {
-        super.onTerminate();
-        // The documentation states that one cannot rely on this method being called. No need to
-        // test it here.
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        isOnConfigurationChangedCalled = true;
-    }
-
-    @Override
-    public void onLowMemory() {
-        super.onLowMemory();
-        isOnLowMemoryCalled = true;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/AvailableIntentsActivity.java b/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/AvailableIntentsActivity.java
deleted file mode 100755
index 7c70d133a93df97da3897cc46a7cdc08a04f1241..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/AvailableIntentsActivity.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import com.mediatek.cts.resource.stub.R;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-/**
- * This is a stub activity for test available intents. We do not care about
- * what it layouts. We only need an activity even if it's empty for this test.
- */
-public class AvailableIntentsActivity extends Activity {
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.available_intents_layout);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/ClipboardManagerListenerActivity.java b/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/ClipboardManagerListenerActivity.java
deleted file mode 100755
index 5137d274cf28d303dbcfa33d06e17a8cec0bb583..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/ClipboardManagerListenerActivity.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import android.app.Activity;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.content.ClipboardManager.OnPrimaryClipChangedListener;
-import android.os.Bundle;
-
-public class ClipboardManagerListenerActivity extends Activity {
-
-    private ClipboardManager mClipboardManager;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        synchronized (this) {
-            mClipboardManager = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-        }
-    }
-
-    public synchronized void addPrimaryClipChangedListener(OnPrimaryClipChangedListener listener) {
-        mClipboardManager.addPrimaryClipChangedListener(listener);
-    }
-
-    public synchronized void removePrimaryClipChangedListener(OnPrimaryClipChangedListener listener) {
-        mClipboardManager.removePrimaryClipChangedListener(listener);
-    }
-
-    public synchronized void setPrimaryClip(ClipData clip) {
-        mClipboardManager.setPrimaryClip(clip);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/ContextWrapperStubActivity.java b/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/ContextWrapperStubActivity.java
deleted file mode 100755
index d56c5b56555d21c823f908d65a09f81faddaf2e8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/ContextWrapperStubActivity.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-// Need the following import to get access to the app resources, since this
-// class is in a sub-package.
-import android.app.Activity;
-import android.os.Bundle;
-
-import com.mediatek.cts.resource.stub.R;
-
-public class ContextWrapperStubActivity extends Activity {
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.local_sample);
-    }
-}
-
diff --git a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/DummyProvider.java b/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/DummyProvider.java
deleted file mode 100755
index 2a6da755fead067ceafd1c8c16b3cd649c1b0d9e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/DummyProvider.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2009 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import dalvik.annotation.TestTargetClass;
-
-import android.content.ContentProvider;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.UriMatcher;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.net.Uri;
-
-/**
- * A simple content provider for AsyncQueryHandlerTest and ContentQueryMapTest.
- *
- * @see AsyncQueryHandlerTest
- * @see ContentQueryMapTest
- */
-@TestTargetClass(ContentProvider.class)
-public class DummyProvider extends ContentProvider {
-    private static final String MOCK_OPERATION = "mockOperation";
-
-    private static final String DATABASE_NAME = "dummy.db";
-    private static final String NAME_VALUE_TABLE = "name_value";
-
-    private DatabaseHelper mDbHelper;
-    private static UriMatcher sMatcher = new UriMatcher(UriMatcher.NO_MATCH);
-
-    private static final int MATCH_NAME_VALUE      = 1;
-    private static final int MATCH_MOCK_OPERATION  = 2;
-
-    public static final long MOCK_OPERATION_SLEEP_TIME = 2000;
-
-    public static final String AUTHORITY = "android.content.cts.dummyprovider";
-    public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY);
-    public static final Uri CONTENT_URI_MOCK_OPERATION = Uri.withAppendedPath(CONTENT_URI,
-            MOCK_OPERATION);
-
-    public static final String _ID   = "_id";
-    public static final String NAME  = "name";
-    public static final String VALUE = "value";
-
-    static {
-        sMatcher.addURI(AUTHORITY, null, MATCH_NAME_VALUE);
-        sMatcher.addURI(AUTHORITY, MOCK_OPERATION, MATCH_MOCK_OPERATION);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see android.content.ContentProvider#onCreate()
-     */
-    @Override
-    public boolean onCreate() {
-        mDbHelper = new DatabaseHelper(getContext());
-        return true;
-    }
-
-    private class DatabaseHelper extends SQLiteOpenHelper {
-        private static final int DATABASE_VERSION = 1;
-
-        DatabaseHelper(Context context) {
-            super(context, DATABASE_NAME, null, DATABASE_VERSION);
-        }
-
-        @Override
-        public void onCreate(SQLiteDatabase db) {
-            // create an empty name_value table
-            db.execSQL("CREATE TABLE " + NAME_VALUE_TABLE + " (" + _ID + " INTEGER PRIMARY KEY,"
-                    + NAME + " TEXT," + VALUE + " TEXT" + ");");
-        }
-
-        @Override
-        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see android.content.ContentProvider#insert(android.net.Uri,
-     * android.content.ContentValues)
-     */
-    @Override
-    public Uri insert(Uri uri, ContentValues values) {
-        String tbName = getTableName(uri);
-        if (tbName == null) {
-            return null;
-        }
-        SQLiteDatabase db = mDbHelper.getWritableDatabase();
-        db.insert(tbName, VALUE, values);
-        getContext().getContentResolver().notifyChange(uri, null);
-        return uri;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see android.content.ContentProvider#query(android.net.Uri,
-     * java.lang.String[], java.lang.String, java.lang.String[],
-     * java.lang.String)
-     */
-    @Override
-    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
-            String sortOrder) {
-        String tbName = getTableName(uri);
-        if (tbName == null) {
-            return null;
-        }
-        SQLiteDatabase db = mDbHelper.getReadableDatabase();
-        Cursor c = db.query(tbName, projection, selection, selectionArgs, null, null, sortOrder);
-        c.setNotificationUri(getContext().getContentResolver(), uri);
-        return c;
-    }
-
-    private String getTableName(Uri uri) {
-        switch (sMatcher.match(uri)) {
-            case MATCH_NAME_VALUE:
-                return NAME_VALUE_TABLE;
-            case MATCH_MOCK_OPERATION:
-                doMockOperation();
-                return null;
-            default:
-                throw new UnsupportedOperationException();
-        }
-    }
-
-    /**
-     * Simulate a long-running DB operation by sleeping.
-     */
-    private void doMockOperation() {
-        long time = System.currentTimeMillis();
-        long target = time + MOCK_OPERATION_SLEEP_TIME;
-        while (time < target) {
-            try {
-                Thread.sleep(target - time);
-            } catch (InterruptedException ignored) {
-                // ignore and continue sleeping, since a true long-running DB operation would not
-                // be affected by interrupt() either
-            }
-            time = System.currentTimeMillis();
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see android.content.ContentProvider#update(android.net.Uri,
-     * android.content.ContentValues, java.lang.String, java.lang.String[])
-     */
-    @Override
-    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-        String tbName = getTableName(uri);
-        if (tbName == null) {
-            return 0;
-        }
-        SQLiteDatabase db = mDbHelper.getWritableDatabase();
-        int count = db.update(tbName, values, selection, selectionArgs);
-        getContext().getContentResolver().notifyChange(uri, null);
-        return count;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see android.content.ContentProvider#delete(android.net.Uri,
-     * java.lang.String, java.lang.String[])
-     */
-    @Override
-    public int delete(Uri uri, String selection, String[] selectionArgs) {
-        String tbName = getTableName(uri);
-        if (tbName == null) {
-            return 0;
-        }
-        SQLiteDatabase db = mDbHelper.getWritableDatabase();
-        int count = db.delete(tbName, selection, selectionArgs);
-        getContext().getContentResolver().notifyChange(uri, null);
-        return count;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see android.content.ContentProvider#getType(android.net.Uri)
-     */
-    @Override
-    public String getType(Uri uri) {
-        return null;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/HighPriorityBroadcastReceiver.java b/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/HighPriorityBroadcastReceiver.java
deleted file mode 100755
index 4c59b377eed8816fb5ffa3d8947736e88e2ee481..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/HighPriorityBroadcastReceiver.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import android.content.Context;
-import android.content.Intent;
-
-public class HighPriorityBroadcastReceiver extends ResultReceiver {
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        super.onReceive(context, intent);
-
-        try {
-            synchronized (this) {
-                wait();
-            }
-        } catch (InterruptedException e) {
-            throw new RuntimeException("Got interrupted during wait()", e);
-        }
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/LowPriorityBroadcastReceiver.java b/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/LowPriorityBroadcastReceiver.java
deleted file mode 100755
index 55b3a076f112204988ced7608fd2ec857c0d0fbb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/LowPriorityBroadcastReceiver.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-public class LowPriorityBroadcastReceiver extends ResultReceiver {
-
-}
diff --git a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockAccountAuthenticator.java b/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockAccountAuthenticator.java
deleted file mode 100755
index 2ebff68ae0699fba6d930312b7116e1827e694c6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockAccountAuthenticator.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import android.accounts.AbstractAccountAuthenticator;
-import android.accounts.Account;
-import android.accounts.AccountAuthenticatorResponse;
-import android.accounts.AccountManager;
-import android.accounts.NetworkErrorException;
-import android.content.Context;
-import android.os.Bundle;
-
-public class MockAccountAuthenticator extends AbstractAccountAuthenticator {
-
-    private static MockAccountAuthenticator sMockAuthenticator = null;
-    public static final String ACCOUNT_NAME = "android.content.cts.account.name";
-    public static final String ACCOUNT_TYPE = "android.content.cts.account.type";
-    public static final String ACCOUNT_PASSWORD = "android.content.cts.account.password";
-    public static final String AUTH_TOKEN = "mockAuthToken";
-    public static final String AUTH_TOKEN_LABEL = "mockAuthTokenLabel";
-
-    public MockAccountAuthenticator(Context context) {
-        super(context);
-    }
-
-    private Bundle createResultBundle() {
-        Bundle result = new Bundle();
-        result.putString(AccountManager.KEY_ACCOUNT_NAME, ACCOUNT_NAME);
-        result.putString(AccountManager.KEY_ACCOUNT_TYPE, ACCOUNT_TYPE);
-        result.putString(AccountManager.KEY_AUTHTOKEN, AUTH_TOKEN);
-
-        return result;
-    }
-
-    @Override
-    public Bundle addAccount(AccountAuthenticatorResponse response, String accountType,
-            String authTokenType, String[] requiredFeatures, Bundle options)
-            throws NetworkErrorException {
-        return createResultBundle();
-    }
-
-    @Override
-    public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) {
-        return createResultBundle();
-    }
-
-    @Override
-    public Bundle updateCredentials(AccountAuthenticatorResponse response, Account account,
-            String authTokenType, Bundle options) throws NetworkErrorException {
-        return createResultBundle();
-    }
-
-    @Override
-    public Bundle confirmCredentials(AccountAuthenticatorResponse response, Account account,
-            Bundle options) throws NetworkErrorException {
-
-        Bundle result = new Bundle();
-        result.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, true);
-        return result;
-    }
-
-    @Override
-    public Bundle getAuthToken(AccountAuthenticatorResponse response, Account account,
-            String authTokenType, Bundle options) throws NetworkErrorException {
-        return createResultBundle();
-    }
-
-    @Override
-    public String getAuthTokenLabel(String authTokenType) {
-        return AUTH_TOKEN_LABEL;
-    }
-
-    @Override
-    public Bundle hasFeatures(AccountAuthenticatorResponse response, Account account,
-            String[] features) throws NetworkErrorException {
-
-        Bundle result = new Bundle();
-        result.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, true);
-        return result;
-    }
-
-    public static synchronized MockAccountAuthenticator getMockAuthenticator(Context context) {
-        if (null == sMockAuthenticator) {
-            sMockAuthenticator = new MockAccountAuthenticator(context);
-        }
-        return sMockAuthenticator;
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockAccountService.java b/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockAccountService.java
deleted file mode 100755
index dd3a73a0bdeae35192038f937d69243e016d9206..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockAccountService.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-
-/**
- * a basic Mock Service for wrapping the MockAccountAuthenticator
- */
-public class MockAccountService extends Service {
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return MockAccountAuthenticator.getMockAuthenticator(this).getIBinder();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockContentProvider.java b/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockContentProvider.java
deleted file mode 100755
index 5284a1d6baed41f533e7cfd08e1ef524d3a03443..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockContentProvider.java
+++ /dev/null
@@ -1,454 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
-
-import android.content.ContentProvider;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.UriMatcher;
-import android.content.ContentProvider.PipeDataWriter;
-import android.content.res.AssetFileDescriptor;
-import android.database.Cursor;
-import android.database.SQLException;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.database.sqlite.SQLiteQueryBuilder;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.CancellationSignal;
-import android.os.ParcelFileDescriptor;
-import android.text.TextUtils;
-import android.util.Log;
-
-public class MockContentProvider extends ContentProvider
-        implements PipeDataWriter<String> {
-
-    private SQLiteOpenHelper mOpenHelper;
-
-    private static final String DEFAULT_AUTHORITY = "ctstest";
-    private static final String DEFAULT_DBNAME = "ctstest.db";
-    private static final int DBVERSION = 2;
-
-    private static final int TESTTABLE1 = 1;
-    private static final int TESTTABLE1_ID = 2;
-    private static final int TESTTABLE1_CROSS = 3;
-    private static final int TESTTABLE2 = 4;
-    private static final int TESTTABLE2_ID = 5;
-    private static final int SELF_ID = 6;
-    private static final int CRASH_ID = 6;
-
-    private final String mAuthority;
-    private final String mDbName;
-    private final UriMatcher URL_MATCHER;
-    private HashMap<String, String> CTSDBTABLE1_LIST_PROJECTION_MAP;
-    private HashMap<String, String> CTSDBTABLE2_LIST_PROJECTION_MAP;
-
-    private static class DatabaseHelper extends SQLiteOpenHelper {
-
-        DatabaseHelper(Context context, String dbname) {
-            super(context, dbname, null, DBVERSION);
-        }
-
-        @Override
-        public void onCreate(SQLiteDatabase db) {
-            db.execSQL("CREATE TABLE TestTable1 ("
-                    + "_id INTEGER PRIMARY KEY, " + "key TEXT, " + "value INTEGER"
-                    + ");");
-
-            db.execSQL("CREATE TABLE TestTable2 ("
-                    + "_id INTEGER PRIMARY KEY, " + "key TEXT, " + "value INTEGER"
-                    + ");");
-        }
-
-        @Override
-        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-            db.execSQL("DROP TABLE IF EXISTS TestTable1");
-            db.execSQL("DROP TABLE IF EXISTS TestTable2");
-            onCreate(db);
-        }
-    }
-
-    public MockContentProvider() {
-        this(DEFAULT_AUTHORITY, DEFAULT_DBNAME);
-    }
-
-    public MockContentProvider(String authority, String dbName) {
-        mAuthority = authority;
-        mDbName = dbName;
-
-        URL_MATCHER = new UriMatcher(UriMatcher.NO_MATCH);
-        URL_MATCHER.addURI(mAuthority, "testtable1", TESTTABLE1);
-        URL_MATCHER.addURI(mAuthority, "testtable1/#", TESTTABLE1_ID);
-        URL_MATCHER.addURI(mAuthority, "testtable1/cross", TESTTABLE1_CROSS);
-        URL_MATCHER.addURI(mAuthority, "testtable2", TESTTABLE2);
-        URL_MATCHER.addURI(mAuthority, "testtable2/#", TESTTABLE2_ID);
-        URL_MATCHER.addURI(mAuthority, "self", SELF_ID);
-        URL_MATCHER.addURI(mAuthority, "crash", CRASH_ID);
-
-        CTSDBTABLE1_LIST_PROJECTION_MAP = new HashMap<String, String>();
-        CTSDBTABLE1_LIST_PROJECTION_MAP.put("_id", "_id");
-        CTSDBTABLE1_LIST_PROJECTION_MAP.put("key", "key");
-        CTSDBTABLE1_LIST_PROJECTION_MAP.put("value", "value");
-
-        CTSDBTABLE2_LIST_PROJECTION_MAP = new HashMap<String, String>();
-        CTSDBTABLE2_LIST_PROJECTION_MAP.put("_id", "_id");
-        CTSDBTABLE2_LIST_PROJECTION_MAP.put("key", "key");
-        CTSDBTABLE2_LIST_PROJECTION_MAP.put("value", "value");
-    }
-
-    @Override
-    public boolean onCreate() {
-        mOpenHelper = new DatabaseHelper(getContext(), mDbName);
-        if (android.provider.Settings.System.getInt(getContext().getContentResolver(),
-                "__cts_crash_on_launch", 0) != 0) {
-            // The test case wants us to crash our process on first launch.
-            // Well, okay then!
-            Log.i("MockContentProvider", "TEST IS CRASHING SELF, CROSS FINGERS!");
-            android.provider.Settings.System.putInt(getContext().getContentResolver(),
-                    "__cts_crash_on_launch", 0);
-            android.os.Process.killProcess(android.os.Process.myPid());
-        }
-        return true;
-    }
-
-    @Override
-    public int delete(Uri uri, String selection, String[] selectionArgs) {
-        SQLiteDatabase db = mOpenHelper.getWritableDatabase();
-        String segment;
-        int count;
-
-        switch (URL_MATCHER.match(uri)) {
-        case TESTTABLE1:
-            if (null == selection) {
-                // get the count when remove all rows
-                selection = "1";
-            }
-            count = db.delete("TestTable1", selection, selectionArgs);
-            break;
-        case TESTTABLE1_ID:
-            segment = uri.getPathSegments().get(1);
-            count = db.delete("TestTable1", "_id=" + segment +
-                    (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""),
-                    selectionArgs);
-            break;
-        case TESTTABLE2:
-            count = db.delete("TestTable2", selection, selectionArgs);
-            break;
-        case TESTTABLE2_ID:
-            segment = uri.getPathSegments().get(1);
-            count = db.delete("TestTable2", "_id=" + segment +
-                    (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""),
-                    selectionArgs);
-            break;
-        case SELF_ID:
-            // Wha...?  Delete ME?!?  O.K.!
-            Log.i("MockContentProvider", "Delete self requested!");
-            count = 1;
-            android.os.Process.killProcess(android.os.Process.myPid());
-            break;
-        default:
-            throw new IllegalArgumentException("Unknown URL " + uri);
-        }
-
-        getContext().getContentResolver().notifyChange(uri, null);
-        return count;
-    }
-
-    @Override
-    public String getType(Uri uri) {
-        switch (URL_MATCHER.match(uri)) {
-        case TESTTABLE1:
-            return "vnd.android.cursor.dir/com.android.content.testtable1";
-        case TESTTABLE1_ID:
-            return "vnd.android.cursor.item/com.android.content.testtable1";
-        case TESTTABLE1_CROSS:
-            return "vnd.android.cursor.cross/com.android.content.testtable1";
-        case TESTTABLE2:
-            return "vnd.android.cursor.dir/com.android.content.testtable2";
-        case TESTTABLE2_ID:
-            return "vnd.android.cursor.item/com.android.content.testtable2";
-
-        default:
-            throw new IllegalArgumentException("Unknown URL " + uri);
-        }
-    }
-
-    @Override
-    public Uri insert(Uri uri, ContentValues initialValues) {
-        long rowID;
-        ContentValues values;
-        String table;
-        Uri testUri;
-
-        if (initialValues != null)
-            values = new ContentValues(initialValues);
-        else
-            values = new ContentValues();
-
-        if (values.containsKey("value") == false)
-            values.put("value", -1);
-
-        switch (URL_MATCHER.match(uri)) {
-        case TESTTABLE1:
-            table = "TestTable1";
-            testUri = Uri.parse("content://" + mAuthority + "/testtable1");
-            break;
-        case TESTTABLE2:
-            table = "TestTable2";
-            testUri = Uri.parse("content://" + mAuthority + "/testtable2");
-            break;
-        default:
-            throw new IllegalArgumentException("Unknown URL " + uri);
-        }
-
-        SQLiteDatabase db = mOpenHelper.getWritableDatabase();
-        rowID = db.insert(table, "key", values);
-
-        if (rowID > 0) {
-            Uri url = ContentUris.withAppendedId(testUri, rowID);
-            getContext().getContentResolver().notifyChange(url, null);
-            return url;
-        }
-
-        throw new SQLException("Failed to insert row into " + uri);
-    }
-
-    @Override
-    public Cursor query(Uri uri, String[] projection, String selection,
-            String[] selectionArgs, String sortOrder) {
-        return query(uri, projection, selection, selectionArgs, sortOrder, null);
-    }
-
-    @Override
-    public Cursor query(Uri uri, String[] projection, String selection,
-            String[] selectionArgs, String sortOrder, CancellationSignal cancellationSignal) {
-
-        SQLiteQueryBuilder qb = new SQLiteQueryBuilder();
-
-        switch (URL_MATCHER.match(uri)) {
-        case TESTTABLE1:
-            qb.setTables("TestTable1");
-            qb.setProjectionMap(CTSDBTABLE1_LIST_PROJECTION_MAP);
-            break;
-
-        case TESTTABLE1_ID:
-            qb.setTables("TestTable1");
-            qb.appendWhere("_id=" + uri.getPathSegments().get(1));
-            break;
-
-        case TESTTABLE1_CROSS:
-            // Create a ridiculous cross-product of the test table.  This is done
-            // to create an artificially long-running query to enable us to test
-            // remote query cancellation in ContentResolverTest.
-            qb.setTables("TestTable1 a, TestTable1 b, TestTable1 c, TestTable1 d, TestTable1 e");
-            break;
-
-        case TESTTABLE2:
-            qb.setTables("TestTable2");
-            qb.setProjectionMap(CTSDBTABLE2_LIST_PROJECTION_MAP);
-            break;
-
-        case TESTTABLE2_ID:
-            qb.setTables("TestTable2");
-            qb.appendWhere("_id=" + uri.getPathSegments().get(1));
-            break;
-
-        case CRASH_ID:
-            if (android.provider.Settings.System.getInt(getContext().getContentResolver(),
-                    "__cts_crash_on_launch", 0) != 0) {
-                // The test case wants us to crash while querying.
-                // Well, okay then!
-                Log.i("MockContentProvider", "TEST IS CRASHING SELF, CROSS FINGERS!");
-                android.provider.Settings.System.putInt(getContext().getContentResolver(),
-                        "__cts_crash_on_launch", 0);
-                android.os.Process.killProcess(android.os.Process.myPid());
-            }
-            qb.setTables("TestTable1");
-            qb.setProjectionMap(CTSDBTABLE1_LIST_PROJECTION_MAP);
-            break;
-
-        default:
-            throw new IllegalArgumentException("Unknown URL " + uri);
-        }
-
-        /* If no sort order is specified use the default */
-        String orderBy;
-        if (TextUtils.isEmpty(sortOrder))
-            orderBy = "_id";
-        else
-            orderBy = sortOrder;
-
-        SQLiteDatabase db = mOpenHelper.getReadableDatabase();
-        Cursor c = qb.query(db, projection, selection, selectionArgs, null, null, orderBy,
-                null, cancellationSignal);
-
-        c.setNotificationUri(getContext().getContentResolver(), uri);
-        return c;
-    }
-
-    @Override
-    public int update(Uri uri, ContentValues values, String selection,
-            String[] selectionArgs) {
-        SQLiteDatabase db = mOpenHelper.getWritableDatabase();
-        String segment;
-        int count;
-
-        switch (URL_MATCHER.match(uri)) {
-        case TESTTABLE1:
-            count = db.update("TestTable1", values, selection, selectionArgs);
-            break;
-
-        case TESTTABLE1_ID:
-            segment = uri.getPathSegments().get(1);
-            count = db.update("TestTable1", values, "_id=" + segment +
-                    (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""),
-                    selectionArgs);
-            break;
-
-        case TESTTABLE2:
-            count = db.update("TestTable2", values, selection, selectionArgs);
-            break;
-
-        case TESTTABLE2_ID:
-            segment = uri.getPathSegments().get(1);
-            count = db.update("TestTable2", values, "_id=" + segment +
-                    (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""),
-                    selectionArgs);
-            break;
-
-        default:
-            throw new IllegalArgumentException("Unknown URL " + uri);
-        }
-
-        getContext().getContentResolver().notifyChange(uri, null);
-        return count;
-    }
-
-    @Override
-    public AssetFileDescriptor openAssetFile(Uri uri, String mode) throws FileNotFoundException {
-        switch (URL_MATCHER.match(uri)) {
-            case CRASH_ID:
-                if (android.provider.Settings.System.getInt(getContext().getContentResolver(),
-                        "__cts_crash_on_launch", 0) != 0) {
-                    // The test case wants us to crash while querying.
-                    // Well, okay then!
-                    Log.i("MockContentProvider", "TEST IS CRASHING SELF, CROSS FINGERS!");
-                    android.provider.Settings.System.putInt(getContext().getContentResolver(),
-                            "__cts_crash_on_launch", 0);
-                    android.os.Process.killProcess(android.os.Process.myPid());
-                }
-                return new AssetFileDescriptor(
-                        openPipeHelper(uri, null, null,
-                                "This is the openAssetFile test data!", this), 0,
-                        AssetFileDescriptor.UNKNOWN_LENGTH);
-
-            default:
-                return super.openAssetFile(uri, mode);
-        }
-    }
-
-    @Override
-    public AssetFileDescriptor openTypedAssetFile(Uri uri, String mimeTypeFilter, Bundle opts)
-            throws FileNotFoundException {
-        switch (URL_MATCHER.match(uri)) {
-            case CRASH_ID:
-                if (android.provider.Settings.System.getInt(getContext().getContentResolver(),
-                        "__cts_crash_on_launch", 0) != 0) {
-                    // The test case wants us to crash while querying.
-                    // Well, okay then!
-                    Log.i("MockContentProvider", "TEST IS CRASHING SELF, CROSS FINGERS!");
-                    android.provider.Settings.System.putInt(getContext().getContentResolver(),
-                            "__cts_crash_on_launch", 0);
-                    android.os.Process.killProcess(android.os.Process.myPid());
-                }
-                return new AssetFileDescriptor(
-                        openPipeHelper(uri, null, null,
-                                "This is the openTypedAssetFile test data!", this), 0,
-                        AssetFileDescriptor.UNKNOWN_LENGTH);
-
-            default:
-                return super.openTypedAssetFile(uri, mimeTypeFilter, opts);
-        }
-    }
-
-    @Override
-    public void writeDataToPipe(ParcelFileDescriptor output, Uri uri, String mimeType, Bundle opts,
-            String args) {
-        FileOutputStream fout = new FileOutputStream(output.getFileDescriptor());
-        PrintWriter pw = null;
-        try {
-            pw = new PrintWriter(new OutputStreamWriter(fout, "UTF-8"));
-            pw.print(args);
-        } catch (UnsupportedEncodingException e) {
-            Log.w("MockContentProvider", "Ooops", e);
-        } finally {
-            if (pw != null) {
-                pw.flush();
-            }
-            try {
-                fout.close();
-            } catch (IOException e) {
-            }
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockContextWrapperService.java b/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockContextWrapperService.java
deleted file mode 100755
index 14af01a4332991cfe308d23b814b2b14f1083a06..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockContextWrapperService.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.Binder;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.Message;
-
-/**
- * This class is used for {@link ContextWrapper}
- *
- * @see ContextWrapperTest
- */
-public class MockContextWrapperService extends Service {
-    private static boolean mHadCalledOnBind = false;
-    private static boolean mHadCalledOnUnbind = false;
-    private static boolean mHadCalledOnStart = false;
-    private static boolean mHadCalledOnDestory = false;
-    private static final int TEST_MESSAGE_WHAT = 1;
-
-    private final IBinder mBinder = new Binder();
-
-    private Handler mHandler = new Handler() {
-        public void handleMessage(Message msg) {
-            mHandler.sendMessageDelayed(mHandler.obtainMessage(TEST_MESSAGE_WHAT), 1000);
-        }
-    };
-
-    @Override
-    public void onCreate() {
-        mHandler.sendMessageDelayed(mHandler.obtainMessage(TEST_MESSAGE_WHAT), 1000);
-    }
-
-    @Override
-    public void onDestroy() {
-        mHadCalledOnDestory = true;
-        mHandler.removeMessages(1);
-    }
-
-    @Override
-    public boolean onUnbind(Intent intent) {
-        mHadCalledOnUnbind = true;
-        return true;
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        mHadCalledOnBind = true;
-        return mBinder;
-    }
-
-    @Override
-    public void onStart(Intent intent, int startId) {
-        mHadCalledOnStart = true;
-    }
-
-    public static void reset() {
-        mHadCalledOnBind = false;
-        mHadCalledOnUnbind = false;
-        mHadCalledOnStart = false;
-        mHadCalledOnDestory = false;
-    }
-
-    public static boolean hadCalledOnBind() {
-        return mHadCalledOnBind;
-    }
-
-    public static boolean hadCalledOnUnbind() {
-        return mHadCalledOnUnbind;
-    }
-
-    public static boolean hadCalledOnStart() {
-        return mHadCalledOnStart;
-    }
-
-    public static boolean hadCalledOnDestory() {
-        return mHadCalledOnDestory;
-    }
-}
-
diff --git a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockReceiver.java b/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockReceiver.java
deleted file mode 100755
index 1b6b652d4c3017ec9f038b98ef9eeb57019c727e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockReceiver.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-
-/**
- * This class is used for testing android.content.BroadcastReceiver.
- *
- * @see BroadcastReceiver
- */
-public class MockReceiver extends BroadcastReceiver {
-    public static final int RESULT_CODE = 4;
-    public static final String RESULT_DATA = "add";
-    public static final String RESULT_EXTRAS_INVARIABLE_KEY = "invariable";
-    public static final String RESULT_EXTRAS_INVARIABLE_VALUE = "invariable value";
-    public static final String RESULT_EXTRAS_REMOVE_KEY = "remove";
-    public static final String RESULT_EXTRAS_REMOVE_VALUE = "remove value";
-    public static final String RESULT_EXTRAS_ADD_KEY = "add";
-    public static final String RESULT_EXTRAS_ADD_VALUE = "add value";
-
-    public void onReceive(Context context, Intent intent) {
-        Bundle map = getResultExtras(false);
-        map.remove(RESULT_EXTRAS_REMOVE_KEY);
-        map.putString(RESULT_EXTRAS_ADD_KEY, RESULT_EXTRAS_ADD_VALUE);
-        setResult(RESULT_CODE, RESULT_DATA, map);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockReceiverAbort.java b/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockReceiverAbort.java
deleted file mode 100755
index b6aa03da3ff5516cfc0800d3ddca6bf4e06e06dc..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockReceiverAbort.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-
-/**
- * This class is used for testing android.content.BroadcastReceiver.
- *
- * @see BroadcastReceiver
- */
-public class MockReceiverAbort extends BroadcastReceiver {
-    public static final int RESULT_CODE = 3;
-    public static final String RESULT_DATA = "abort";
-    public static final String RESULT_EXTRAS_ABORT_KEY = "abort";
-    public static final String RESULT_EXTRAS_ABORT_VALUE = "abort value";
-
-    public void onReceive(Context context, Intent intent) {
-        Bundle map = getResultExtras(false);
-        map.putString(RESULT_EXTRAS_ABORT_KEY, RESULT_EXTRAS_ABORT_VALUE);
-        setResult(RESULT_CODE, RESULT_DATA, map);
-
-        abortBroadcast();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockReceiverFirst.java b/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockReceiverFirst.java
deleted file mode 100755
index e73a3ae54880340a63e08c2448c735ebde6990fe..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockReceiverFirst.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-
-/**
- * This class is used for testing android.content.BroadcastReceiver.
- *
- * @see BroadcastReceiver
- */
-public class MockReceiverFirst extends BroadcastReceiver {
-    public static final int RESULT_CODE = 2;
-    public static final String RESULT_DATA = "first";
-    public static final String RESULT_EXTRAS_FIRST_KEY = "first";
-    public static final String RESULT_EXTRAS_FIRST_VALUE = "first value";
-
-    public void onReceive(Context context, Intent intent) {
-        Bundle map = getResultExtras(false);
-        map.putString(RESULT_EXTRAS_FIRST_KEY, RESULT_EXTRAS_FIRST_VALUE);
-        setResult(RESULT_CODE, RESULT_DATA, map);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockRemoteContentProvider.java b/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockRemoteContentProvider.java
deleted file mode 100755
index fc43701901cb2faf1083b6b08b0c9bc8a29699d1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockRemoteContentProvider.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-public class MockRemoteContentProvider extends MockContentProvider {
-    public MockRemoteContentProvider() {
-        super("remotectstest", "remotectstest.db");
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockSRSProvider.java b/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockSRSProvider.java
deleted file mode 100755
index b52d6d1771e3a2e52d51635a0a987b97d8ecd42e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockSRSProvider.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.content.cts;
-
-import android.content.SearchRecentSuggestionsProvider;
-
-public class MockSRSProvider extends SearchRecentSuggestionsProvider {
-    final static String AUTHORITY = "android.content.cts.MockSRSProvider";
-    final static int MODE = DATABASE_MODE_QUERIES + DATABASE_MODE_2LINES;
-
-    public static boolean setupSuggestCalled;
-    private boolean mOnCreateCalled;
-
-    public MockSRSProvider() {
-        super();
-        setupSuggestions(AUTHORITY, MODE);
-    }
-
-    public MockSRSProvider(String tag) {
-        super();
-    }
-
-    @Override
-    public void setupSuggestions(String authority, int mode) {
-        setupSuggestCalled = true;
-        super.setupSuggestions(authority, mode);
-    }
-
-    @Override
-    public boolean onCreate() {
-        mOnCreateCalled = true;
-        return super.onCreate();
-    }
-
-    public boolean isOnCreateCalled() {
-        return mOnCreateCalled;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockSyncAdapter.java b/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockSyncAdapter.java
deleted file mode 100755
index 44bdd646d74f75ec8f84ab5f13878c572fee585c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockSyncAdapter.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import android.accounts.Account;
-import android.content.ContentResolver;
-import android.content.ISyncAdapter;
-import android.content.ISyncContext;
-import android.os.Bundle;
-import android.os.RemoteException;
-
-import java.util.ArrayList;
-import java.util.concurrent.CountDownLatch;
-
-public class MockSyncAdapter extends ISyncAdapter.Stub {
-
-    private static MockSyncAdapter sSyncAdapter = null;
-
-    private ArrayList<Account> mAccounts = new ArrayList<Account>();
-    private String mAuthority;
-    private Bundle mExtras;
-    private boolean mInitialized;
-    private boolean mStartSync;
-    private boolean mCancelSync;
-    private CountDownLatch mLatch;
-
-    public ArrayList<Account> getAccounts() {
-        return mAccounts;
-    }
-
-    public String getAuthority() {
-        return mAuthority;
-    }
-
-    public Bundle getExtras() {
-        return mExtras;
-    }
-
-    public boolean isInitialized() {
-        return mInitialized;
-    }
-
-    public boolean isStartSync() {
-        return mStartSync;
-    }
-
-    public boolean isCancelSync() {
-        return mCancelSync;
-    }
-
-    public void clearData() {
-        mAccounts.clear();
-        mAuthority = null;
-        mExtras = null;
-        mInitialized = false;
-        mStartSync = false;
-        mCancelSync = false;
-        mLatch = null;
-    }
-
-    public void setLatch(CountDownLatch mLatch) {
-        this.mLatch = mLatch;
-    }
-
-    public void startSync(ISyncContext syncContext, String authority, Account account,
-            Bundle extras) throws RemoteException {
-
-        mAccounts.add(account);
-        mAuthority = authority;
-        mExtras = extras;
-
-        if (null != extras && extras.getBoolean(ContentResolver.SYNC_EXTRAS_INITIALIZE)) {
-            mInitialized = true;
-            mStartSync = false;
-            mCancelSync = false;
-        } else {
-            mInitialized = false;
-            mStartSync = true;
-            mCancelSync = false;
-        }
-
-        if (null != mLatch) {
-            mLatch.countDown();
-        }
-    }
-
-    public void cancelSync(ISyncContext syncContext) throws RemoteException {
-        mAccounts.clear();
-        mAuthority = null;
-        mExtras = null;
-
-        mInitialized = false;
-        mStartSync = false;
-        mCancelSync = true;
-
-        if (null != mLatch) {
-            mLatch.countDown();
-        }
-    }
-
-    public void initialize(android.accounts.Account account, java.lang.String authority)
-            throws android.os.RemoteException {
-
-        mAccounts.add(account);
-        mAuthority = authority;
-
-        mInitialized = true;
-        mStartSync = false;
-        mCancelSync = false;
-
-        if (null != mLatch) {
-            mLatch.countDown();
-        }
-    }
-
-    public static MockSyncAdapter getMockSyncAdapter() {
-        if (null == sSyncAdapter) {
-            sSyncAdapter = new MockSyncAdapter();
-        }
-        return sSyncAdapter;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockSyncAdapterService.java b/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockSyncAdapterService.java
deleted file mode 100755
index 1ddb7f3e71dd0233ca16581231071be89e808c98..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/MockSyncAdapterService.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-
-public class MockSyncAdapterService extends Service {
-    @Override
-    public IBinder onBind(Intent intent) {
-        return MockSyncAdapter.getMockSyncAdapter();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/ResultReceiver.java b/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/ResultReceiver.java
deleted file mode 100755
index 0dd8bd0cbfae5b08c5120a88acfabba13708e416..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/src/mediatek/content/cts/ResultReceiver.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.content.cts;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-/**
- * This class is used for testing android.content.ContentWrapper.
- *
- * @see ContextWrapperTest
- */
-public class ResultReceiver extends BroadcastReceiver {
-    public static final String MOCK_ACTION =
-        "android.content.cts.ContextWrapperTest.BROADCAST_RESULT";
-
-    private boolean mReceivedBroadCast;
-
-    public void onReceive(Context context, Intent intent) {
-        mReceivedBroadCast = MOCK_ACTION.equals(intent.getAction());
-    }
-
-    public boolean hasReceivedBroadCast() {
-        return mReceivedBroadCast;
-    }
-
-    public void reset() {
-        mReceivedBroadCast = false;
-    }
-}
-
diff --git a/proprietary/frameworks/base/tests/resources/src/mediatek/view/animation/cts/DelayedCheck.java b/proprietary/frameworks/base/tests/resources/src/mediatek/view/animation/cts/DelayedCheck.java
deleted file mode 100755
index 97a391019c679c52999fc32ec233540854ff95db..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/src/mediatek/view/animation/cts/DelayedCheck.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.view.animation.cts;
-
-import junit.framework.Assert;
-
-public abstract class DelayedCheck {
-    private static final long TIME_SLICE = 200;
-    private long mTimeout = 3000;
-
-    public DelayedCheck() {
-
-    }
-
-    public DelayedCheck(long timeout) {
-        mTimeout = timeout;
-    }
-
-    protected abstract boolean check();
-
-    public void run() {
-        long timeout = mTimeout;
-        while (timeout > 0) {
-            try {
-                Thread.sleep(TIME_SLICE);
-            } catch (InterruptedException e) {
-                Assert.fail("unexpected InterruptedException");
-            }
-
-            if (check()) {
-                return;
-            }
-
-            timeout -= TIME_SLICE;
-        }
-
-        Assert.fail("unexpected timeout");
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/tests/Android.mk b/proprietary/frameworks/base/tests/resources/tests/Android.mk
deleted file mode 100755
index de47777e2806380b0244760873077bb8d8499524..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/tests/Android.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := tests
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MediaTekCtsResourceTestCases
-
-LOCAL_INSTRUMENTATION_FOR := MediaTekResourceTestStubs
-
-include $(BUILD_PACKAGE)
diff --git a/proprietary/frameworks/base/tests/resources/tests/Android.mk_ b/proprietary/frameworks/base/tests/resources/tests/Android.mk_
deleted file mode 100755
index de47777e2806380b0244760873077bb8d8499524..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/tests/Android.mk_
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := tests
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MediaTekCtsResourceTestCases
-
-LOCAL_INSTRUMENTATION_FOR := MediaTekResourceTestStubs
-
-include $(BUILD_PACKAGE)
diff --git a/proprietary/frameworks/base/tests/resources/tests/AndroidManifest.xml b/proprietary/frameworks/base/tests/resources/tests/AndroidManifest.xml
deleted file mode 100755
index f75324c6b4d1bab12d6c21f8b8f816cfc8ab26a8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/tests/AndroidManifest.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mediatek.cts.resource">
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.mediatek.cts.resource.stub"
-                     android:label="Test for Mediatek Resource"/>
-                     
-    <instrumentation android:name="com.zutubi.android.junitreport.JUnitReportTestRunner"
-                     android:targetPackage="com.mediatek.cts.resource.stub"
-                     android:label="JUnit tests of resource" />
-
-</manifest>
-
diff --git a/proprietary/frameworks/base/tests/resources/tests/NOTICE b/proprietary/frameworks/base/tests/resources/tests/NOTICE
deleted file mode 100755
index 95ba52b0396026a2d03e4be5036e781b957e72d6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/tests/NOTICE
+++ /dev/null
@@ -1,24 +0,0 @@
-* Copyright (C) 2009 The Android Open Source Project:
-* Copyright (C) 2008 The Android Open Source Project:
-* Copyright (C) 2006 The Android Open Source Project:
-
-
-
-/*
-* Copyright (C) 2011-2014 MediaTek Inc.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-:
- 
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/resources/tests/README b/proprietary/frameworks/base/tests/resources/tests/README
deleted file mode 100755
index 4a90cc33314ed129220077b7fec8108988d5fdc7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/tests/README
+++ /dev/null
@@ -1,19 +0,0 @@
-Test cases for mediatek frameworks resources module
-
-WHAT IT DOES?
-=============
-MediaTekCtsResourceTestCases.apk is a test case application for resources
-
-The test cases are mostly come from Android CTS test cases
-
-HOW IT WAS BUILT?
-==================
-make 'vendor/mediatek/proprietary/frameworks/base/tests/resources/tests' folder to get
-test apk
-
-HOW TO USE IT?
-==============
-After build MediaTekCtsResourceTestCases.apk, install to phone with
-MediaTekResourceTestStubs.apk, and run command:
-'adb shell am instrument -w com.mediatek.cts.resource/android.test.InstrumentationTestRunner'
-to get result
diff --git a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/ArrayTest.java b/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/ArrayTest.java
deleted file mode 100755
index 282e7a7b8fe895e04b6a5b9769a84910f0afd069..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/ArrayTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.content.res.cts;
-
-import android.content.res.Resources;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import com.mediatek.cts.resource.stub.R;
-
-public class ArrayTest extends AndroidTestCase {
-    private Resources mResources;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResources = mContext.getResources();
-    }
-
-    private void checkEntry(final int resid, final int index, final Object res,
-            final Object expected) {
-        assertEquals("in resource 0x" + Integer.toHexString(resid)
-                + " at index " + index, expected, res);
-    }
-
-    private void checkStringArray(final int resid, final String[] expected) {
-        final String[] res = mResources.getStringArray(resid);
-        assertEquals(res.length, expected.length);
-        for (int i = 0; i < expected.length; i++) {
-            checkEntry(resid, i, res[i], expected[i]);
-        }
-    }
-
-    private void checkTextArray(final int resid, final String[] expected) {
-        final CharSequence[] res = mResources.getTextArray(resid);
-        assertEquals(res.length, expected.length);
-        for (int i = 0; i < expected.length; i++) {
-            checkEntry(resid, i, res[i], expected[i]);
-        }
-    }
-
-    private void checkIntArray(final int resid, final int[] expected) {
-        final int[] res = mResources.getIntArray(resid);
-        assertEquals(res.length, expected.length);
-        for (int i = 0; i < expected.length; i++) {
-            assertEquals("in resource 0x" + Integer.toHexString(resid)
-                    + " at index " + i, expected[i], res[i]);
-        }
-    }
-
-    @SmallTest
-    public void testStrings() throws Exception {
-        checkStringArray(R.array.strings, new String[] {"zero", "1", "here"});
-        checkTextArray(R.array.strings, new String[] {"zero", "1", "here"});
-        checkStringArray(R.array.integers, new String[] {null, null, null});
-        checkTextArray(R.array.integers, new String[] {null, null, null});
-    }
-
-    @SmallTest
-    public void testIntegers() throws Exception {
-        checkIntArray(R.array.strings, new int[] {0, 0, 0});
-        checkIntArray(R.array.integers, new int[] {0, 1, 101});
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/AssetFileDescriptorTest.java b/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/AssetFileDescriptorTest.java
deleted file mode 100755
index 08566767245a391dd24c7f91b7ed331d85fedbe2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/AssetFileDescriptorTest.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.content.res.cts;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-
-import android.content.res.AssetFileDescriptor;
-import android.os.Parcel;
-import android.os.ParcelFileDescriptor;
-import android.test.AndroidTestCase;
-
-public class AssetFileDescriptorTest extends AndroidTestCase {
-    private static final long START_OFFSET = 0;
-    private static final long LENGTH = 100;
-    private static final String FILE_NAME = "testAssetFileDescriptor";
-    private static final byte[] FILE_DATA =
-        new byte[] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 };
-    private static final int FILE_END = -1;
-    private AssetFileDescriptor mAssetFileDes;
-    private File mFile;
-    private ParcelFileDescriptor mFd;
-    private FileOutputStream mOutputStream;
-    private FileInputStream mInputStream;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mFile = new File(getContext().getFilesDir(), FILE_NAME);
-        mFile.createNewFile();
-        initAssetFileDescriptor();
-    }
-
-    private void initAssetFileDescriptor() throws FileNotFoundException {
-        mFd = ParcelFileDescriptor.open(mFile, ParcelFileDescriptor.MODE_READ_WRITE);
-        mAssetFileDes = new AssetFileDescriptor(mFd, START_OFFSET, LENGTH);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        // As {@link AssetFileDescripter#createOutputStream()}
-        // and {@link AssetFileDescripter#createInputStream()} doc,
-        // the input and output stream will be auto closed when the AssetFileDescriptor closed.
-        if (mAssetFileDes != null) {
-            mAssetFileDes.close();
-        }
-        getContext().deleteFile(FILE_NAME);
-    }
-
-    public void testInputOutputStream() throws IOException {
-        /*
-         * test createOutputStream() and createInputStrean()
-         * test point
-         * 1. createOutputStream() and createInputStrean() should only call this once
-         * for a particular asset.
-         * 2. outputStream can write and inputStream can read.
-         * 3. auto close.
-         */
-        mOutputStream = mAssetFileDes.createOutputStream();
-        assertNotNull(mOutputStream);
-        mOutputStream.write(FILE_DATA);
-        mOutputStream.flush();
-        mOutputStream.close();
-        mOutputStream = null;
-        try {
-            mOutputStream = mAssetFileDes.createOutputStream();
-            fail("Should throw IOException");
-        } catch (IOException e) {
-            // expect
-        }
-        try {
-            mInputStream = mAssetFileDes.createInputStream();
-            fail("Should throw IOException");
-        } catch (IOException e) {
-            // expect
-        }
-        mAssetFileDes.close();
-        mAssetFileDes = null;
-
-        initAssetFileDescriptor();
-        mInputStream = mAssetFileDes.createInputStream();
-        assertNotNull(mInputStream);
-        byte[] dataFromFile = new byte[FILE_DATA.length];
-        int readLength = 0;
-        int readByte = 0;
-        while ((readByte != FILE_END) && (readLength < FILE_DATA.length)) {
-            readLength += readByte;
-            readByte = mInputStream.read(dataFromFile,
-                    readLength, FILE_DATA.length - readLength);
-        }
-        assertEquals(FILE_DATA.length, readLength);
-        assertTrue(Arrays.equals(FILE_DATA, dataFromFile));
-        assertEquals(FILE_END, mInputStream.read());
-        mInputStream.close();
-        mInputStream = null;
-        try {
-            mInputStream = mAssetFileDes.createInputStream();
-            fail("Should throw IOException");
-        } catch (IOException e) {
-            // expect
-        }
-        try {
-            mOutputStream = mAssetFileDes.createOutputStream();
-            fail("Should throw IOException");
-        } catch (IOException e) {
-            // expect
-        }
-        mAssetFileDes.close();
-        mAssetFileDes = null;
-
-        initAssetFileDescriptor();
-        mOutputStream = mAssetFileDes.createOutputStream();
-        mAssetFileDes.close();
-        mAssetFileDes = null;
-        try {
-            mOutputStream.write(FILE_DATA);
-            fail("Should throw IOException");
-        } catch (IOException e) {
-            // expect
-        }
-
-        initAssetFileDescriptor();
-        mInputStream = mAssetFileDes.createInputStream();
-        mAssetFileDes.close();
-        mAssetFileDes = null;
-        try {
-            mInputStream.read();
-            fail("Should throw IOException");
-        } catch (IOException e) {
-            // expect
-        }
-    }
-
-    public void testMiscMethod() {
-        // test getLength()
-        assertEquals(LENGTH, mAssetFileDes.getLength());
-
-        // test getStartOffset()
-        assertEquals(START_OFFSET, mAssetFileDes.getStartOffset());
-
-        // test getParcelFileDescriptor() getFileDescriptor() toString() and describeContents()
-        assertSame(mFd, mAssetFileDes.getParcelFileDescriptor());
-        assertSame(mFd.getFileDescriptor(), mAssetFileDes.getFileDescriptor());
-        assertNotNull(mAssetFileDes.toString());
-        assertEquals(mFd.describeContents(), mAssetFileDes.describeContents());
-
-        // test writeToParcel(), test by assert source and out FileDescriptor content equals.
-        Parcel parcel = Parcel.obtain();
-        mAssetFileDes.writeToParcel(parcel, 0);
-        parcel.setDataPosition(0);
-        AssetFileDescriptor out = AssetFileDescriptor.CREATOR.createFromParcel(parcel);
-        assertEquals(out.getStartOffset(), mAssetFileDes.getStartOffset());
-        assertEquals(out.getDeclaredLength(), mAssetFileDes.getDeclaredLength());
-        assertEquals(out.getParcelFileDescriptor().getStatSize(),
-                mAssetFileDes.getParcelFileDescriptor().getStatSize());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/AssetFileDescriptor_AutoCloseInputStreamTest.java b/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/AssetFileDescriptor_AutoCloseInputStreamTest.java
deleted file mode 100755
index 198f4cd4061a7b697c94b8b91d901cfe06df8706..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/AssetFileDescriptor_AutoCloseInputStreamTest.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.content.res.cts;
-
-
-import android.content.res.AssetFileDescriptor;
-import android.os.ParcelFileDescriptor;
-import android.test.AndroidTestCase;
-import android.test.MoreAsserts;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-public class AssetFileDescriptor_AutoCloseInputStreamTest extends AndroidTestCase {
-    private static final int FILE_END = -1;
-    private static final String FILE_NAME = "testAssertFileDescriptorAutoCloseInputStream";
-    private static final byte[] FILE_DATA = new byte[] {
-            0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08
-            };
-    private static final int FILE_LENGTH = FILE_DATA.length;
-
-    private File mFile;
-    private AssetFileDescriptor mFd;
-    private AssetFileDescriptor.AutoCloseInputStream mInput;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mFile = new File(getContext().getFilesDir(), FILE_NAME);
-        FileOutputStream outputStream = new FileOutputStream(mFile);
-        outputStream.write(FILE_DATA);
-        outputStream.close();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        if (mFd != null) {
-            mFd.close();
-            mFd = null;
-        }
-        mFile.delete();
-    }
-
-    public void testSkip() throws IOException {
-        openInput(0, FILE_LENGTH);
-        assertEquals(FILE_DATA[0], mInput.read());
-        assertEquals(0, mInput.skip(0));
-        assertEquals(FILE_DATA[1], mInput.read());
-        assertEquals(3, mInput.skip(3));
-        assertEquals(FILE_DATA[5], mInput.read());
-        assertEquals(3, mInput.skip(10));
-        assertEquals(FILE_END, mInput.read());
-    }
-
-    public void testRead() throws IOException {
-        openInput(0, FILE_LENGTH);
-        for (int i = 0; i < FILE_LENGTH; i++) {
-            assertEquals(FILE_DATA[i], mInput.read());
-        }
-        assertEquals(FILE_END, mInput.read());
-    }
-
-    public void testReadPartial() throws IOException {
-        long len = 6;
-        openInput(0, len);
-        for (int i = 0; i < len; i++) {
-            assertEquals(FILE_DATA[i], mInput.read());
-        }
-        assertEquals(FILE_END, mInput.read());
-    }
-
-    public void testReadBufferLen() throws IOException {
-        openInput(0, FILE_LENGTH);
-        byte[] buf = new byte[FILE_LENGTH];
-        assertEquals(3, mInput.read(buf, 0, 3));
-        assertEquals(3, mInput.read(buf, 3, 3));
-        assertEquals(3, mInput.read(buf, 6, 4));
-        MoreAsserts.assertEquals(FILE_DATA, buf);
-        assertEquals(FILE_END, mInput.read(buf, 0, 4));
-    }
-
-    public void testReadBuffer() throws IOException {
-        openInput(0, FILE_LENGTH);
-        byte[] buf = new byte[6];
-        assertEquals(6, mInput.read(buf));
-        assertEquals(FILE_DATA[0], buf[0]);
-        assertEquals(3, mInput.read(buf));
-        assertEquals(FILE_DATA[6], buf[0]);
-        assertEquals(FILE_END, mInput.read(buf));
-    }
-
-    public void testReadBufferPartial() throws IOException {
-        long len = 8;
-        openInput(0, len);
-        byte[] buf = new byte[6];
-        assertEquals(6, mInput.read(buf));
-        assertEquals(FILE_DATA[0], buf[0]);
-        assertEquals(2, mInput.read(buf));
-        assertEquals(FILE_DATA[6], buf[0]);
-        assertEquals(FILE_END, mInput.read(buf));
-    }
-
-    public void testAvailableRead() throws IOException {
-        openInput(0, FILE_LENGTH);
-        assertEquals(FILE_LENGTH, mInput.available());
-        assertEquals(FILE_DATA[0], mInput.read());
-        assertEquals(FILE_LENGTH - 1 , mInput.available());
-    }
-
-    public void testAvailableReadBuffer() throws IOException {
-        openInput(0, FILE_LENGTH);
-        byte[] buf = new byte[3];
-        assertEquals(FILE_LENGTH, mInput.available());
-        assertEquals(buf.length, mInput.read(buf));
-        assertEquals(FILE_LENGTH - buf.length, mInput.available());
-    }
-
-    public void testAvailableReadBufferLen() throws IOException {
-        openInput(0, FILE_LENGTH);
-        byte[] buf = new byte[3];
-        assertEquals(FILE_LENGTH, mInput.available());
-        assertEquals(2, mInput.read(buf, 0, 2));
-        assertEquals(FILE_LENGTH - 2, mInput.available());
-    }
-
-    /*
-     * Tests that AutoInputStream doesn't support mark().
-     */
-    public void testMark() throws IOException {
-        openInput(0, FILE_LENGTH);
-        assertFalse(mInput.markSupported());
-        assertEquals(FILE_DATA[0], mInput.read());
-        mInput.mark(FILE_LENGTH);  // should do nothing
-        assertEquals(FILE_DATA[1], mInput.read());
-        mInput.reset();  // should do nothing
-        assertEquals(FILE_DATA[2], mInput.read());
-    }
-
-    private void openInput(long startOffset, long length)
-            throws IOException {
-        if (mFd != null) {
-            mFd.close();
-            mFd = null;
-        }
-        ParcelFileDescriptor fd =
-                ParcelFileDescriptor.open(mFile, ParcelFileDescriptor.MODE_READ_WRITE);
-        mFd = new AssetFileDescriptor(fd, startOffset, length);
-        mInput = new AssetFileDescriptor.AutoCloseInputStream(mFd);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/AssetFileDescriptor_AutoCloseOutputStreamTest.java b/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/AssetFileDescriptor_AutoCloseOutputStreamTest.java
deleted file mode 100755
index 06a821313e6f44ff574a3f649bb223b9630dcbe6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/AssetFileDescriptor_AutoCloseOutputStreamTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package mediatek.content.res.cts;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import android.content.res.AssetFileDescriptor;
-import android.os.ParcelFileDescriptor;
-import android.test.AndroidTestCase;
-
-public class AssetFileDescriptor_AutoCloseOutputStreamTest extends AndroidTestCase {
-
-    private static final String FILE_NAME = "testAssertFileDescriptorAutoCloseOutputStream";
-    private static final int FILE_LENGTH = 100;
-    private static final int FILE_END = -1;
-    private static final byte[] FILE_DATA = new byte[] {
-            0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08
-            };
-
-    private AssetFileDescriptor mAssetFileDes;
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        // As {@link AssetFileDescripter#createOutputStream()}
-        // and {@link AssetFileDescripter#createInputStream()} doc,
-        // the input and output stream will be auto closed when the AssetFileDescriptor closed.
-        // Here is no need to close AutoCloseOutputStream, as AssetFileDescriptor will do it for us.
-        if (mAssetFileDes != null) {
-            mAssetFileDes.close();
-        }
-        getContext().deleteFile(FILE_NAME);
-    }
-
-    /*
-     * Test AutoCloseOutputStream life circle.
-     * 1. Write file data into test file.
-     */
-    public void testAutoCloseOutputStream() throws IOException {
-        File file = new File(getContext().getFilesDir(), FILE_NAME);
-        file.createNewFile();
-        ParcelFileDescriptor fd = ParcelFileDescriptor.open(file,
-                ParcelFileDescriptor.MODE_READ_WRITE);
-        mAssetFileDes = new AssetFileDescriptor(fd, 0, FILE_LENGTH);
-        AssetFileDescriptor.AutoCloseOutputStream outputStream =
-                new AssetFileDescriptor.AutoCloseOutputStream(mAssetFileDes);
-        outputStream.write(FILE_DATA[0]);
-        outputStream.write(FILE_DATA, 1, 5);
-        outputStream.write(FILE_DATA);
-        outputStream.flush();
-        mAssetFileDes.close();
-        mAssetFileDes = null;
-
-        fd = ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_WRITE);
-        mAssetFileDes = new AssetFileDescriptor(fd, 0, FILE_LENGTH);
-        FileInputStream inputStream = mAssetFileDes.createInputStream();
-        for (int i = 0; i < 6; i++) {
-            assertEquals(FILE_DATA[i], inputStream.read());
-        }
-        for (int i = 0; i < FILE_DATA.length; i++) {
-            assertEquals(FILE_DATA[i], inputStream.read());
-        }
-        assertEquals(FILE_END, inputStream.read());
-        mAssetFileDes.close();
-        mAssetFileDes = null;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/AssetManagerTest.java b/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/AssetManagerTest.java
deleted file mode 100755
index 9a01176263adb9e22196d056a3bb1b9fd1b05953..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/AssetManagerTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package mediatek.content.res.cts;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import android.content.res.AssetFileDescriptor;
-import android.content.res.AssetManager;
-import android.content.res.Resources;
-import android.content.res.XmlResourceParser;
-import android.test.AndroidTestCase;
-import android.util.TypedValue;
-
-import com.mediatek.cts.resource.stub.R;
-import com.android.internal.util.XmlUtils;
-
-
-public class AssetManagerTest extends AndroidTestCase {
-    private AssetManager mAssets;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mAssets = mContext.getAssets();
-    }
-
-    public void testAssetOperations() throws IOException, XmlPullParserException {
-        final Resources res = getContext().getResources();
-        final TypedValue value = new TypedValue();
-        res.getValue(R.raw.text, value, true);
-        final String fileName = "text.txt";
-        InputStream inputStream = mAssets.open(fileName);
-        assertNotNull(inputStream);
-        final String expect = "OneTwoThreeFourFiveSixSevenEightNineTen";
-        assertContextEquals(expect, inputStream);
-        inputStream = mAssets.open(fileName, AssetManager.ACCESS_BUFFER);
-        assertNotNull(inputStream);
-        assertContextEquals(expect, inputStream);
-
-        AssetFileDescriptor assetFileDes = mAssets.openFd(fileName);
-        assertNotNull(assetFileDes);
-        assertContextEquals(expect, assetFileDes.createInputStream());
-        assetFileDes = mAssets.openNonAssetFd(value.string.toString());
-        assertNotNull(assetFileDes);
-        assertContextEquals(expect, assetFileDes.createInputStream());
-        assetFileDes = mAssets.openNonAssetFd(value.assetCookie, value.string.toString());
-        assertNotNull(assetFileDes);
-        assertContextEquals(expect, assetFileDes.createInputStream());
-
-        XmlResourceParser parser = mAssets.openXmlResourceParser("AndroidManifest.xml");
-        assertNotNull(parser);
-        XmlUtils.beginDocument(parser, "manifest");
-        parser = mAssets.openXmlResourceParser(0, "AndroidManifest.xml");
-        assertNotNull(parser);
-        beginDocument(parser, "manifest");
-
-        String[] files = mAssets.list("");
-        boolean result = false;
-        for (int i = 0; i < files.length; i++) {
-            if (files[i].equals(fileName)) {
-                result = true;
-                break;
-            }
-        }
-        assertTrue(result);
-
-        try {
-            mAssets.open("notExistFile.txt", AssetManager.ACCESS_BUFFER);
-            fail("test open(String, int) failed");
-        } catch (IOException e) {
-            // expected
-        }
-
-        try {
-            mAssets.openFd("notExistFile.txt");
-            fail("test openFd(String) failed");
-        } catch (IOException e) {
-            // expected
-        }
-
-        try {
-            mAssets.openNonAssetFd(0, "notExistFile.txt");
-            fail("test openNonAssetFd(int, String) failed");
-        } catch (IOException e) {
-            // expected
-        }
-
-        try {
-            mAssets.openXmlResourceParser(0, "notExistFile.txt");
-            fail("test openXmlResourceParser(int, String) failed");
-        } catch (IOException e) {
-            // expected
-        }
-
-        assertNotNull(mAssets.getLocales());
-
-    }
-
-    private void assertContextEquals(final String expect, final InputStream inputStream)
-            throws IOException {
-        final BufferedReader bf = new BufferedReader(new InputStreamReader(inputStream));
-        final String result = bf.readLine();
-        inputStream.close();
-        assertNotNull(result);
-        assertEquals(expect, result);
-    }
-
-    private void beginDocument(final XmlPullParser parser, final  String firstElementName)
-            throws XmlPullParserException, IOException {
-        int type;
-        while ((type = parser.next()) != XmlPullParser.START_TAG) {
-        }
-        if (type != XmlPullParser.START_TAG) {
-            fail("No start tag found");
-        }
-        assertEquals(firstElementName, parser.getName());
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/AssetManager_AssetInputStreamTest.java b/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/AssetManager_AssetInputStreamTest.java
deleted file mode 100755
index 785d8333ef9d49cf5b36f708579ec49547b29a09..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/AssetManager_AssetInputStreamTest.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package mediatek.content.res.cts;
-
-import java.io.IOException;
-
-import android.content.res.AssetManager;
-import android.test.AndroidTestCase;
-
-public class AssetManager_AssetInputStreamTest extends AndroidTestCase {
-    private AssetManager.AssetInputStream mAssetInputStream;
-    private final String CONTENT_STRING = "OneTwoThreeFourFiveSixSevenEightNineTen";
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mAssetInputStream = (AssetManager.AssetInputStream) mContext.getAssets().open("text.txt");
-    }
-
-    public void testClose() throws IOException {
-        mAssetInputStream.close();
-
-        try {
-            mAssetInputStream.read();
-            fail("should throw exception");
-        } catch (NullPointerException e) {
-            // expected
-        }
-    }
-
-    public void testGetAssetInt() {
-        try {
-            // getAssetInt is no longer supported.
-            mAssetInputStream.getAssetInt();
-            fail();
-        } catch (UnsupportedOperationException expected) {
-        }
-    }
-
-    public void testMarkReset() throws IOException {
-        assertTrue(mAssetInputStream.markSupported());
-        final int readlimit = 10;
-        final byte[] bytes = CONTENT_STRING.getBytes();
-        for (int i = 0; i < readlimit; i++) {
-            assertEquals(bytes[i], mAssetInputStream.read());
-        }
-        mAssetInputStream.mark(readlimit);
-        mAssetInputStream.reset();
-        for (int i = 0; i < readlimit; i++) {
-            assertEquals(bytes[i + readlimit], mAssetInputStream.read());
-        }
-    }
-
-    public void testReadMethods() throws IOException {
-        // test available()
-        final byte[] bytes = CONTENT_STRING.getBytes();
-        int len = mAssetInputStream.available();
-        int end = -1;
-        assertEquals(CONTENT_STRING.length(), len);
-        for (int i = 0; i < len; i++) {
-            assertEquals(bytes[i], mAssetInputStream.read());
-        }
-        assertEquals(end, mAssetInputStream.read());
-
-        // test read(byte[])
-        mAssetInputStream.reset();
-        int dataLength = 10;
-        byte[] data = new byte[dataLength];
-        int ret = mAssetInputStream.read(data);
-        assertEquals(dataLength, ret);
-        for (int i = 0; i < dataLength; i++) {
-            assertEquals(bytes[i], data[i]);
-        }
-        data = new byte[len - dataLength];
-        assertEquals(len - dataLength, mAssetInputStream.read(data));
-        for (int i = 0; i < len - dataLength; i++) {
-            assertEquals(bytes[i + dataLength], data[i]);
-        }
-        assertEquals(end, mAssetInputStream.read(data));
-
-        // test read(bytep[], int, int)
-        mAssetInputStream.reset();
-        int offset = 0;
-        ret = mAssetInputStream.read(data, offset, dataLength);
-        assertEquals(dataLength, ret);
-        for (int i = offset; i < ret; i++) {
-            assertEquals(bytes[i], data[offset + i]);
-        }
-        mAssetInputStream.reset();
-        offset = 2;
-        ret = mAssetInputStream.read(data, offset, dataLength);
-        assertEquals(dataLength, ret);
-        for (int i = offset; i < ret; i++) {
-            assertEquals(bytes[i], data[offset + i]);
-        }
-        data = new byte[len + offset];
-        ret = mAssetInputStream.read(data, offset, len);
-        assertEquals(len - dataLength, ret);
-        for (int i = offset; i < ret; i++) {
-            assertEquals(bytes[i + dataLength], data[offset + i]);
-        }
-        assertEquals(end, mAssetInputStream.read(data, offset, len));
-        // test len is zero,
-        mAssetInputStream.reset();
-        assertEquals(0, mAssetInputStream.read(data, 0, 0));
-        // test skip(int)
-        int skipLenth = 8;
-        mAssetInputStream.reset();
-        mAssetInputStream.skip(skipLenth);
-        assertEquals(CONTENT_STRING.charAt(skipLenth), mAssetInputStream.read());
-
-        // test read(byte[] b), b is null
-        try {
-            mAssetInputStream.read(null);
-            fail("should throw NullPointerException ");
-        } catch (NullPointerException e) {
-            // expected
-        }
-
-        try {
-            mAssetInputStream.read(null, 0, mAssetInputStream.available());
-            fail("should throw NullPointerException ");
-        } catch (NullPointerException e) {
-            // expected
-        }
-        // test read(bytep[], int, int): offset is negative,
-        try {
-            data = new byte[10];
-            mAssetInputStream.read(data, -1, mAssetInputStream.available());
-            fail("should throw IndexOutOfBoundsException ");
-        } catch (IndexOutOfBoundsException e) {
-            // expected
-        }
-
-        // test read(bytep[], int, int): len+offset greater than data length
-        try {
-            data = new byte[10];
-            assertEquals(0, mAssetInputStream.read(data, 0, data.length + 2));
-            fail("should throw IndexOutOfBoundsException ");
-        } catch (IndexOutOfBoundsException e) {
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        mAssetInputStream.close();
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/ColorStateListTest.java b/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/ColorStateListTest.java
deleted file mode 100755
index b068588592773347a39fb00b3b17b6725ce29c5c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/ColorStateListTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package mediatek.content.res.cts;
-
-import java.io.IOException;
-
-import org.xmlpull.v1.XmlPullParserException;
-
-import android.content.res.ColorStateList;
-import android.content.res.Resources;
-import android.content.res.Resources.NotFoundException;
-import android.graphics.Color;
-import android.os.Parcel;
-import android.test.AndroidTestCase;
-
-import com.mediatek.cts.resource.stub.R;
-
-
-public class ColorStateListTest extends AndroidTestCase {
-    public void testColorStateList() throws NotFoundException, XmlPullParserException, IOException {
-        final int[][] state = new int[][] { { 0 }, { 0 } };
-        final int[] colors = new int[] { Color.RED, Color.BLUE };
-        ColorStateList c = new ColorStateList(state, colors);
-        assertTrue(c.isStateful());
-        assertEquals(Color.RED, c.getDefaultColor());
-
-        final int alpha = 36;
-        final ColorStateList c1 = c.withAlpha(alpha);
-        assertNotSame(Color.RED, c1.getDefaultColor());
-        // check alpha
-        assertEquals(alpha, c1.getDefaultColor() >>> 24);
-        assertEquals(Color.RED & 0x00FF0000, c1.getDefaultColor() & 0x00FF0000);
-
-        final int xmlId = R.drawable.testcolor;
-        final int colorInXml = 0xFFA6C839; // this color value is define in testcolor.xml file.
-        final Resources res = getContext().getResources();
-        c = ColorStateList.createFromXml(res, res.getXml(xmlId));
-        assertEquals(colorInXml, c.getDefaultColor());
-        assertEquals(0, c.describeContents());
-        assertFalse(c.isStateful());
-        assertNotNull(c.toString());
-        assertEquals(colorInXml, c.getColorForState(new int[]{0}, 0));
-
-        c = ColorStateList.valueOf(Color.GRAY);
-        assertEquals(Color.GRAY, c.getDefaultColor());
-
-        final Parcel parcel = Parcel.obtain();
-        c.writeToParcel(parcel, 0);
-        parcel.setDataPosition(0);
-        ColorStateList actual = ColorStateList.CREATOR.createFromParcel(parcel);
-        // can only compare the state and the default color. because no API to
-        // get every color of ColorStateList
-        assertEquals(c.isStateful(), actual.isStateful());
-        assertEquals(c.getDefaultColor(), actual.getDefaultColor());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/ConfigTest.java b/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/ConfigTest.java
deleted file mode 100755
index e3da63b1e75f11543a61dd68106a5bdfa54629f4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/ConfigTest.java
+++ /dev/null
@@ -1,1319 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.content.res.cts;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import android.content.res.AssetManager;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.content.res.Resources.NotFoundException;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.util.DisplayMetrics;
-
-import com.mediatek.cts.resource.stub.R;
-
-public class ConfigTest extends AndroidTestCase {
-    enum Properties {
-        LANGUAGE,
-        COUNTRY,
-        SCRIPT,
-        VARIANT,
-        MCC,
-        MNC,
-        TOUCHSCREEN,
-        KEYBOARD,
-        KEYBOARDHIDDEN,
-        NAVIGATION,
-        ORIENTATION,
-        WIDTH,
-        HEIGHT,
-        DENSITY,
-        SCREENLAYOUT,
-        SWIDTH_DP,
-        WIDTH_DP,
-        HEIGHT_DP
-    }
-
-    private static void checkValue(final Resources res, final int resId,
-            final String expectedValue) {
-        try {
-            final String actual = res.getString(resId);
-            assertNotNull("Returned wrong configuration-based simple value: expected <nothing>, "
-                    + "got '" + actual + "' from resource 0x" + Integer.toHexString(resId),
-                    expectedValue);
-            assertEquals("Returned wrong configuration-based simple value: expected '"
-                    + expectedValue + "', got '" + actual + "' from resource 0x"
-                    + Integer.toHexString(resId), expectedValue, actual);
-        } catch (NotFoundException e) {
-            assertNull("Resource not found for configuration-based simple value: expecting \""
-                    + expectedValue + "\"", expectedValue);
-        }
-    }
-
-    private static void checkValue(final Resources res, final int resId,
-            final int[] styleable, final String[] expectedValues) {
-        final Resources.Theme theme = res.newTheme();
-        final TypedArray sa = theme.obtainStyledAttributes(resId, styleable);
-        for (int i = 0; i < styleable.length; i++) {
-            final String actual = sa.getString(i);
-            assertEquals("Returned wrong configuration-based style value: expected '"
-                    + expectedValues[i] + "', got '" + actual + "' from attr "
-                    + i + " of resource 0x" + Integer.toHexString(resId),
-                    actual, expectedValues[i]);
-        }
-        sa.recycle();
-    }
-
-    private class TotalConfig {
-        final Configuration mConfig;
-        final DisplayMetrics mMetrics;
-
-        public TotalConfig() {
-            mConfig = new Configuration();
-            mMetrics = new DisplayMetrics();
-            mConfig.locale = Locale.ROOT;
-        }
-
-        public void setProperty(final Properties p, final int value) {
-            switch(p) {
-                case MCC:
-                    mConfig.mcc = value;
-                    break;
-                case MNC:
-                    mConfig.mnc = value;
-                    break;
-                case TOUCHSCREEN:
-                    mConfig.touchscreen = value;
-                    break;
-                case KEYBOARD:
-                    mConfig.keyboard = value;
-                    break;
-                case KEYBOARDHIDDEN:
-                    mConfig.keyboardHidden = value;
-                    break;
-                case NAVIGATION:
-                    mConfig.navigation = value;
-                    break;
-                case ORIENTATION:
-                    mConfig.orientation = value;
-                    break;
-                case WIDTH:
-                    mMetrics.widthPixels = value;
-                    mMetrics.noncompatWidthPixels = value;
-                    break;
-                case HEIGHT:
-                    mMetrics.heightPixels = value;
-                    mMetrics.noncompatHeightPixels = value;
-                    break;
-                case DENSITY:
-                    // this is the ratio from the standard
-                    mMetrics.density = (((float) value) / ((float) DisplayMetrics.DENSITY_DEFAULT));
-                    mMetrics.noncompatDensity = mMetrics.density;
-                    mConfig.densityDpi = value;
-                    break;
-                case SCREENLAYOUT:
-                    mConfig.screenLayout = value;
-                    break;
-                case SWIDTH_DP:
-                    mConfig.smallestScreenWidthDp = value;
-                    break;
-                case WIDTH_DP:
-                    mConfig.screenWidthDp = value;
-                    break;
-                case HEIGHT_DP:
-                    mConfig.screenHeightDp = value;
-                    break;
-                default:
-                    assert (false);
-                    break;
-            }
-        }
-
-        public void setProperty(final Properties p, final String value) {
-            switch(p) {
-                case LANGUAGE:
-                    mConfig.locale = new Locale.Builder()
-                            .setLocale(mConfig.locale)
-                            .setLanguage(value)
-                            .build();
-                    break;
-                case COUNTRY:
-                    mConfig.locale = new Locale.Builder()
-                            .setLocale(mConfig.locale)
-                            .setRegion(value)
-                            .build();
-                    break;
-                case SCRIPT:
-                    mConfig.locale = new Locale.Builder()
-                            .setLocale(mConfig.locale)
-                            .setScript(value)
-                            .build();
-                    break;
-                case VARIANT:
-                    mConfig.locale = new Locale.Builder()
-                            .setLocale(mConfig.locale)
-                            .setVariant(value)
-                            .build();
-                    break;
-                default:
-                    assert (false);
-                    break;
-            }
-        }
-
-        public Resources getResources() {
-            final AssetManager assmgr = new AssetManager();
-            assmgr.addAssetPath(mContext.getPackageResourcePath());
-            return new Resources(assmgr, mMetrics, mConfig);
-        }
-    }
-
-    public TotalConfig makeEmptyConfig() {
-        return new TotalConfig();
-    }
-
-    public TotalConfig makeClassicConfig() {
-        TotalConfig config = new TotalConfig();
-        config.setProperty(Properties.LANGUAGE, "en");
-        config.setProperty(Properties.COUNTRY, "US");
-        config.setProperty(Properties.MCC, 310);
-        config.setProperty(Properties.MNC, 001); // unused
-        config.setProperty(Properties.TOUCHSCREEN, Configuration.TOUCHSCREEN_FINGER);
-        config.setProperty(Properties.KEYBOARD, Configuration.KEYBOARD_QWERTY);
-        config.setProperty(Properties.KEYBOARDHIDDEN, Configuration.KEYBOARDHIDDEN_YES);
-        config.setProperty(Properties.NAVIGATION, Configuration.NAVIGATION_TRACKBALL);
-        config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_PORTRAIT);
-        config.setProperty(Properties.SWIDTH_DP, 320);
-        config.setProperty(Properties.WIDTH_DP, 320);
-        config.setProperty(Properties.HEIGHT_DP, 480);
-        config.setProperty(Properties.DENSITY, 160);
-        config.setProperty(Properties.WIDTH, 200);
-        config.setProperty(Properties.HEIGHT, 320);
-        return config;
-    }
-
-    private static void checkPair(Resources res, int[] notResIds,
-            int simpleRes, String simpleString,
-            int bagRes, String bagString) {
-        boolean willHave = true;
-        if (notResIds != null) {
-            for (int i : notResIds) {
-                if (i == simpleRes) {
-                    willHave = false;
-                    break;
-                }
-            }
-        }
-        checkValue(res, simpleRes, willHave ? simpleString : null);
-        checkValue(res, bagRes, R.styleable.TestConfig,
-                new String[]{willHave ? bagString : null});
-    }
-
-    @SmallTest
-    public void testAllEmptyConfigs() {
-        /**
-         * Test a resource that contains a value for each possible single
-         * configuration value.
-         */
-        TotalConfig config = makeEmptyConfig();
-        Resources res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple default");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag default"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.LANGUAGE, "xx");
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple xx");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag xx"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.LANGUAGE, "xx");
-        config.setProperty(Properties.COUNTRY, "YY");
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple xx-rYY");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag xx-rYY"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.MCC, 111);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple mcc111");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag mcc111"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.MNC, 222);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple mnc222");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag mnc222"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.TOUCHSCREEN, Configuration.TOUCHSCREEN_NOTOUCH);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple notouch");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag notouch"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.TOUCHSCREEN, Configuration.TOUCHSCREEN_STYLUS);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple stylus");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag stylus"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.KEYBOARD, Configuration.KEYBOARD_NOKEYS);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple nokeys");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag nokeys"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.KEYBOARD, Configuration.KEYBOARD_12KEY);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple 12key");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag 12key"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.KEYBOARDHIDDEN, Configuration.KEYBOARDHIDDEN_NO);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple keysexposed");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag keysexposed"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.NAVIGATION, Configuration.NAVIGATION_NONAV);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple nonav");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag nonav"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.NAVIGATION, Configuration.NAVIGATION_DPAD);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple dpad");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag dpad"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.NAVIGATION, Configuration.NAVIGATION_WHEEL);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple wheel");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag wheel"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.HEIGHT, 480);
-        config.setProperty(Properties.WIDTH, 320);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple 480x320");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag 480x320"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.DENSITY, 240);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple 240dpi");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag 240dpi"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_LANDSCAPE);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple landscape");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag landscape"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_SQUARE);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple square");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag square"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_SMALL);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple small");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag small"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_NORMAL);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple normal");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag normal"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_LARGE);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple large");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag large"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_XLARGE);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple xlarge");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag xlarge"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.SWIDTH_DP, 600);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple sw600");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag sw600"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.SWIDTH_DP, 600);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple sw600");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag sw600"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.SWIDTH_DP, 720);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple sw720");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag sw720"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.WIDTH_DP, 600);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple w600");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag w600"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.WIDTH_DP, 720);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple w720");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag w720"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.HEIGHT_DP, 550);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple h550");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag h550"});
-
-        config = makeEmptyConfig();
-        config.setProperty(Properties.HEIGHT_DP, 670);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple h670");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag h670"});
-    }
-
-    @SmallTest
-    public void testAllClassicConfigs() {
-        /**
-         * Test a resource that contains a value for each possible single
-         * configuration value.
-         */
-        TotalConfig config = makeClassicConfig();
-        Resources res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple default");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag default"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.LANGUAGE, "xx");
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple xx");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag xx"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.LANGUAGE, "xx");
-        config.setProperty(Properties.COUNTRY, "YY");
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple xx-rYY");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag xx-rYY"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.MCC, 111);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple mcc111");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag mcc111"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.MNC, 222);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple mnc222");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag mnc222"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.TOUCHSCREEN, Configuration.TOUCHSCREEN_NOTOUCH);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple notouch");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag notouch"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.TOUCHSCREEN, Configuration.TOUCHSCREEN_STYLUS);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple stylus");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag stylus"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.KEYBOARD, Configuration.KEYBOARD_NOKEYS);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple nokeys");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag nokeys"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.KEYBOARD, Configuration.KEYBOARD_12KEY);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple 12key 63x57");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag 12key 63x57"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.KEYBOARDHIDDEN, Configuration.KEYBOARDHIDDEN_NO);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple keysexposed");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag keysexposed"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.NAVIGATION, Configuration.NAVIGATION_NONAV);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple nonav");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag nonav"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.NAVIGATION, Configuration.NAVIGATION_DPAD);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple dpad 63x57");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag dpad 63x57"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.NAVIGATION, Configuration.NAVIGATION_WHEEL);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple wheel");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag wheel"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.HEIGHT, 480);
-        config.setProperty(Properties.WIDTH, 320);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple 480x320");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag 480x320"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.DENSITY, 240);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple 240dpi");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag 240dpi"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_LANDSCAPE);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple landscape");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag landscape"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_SQUARE);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple square");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag square"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_SMALL);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple small");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag small"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_NORMAL);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple normal");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag normal"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_LARGE);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple large");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag large"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_XLARGE);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple xlarge");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag xlarge"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.SWIDTH_DP, 600);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple sw600");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag sw600"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.SWIDTH_DP, 600);
-        config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_LANDSCAPE);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple sw600 land");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag sw600 land"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.SWIDTH_DP, 720);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple sw720");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag sw720"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.WIDTH_DP, 600);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple w600");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag w600"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.WIDTH_DP, 720);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple w720");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag w720"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.HEIGHT_DP, 550);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple h550");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag h550"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.HEIGHT_DP, 670);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple h670");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag h670"});
-    }
-
-    @MediumTest
-    public void testDensity() throws Exception {
-        // have 32, 240 and the default 160 content.
-        // rule is that closest wins, with down scaling (larger content)
-        // being twice as nice as upscaling.
-        // transition at H/2 * (-1 +/- sqrt(1+8L/H))
-        // SO, X < 49 goes to 32
-        // 49 >= X < 182 goes to 160
-        // X >= 182 goes to 240
-        TotalConfig config = makeClassicConfig();
-        config.setProperty(Properties.DENSITY, 2);
-        Resources res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple 32dpi");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag 32dpi"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.DENSITY, 32);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple 32dpi");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag 32dpi"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.DENSITY, 48);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple 32dpi");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag 32dpi"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.DENSITY, 49);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple default");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag default"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.DENSITY, 150);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple default");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag default"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.DENSITY, 181);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple default");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag default"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.DENSITY, 182);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple 240dpi");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag 240dpi"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.DENSITY, 239);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple 240dpi");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag 240dpi"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.DENSITY, 490);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple 240dpi");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag 240dpi"});
-    }
-
-    @MediumTest
-    public void testScreenSize() throws Exception {
-        // ensure that we fall back to the best available screen size
-        // for a given configuration.
-        TotalConfig config = makeClassicConfig();
-        config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_SMALL);
-        Resources res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple small");
-        checkValue(res, R.configVarying.small, "small");
-        checkValue(res, R.configVarying.normal, "default");
-        checkValue(res, R.configVarying.large, "default");
-        checkValue(res, R.configVarying.xlarge, "default");
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_NORMAL);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple normal");
-        checkValue(res, R.configVarying.small, "default");
-        checkValue(res, R.configVarying.normal, "normal");
-        checkValue(res, R.configVarying.large, "default");
-        checkValue(res, R.configVarying.xlarge, "default");
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_LARGE);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple large");
-        checkValue(res, R.configVarying.small, "default");
-        checkValue(res, R.configVarying.normal, "normal");
-        checkValue(res, R.configVarying.large, "large");
-        checkValue(res, R.configVarying.xlarge, "default");
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_XLARGE);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple xlarge");
-        checkValue(res, R.configVarying.small, "default");
-        checkValue(res, R.configVarying.normal, "normal");
-        checkValue(res, R.configVarying.large, "large");
-        checkValue(res, R.configVarying.xlarge, "xlarge");
-    }
-
-    @MediumTest
-    public void testNewScreenSize() throws Exception {
-        // ensure that swNNNdp, wNNNdp, and hNNNdp are working correctly
-        // for various common screen configurations.
-        TotalConfig config = makeClassicConfig();
-        config.setProperty(Properties.SWIDTH_DP, 589);
-        config.setProperty(Properties.WIDTH_DP, 589);
-        config.setProperty(Properties.HEIGHT_DP, 500);
-        config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_LANDSCAPE);
-        config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_LARGE);
-        Resources res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple large");
-        checkValue(res, R.configVarying.sw, "default");
-        checkValue(res, R.configVarying.w, "default");
-        checkValue(res, R.configVarying.h, "default");
-        checkValue(res, R.configVarying.wh, "default");
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.SWIDTH_DP, 590);
-        config.setProperty(Properties.WIDTH_DP, 590);
-        config.setProperty(Properties.HEIGHT_DP, 500);
-        config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_LANDSCAPE);
-        config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_LARGE);
-        config.setProperty(Properties.DENSITY, DisplayMetrics.DENSITY_MEDIUM);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple sw590 mdpi");
-        checkValue(res, R.configVarying.sw, "590 mdpi");
-
-        config.setProperty(Properties.DENSITY, DisplayMetrics.DENSITY_HIGH);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple sw590 hdpi");
-        checkValue(res, R.configVarying.sw, "590 hdpi");
-
-        config.setProperty(Properties.DENSITY, DisplayMetrics.DENSITY_XHIGH);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple sw590 xhdpi");
-        checkValue(res, R.configVarying.sw, "590 xhdpi");
-
-        config.setProperty(Properties.SWIDTH_DP, 591);
-        config.setProperty(Properties.WIDTH_DP, 591);
-        config.setProperty(Properties.DENSITY, DisplayMetrics.DENSITY_MEDIUM);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple sw591");
-        checkValue(res, R.configVarying.sw, "591");
-
-        config.setProperty(Properties.DENSITY, DisplayMetrics.DENSITY_HIGH);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple sw591 hdpi");
-        checkValue(res, R.configVarying.sw, "591 hdpi");
-
-        config.setProperty(Properties.DENSITY, DisplayMetrics.DENSITY_XHIGH);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple sw591 hdpi");
-        checkValue(res, R.configVarying.sw, "591 hdpi");
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.SWIDTH_DP, 480);
-        config.setProperty(Properties.WIDTH_DP, 800);
-        config.setProperty(Properties.HEIGHT_DP, 480);
-        config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_LANDSCAPE);
-        config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_LARGE);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple w720");
-        checkValue(res, R.configVarying.sw, "default");
-        checkValue(res, R.configVarying.w, "720");
-        checkValue(res, R.configVarying.h, "default");
-        checkValue(res, R.configVarying.wh, "600");
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.SWIDTH_DP, 600);
-        config.setProperty(Properties.WIDTH_DP, 1024);
-        config.setProperty(Properties.HEIGHT_DP, 552);
-        config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_LANDSCAPE);
-        config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_LARGE);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple sw600 land");
-        checkValue(res, R.configVarying.sw, "600 land");
-        checkValue(res, R.configVarying.w, "720");
-        checkValue(res, R.configVarying.h, "550");
-        checkValue(res, R.configVarying.wh, "600-550");
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.SWIDTH_DP, 600);
-        config.setProperty(Properties.WIDTH_DP, 600);
-        config.setProperty(Properties.HEIGHT_DP, 974);
-        config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_PORTRAIT);
-        config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_LARGE);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple sw600");
-        checkValue(res, R.configVarying.sw, "600");
-        checkValue(res, R.configVarying.w, "600");
-        checkValue(res, R.configVarying.h, "670");
-        checkValue(res, R.configVarying.wh, "600-550");
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.SWIDTH_DP, 719);
-        config.setProperty(Properties.WIDTH_DP, 1279);
-        config.setProperty(Properties.HEIGHT_DP, 669);
-        config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_LANDSCAPE);
-        config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_LARGE);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple sw600 land");
-        checkValue(res, R.configVarying.sw, "600 land");
-        checkValue(res, R.configVarying.w, "720");
-        checkValue(res, R.configVarying.h, "550");
-        checkValue(res, R.configVarying.wh, "600-550");
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.SWIDTH_DP, 800);
-        config.setProperty(Properties.WIDTH_DP, 1280);
-        config.setProperty(Properties.HEIGHT_DP, 672);
-        config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_LANDSCAPE);
-        config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_XLARGE);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple sw720");
-        checkValue(res, R.configVarying.sw, "720");
-        checkValue(res, R.configVarying.w, "720");
-        checkValue(res, R.configVarying.h, "670");
-        checkValue(res, R.configVarying.wh, "720-670");
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.SWIDTH_DP, 800);
-        config.setProperty(Properties.WIDTH_DP, 720);
-        config.setProperty(Properties.HEIGHT_DP, 1230);
-        config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_PORTRAIT);
-        config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_XLARGE);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple sw720");
-        checkValue(res, R.configVarying.sw, "720");
-        checkValue(res, R.configVarying.w, "720");
-        checkValue(res, R.configVarying.h, "670");
-        checkValue(res, R.configVarying.wh, "720-670");
-    }
-
-// TODO - add tests for special cases - ie, other key params seem ignored if
-// nokeys is set
-
-    @MediumTest
-    public void testPrecidence() {
-        /**
-         * Check for precidence of resources selected when there are multiple
-         * options matching the current config.
-         */
-        TotalConfig config = makeEmptyConfig();
-        config.setProperty(Properties.HEIGHT, 640);
-        config.setProperty(Properties.WIDTH, 400);
-        Resources res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple 640x400");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag 640x400"});
-
-        config.setProperty(Properties.NAVIGATION, Configuration.NAVIGATION_NONAV);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple nonav");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag nonav"});
-
-        config.setProperty(Properties.KEYBOARD, Configuration.KEYBOARD_NOKEYS);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple nokeys");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag nokeys"});
-
-        config.setProperty(Properties.KEYBOARDHIDDEN, Configuration.KEYBOARDHIDDEN_NO);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple keysexposed");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag keysexposed"});
-
-        config.setProperty(Properties.TOUCHSCREEN, Configuration.TOUCHSCREEN_NOTOUCH);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple notouch");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag notouch"});
-
-        config.setProperty(Properties.DENSITY, 240);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple 240dpi");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag 240dpi"});
-
-        config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_LANDSCAPE);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple landscape");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag landscape"});
-
-        config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_XLARGE);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple xlarge");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag xlarge"});
-
-        config.setProperty(Properties.HEIGHT_DP, 670);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple h670");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag h670"});
-
-        config.setProperty(Properties.WIDTH_DP, 720);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple 720-670");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag 720-670"});
-
-        config.setProperty(Properties.SWIDTH_DP, 720);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple sw720");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag sw720"});
-
-        config.setProperty(Properties.LANGUAGE, "xx");
-        config.setProperty(Properties.COUNTRY, "YY");
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple xx-rYY");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag xx-rYY"});
-
-        config.setProperty(Properties.MCC, 111);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple mcc111 xx-rYY");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag mcc111 xx-rYY"});
-
-        config.setProperty(Properties.MNC, 222);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple mcc111 mnc222");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag mcc111 mnc222"});
-    }
-
-    @MediumTest
-    public void testCombinations() {
-        /**
-         * Verify that in cases of ties, the specific ordering is followed
-         */
-
-        /**
-         * Precidence order: mcc, mnc, locale, swdp, wdp, hdp, screenlayout-size,
-         * screenlayout-long, orientation, density,
-         * touchscreen, hidden, keyboard, navigation, width-height
-         */
-
-        /**
-         * verify mcc trumps mnc.  Have 110-xx, 220-xx but no 110-220
-         * so which is selected?  Should be mcc110-xx.
-         */
-        TotalConfig config = makeClassicConfig();
-        config.setProperty(Properties.MCC, 110);
-        config.setProperty(Properties.MNC, 220);
-        config.setProperty(Properties.LANGUAGE, "xx");
-        Resources res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple mcc110 xx");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag mcc110 xx"});
-
-        /* full A + B + C doesn't exist.  Do we get A + C or B + C?
-         */
-        config = makeClassicConfig();
-        config.setProperty(Properties.MCC, 111);
-        config.setProperty(Properties.MNC, 222);
-        config.setProperty(Properties.LANGUAGE, "xx");
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple mcc111 mnc222");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag mcc111 mnc222"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.MNC, 222);
-        config.setProperty(Properties.LANGUAGE, "xx");
-        config.setProperty(Properties.ORIENTATION,
-                Configuration.ORIENTATION_SQUARE);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple mnc222 xx");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag mnc222 xx"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.LANGUAGE, "xx");
-        config.setProperty(Properties.ORIENTATION,
-                Configuration.ORIENTATION_SQUARE);
-        config.setProperty(Properties.DENSITY, 32);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple xx square");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag xx square"});
-
-        /**
-         * Verify that proper strings are found for multiple-selectivity case
-         * (ie, a string set for locale and mcc is found only when both are
-         * true).
-         */
-        config = makeClassicConfig();
-        config.setProperty(Properties.LANGUAGE, "xx");
-        config.setProperty(Properties.COUNTRY, "YY");
-        config.setProperty(Properties.MCC, 111);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple mcc111 xx-rYY");
-        checkValue(res, R.configVarying.bag, R.styleable.TestConfig,
-                new String[] { "bag mcc111 xx-rYY" });
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.LANGUAGE, "xx");
-        config.setProperty(Properties.COUNTRY, "YY");
-        config.setProperty(Properties.MCC, 333);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple xx-rYY");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[] { "bag xx-rYY" });
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.MNC, 333);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple default");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag default"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.ORIENTATION,
-                Configuration.ORIENTATION_SQUARE);
-        config.setProperty(Properties.DENSITY, 32);
-        config.setProperty(Properties.TOUCHSCREEN,
-                Configuration.TOUCHSCREEN_STYLUS);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple square 32dpi");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag square 32dpi"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.DENSITY, 32);
-        config.setProperty(Properties.TOUCHSCREEN,
-                Configuration.TOUCHSCREEN_STYLUS);
-        config.setProperty(Properties.KEYBOARDHIDDEN,
-                Configuration.KEYBOARDHIDDEN_NO);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple 32dpi stylus");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag 32dpi stylus"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.TOUCHSCREEN,
-                Configuration.TOUCHSCREEN_STYLUS);
-        config.setProperty(Properties.KEYBOARDHIDDEN,
-                Configuration.KEYBOARDHIDDEN_NO);
-        config.setProperty(Properties.KEYBOARD, Configuration.KEYBOARD_12KEY);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple stylus keysexposed");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag stylus keysexposed"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.KEYBOARDHIDDEN,
-                Configuration.KEYBOARDHIDDEN_NO);
-        config.setProperty(Properties.KEYBOARD, Configuration.KEYBOARD_12KEY);
-        config.setProperty(Properties.NAVIGATION,
-                Configuration.NAVIGATION_DPAD);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple keysexposed 12key");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag keysexposed 12key"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.KEYBOARD, Configuration.KEYBOARD_12KEY);
-        config.setProperty(Properties.NAVIGATION,
-                Configuration.NAVIGATION_DPAD);
-        config.setProperty(Properties.HEIGHT, 63);
-        config.setProperty(Properties.WIDTH, 57);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple 12key dpad");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag 12key dpad"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.NAVIGATION,
-                Configuration.NAVIGATION_DPAD);
-        config.setProperty(Properties.HEIGHT, 640);
-        config.setProperty(Properties.WIDTH, 400);
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple dpad 63x57");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag dpad 63x57"});
-    }
-
-    @MediumTest
-    public void testVersions() {
-        // Check that we get the most recent resources that are <= our
-        // current version.  Note the special version adjustment, so that
-        // during development the resource version is incremented to the
-        // next one.
-        int vers = android.os.Build.VERSION.SDK_INT;
-        if (!"REL".equals(android.os.Build.VERSION.CODENAME)) {
-            vers++;
-        }
-        String expected = "v" + vers + "cur";
-        assertEquals(expected, mContext.getResources().getString(R.string.version_cur));
-        assertEquals("base",  mContext.getResources().getString(R.string.version_old));
-        assertEquals("v3",  mContext.getResources().getString(R.string.version_v3));
-    }
-
-    @MediumTest
-    public void testExtendedLocales() {
-        TotalConfig config = makeClassicConfig();
-        // BCP 47 Locale kok
-        config.setProperty(Properties.LANGUAGE, "kok");
-        Resources res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple kok");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag kok"});
-
-        // BCP 47 Locale kok-IN
-        config.setProperty(Properties.COUNTRY, "IN");
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple kok IN");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag kok IN"});
-
-        // BCP 47 Locale kok-419
-        config.setProperty(Properties.COUNTRY, "419");
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple kok 419");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag kok 419"});
-
-
-        // BCP 47 Locale kok-419-VARIANT
-        config.setProperty(Properties.VARIANT, "VARIANT");
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple kok 419 VARIANT");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag kok 419 VARIANT"});
-
-        // BCP 47 Locale kok-Knda
-        config = makeClassicConfig();
-        config.setProperty(Properties.LANGUAGE, "kok");
-        config.setProperty(Properties.SCRIPT, "Knda");
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple kok Knda");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag kok Knda"});
-
-        // BCP 47 Locale kok-Knda-419
-        config.setProperty(Properties.COUNTRY, "419");
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple kok Knda 419");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag kok Knda 419"});
-
-        // BCP 47 Locale kok-Knda-419-VARIANT
-        config.setProperty(Properties.VARIANT, "VARIANT");
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple kok Knda 419 VARIANT");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag kok Knda 419 VARIANT"});
-
-        // BCP 47 Locale kok-VARIANT
-        config = makeClassicConfig();
-        config.setProperty(Properties.LANGUAGE, "kok");
-        config.setProperty(Properties.VARIANT, "VARIANT");
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple kok VARIANT");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag kok VARIANT"});
-    }
-
-    @MediumTest
-    public void testTlAndFilConversion() {
-        TotalConfig config = makeClassicConfig();
-
-        // Ensure that "fil" is mapped to "tl" correctly.
-        config.setProperty(Properties.LANGUAGE, "fil");
-        config.setProperty(Properties.COUNTRY, "US");
-        Resources res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple tl");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[] { "bag tl" });
-
-        // Ensure that "fil-PH" is mapped to "tl-PH" correctly.
-        config = makeClassicConfig();
-        config.setProperty(Properties.LANGUAGE, "fil");
-        config.setProperty(Properties.COUNTRY, "PH");
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple tl PH");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[] { "bag tl PH" });
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.LANGUAGE, "tgl");
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple tgl");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[] { "bag tgl" });
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.LANGUAGE, "tgl");
-        config.setProperty(Properties.COUNTRY, "PH");
-        res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple tgl PH");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[] { "bag tgl PH" });
-    }
-
-    @MediumTest
-    public void testGetLocalesConvertsTlToFil() {
-        TotalConfig config = makeClassicConfig();
-
-        // Check that the list of locales doesn't contain any of the
-        // "tl" variants. They should've been converted to "fil"
-        // locales.
-        AssetManager am = config.getResources().getAssets();
-        String[] locales = am.getLocales();
-        final List<String> tlLocales = new ArrayList<String>(4);
-        final List<String> filLocales = new ArrayList<String>(4);
-        for (String locale : locales) {
-            if (locale.startsWith("tl-") || locale.equals("tl")) {
-                tlLocales.add(locale);
-            }
-
-            if (locale.startsWith("fil-") || locale.equals("fil")) {
-                filLocales.add(locale);
-            }
-        }
-
-        assertEquals(0, tlLocales.size());
-        assertEquals(2, filLocales.size());
-        assertTrue(filLocales.contains("fil"));
-        assertTrue(filLocales.contains("fil-PH"));
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/ConfigurationTest.java b/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/ConfigurationTest.java
deleted file mode 100755
index 401cc1cca9f47f410941141d06c38831429119ef..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/ConfigurationTest.java
+++ /dev/null
@@ -1,413 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.content.res.cts;
-
-import java.util.Locale;
-
-import android.content.pm.ActivityInfo;
-import android.content.res.Configuration;
-import android.os.Parcel;
-import android.test.AndroidTestCase;
-import android.view.View;
-
-public class ConfigurationTest extends AndroidTestCase {
-
-    private Configuration mConfigDefault;
-    private Configuration mConfig;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mConfigDefault = new Configuration();
-        makeConfiguration();
-    }
-
-    private void makeConfiguration() {
-        mConfig = new Configuration();
-        mConfig.fontScale = 2;
-        mConfig.mcc = mConfig.mnc = 1;
-        mConfig.locale = Locale.getDefault();
-        mConfig.touchscreen = Configuration.TOUCHSCREEN_NOTOUCH;
-        mConfig.keyboard = Configuration.KEYBOARD_NOKEYS;
-        mConfig.keyboardHidden = Configuration.KEYBOARDHIDDEN_NO;
-        mConfig.navigation = Configuration.NAVIGATION_NONAV;
-        mConfig.orientation = Configuration.ORIENTATION_PORTRAIT;
-    }
-
-    public void testConstructor() {
-        new Configuration();
-        new Configuration(mConfigDefault);
-    }
-
-    public void testCompareTo() {
-        final Configuration cfg1 = new Configuration();
-        final Configuration cfg2 = new Configuration();
-        assertEquals(0, cfg1.compareTo(cfg2));
-
-        cfg1.orientation = 2;
-        cfg2.orientation = 3;
-        assertEquals(-1, cfg1.compareTo(cfg2));
-        cfg1.orientation = 3;
-        cfg2.orientation = 2;
-        assertEquals(1, cfg1.compareTo(cfg2));
-
-        cfg1.navigation = 2;
-        cfg2.navigation = 3;
-        assertEquals(-1, cfg1.compareTo(cfg2));
-        cfg1.navigation = 3;
-        cfg2.navigation = 2;
-        assertEquals(1, cfg1.compareTo(cfg2));
-
-        cfg1.keyboardHidden = 2;
-        cfg2.keyboardHidden = 3;
-        assertEquals(-1, cfg1.compareTo(cfg2));
-        cfg1.keyboardHidden = 3;
-        cfg2.keyboardHidden = 2;
-        assertEquals(1, cfg1.compareTo(cfg2));
-
-        cfg1.keyboard = 2;
-        cfg2.keyboard = 3;
-        assertEquals(-1, cfg1.compareTo(cfg2));
-        cfg1.keyboard = 3;
-        cfg2.keyboard = 2;
-        assertEquals(1, cfg1.compareTo(cfg2));
-
-        cfg1.touchscreen = 2;
-        cfg2.touchscreen = 3;
-        assertEquals(-1, cfg1.compareTo(cfg2));
-        cfg1.touchscreen = 3;
-        cfg2.touchscreen = 2;
-        assertEquals(1, cfg1.compareTo(cfg2));
-
-        cfg1.locale = new Locale("", "", "2");
-        cfg2.locale = new Locale("", "", "3");
-        assertEquals(-1, cfg1.compareTo(cfg2));
-        cfg1.locale = new Locale("", "", "3");
-        cfg2.locale = new Locale("", "", "2");
-        assertEquals(1, cfg1.compareTo(cfg2));
-
-        cfg1.locale = new Locale("", "2", "");
-        cfg2.locale = new Locale("", "3", "");
-        assertEquals(-1, cfg1.compareTo(cfg2));
-        cfg1.locale = new Locale("", "3", "");
-        cfg2.locale = new Locale("", "2", "");
-        assertEquals(1, cfg1.compareTo(cfg2));
-
-        cfg1.locale = new Locale("2", "", "");
-        cfg2.locale = new Locale("3", "", "");
-        assertEquals(-1, cfg1.compareTo(cfg2));
-        cfg1.locale = new Locale("3", "", "");
-        cfg2.locale = new Locale("2", "", "");
-        assertEquals(1, cfg1.compareTo(cfg2));
-
-        cfg1.mnc = 2;
-        cfg2.mnc = 3;
-        assertEquals(-1, cfg1.compareTo(cfg2));
-        cfg1.mnc = 3;
-        cfg2.mnc = 2;
-        assertEquals(1, cfg1.compareTo(cfg2));
-
-        cfg1.mcc = 2;
-        cfg2.mcc = 3;
-        assertEquals(-1, cfg1.compareTo(cfg2));
-        cfg1.mcc = 3;
-        cfg2.mcc = 2;
-        assertEquals(1, cfg1.compareTo(cfg2));
-
-        cfg1.fontScale = 2;
-        cfg2.fontScale = 3;
-        assertEquals(-1, cfg1.compareTo(cfg2));
-        cfg1.fontScale = 3;
-        cfg2.fontScale = 2;
-        assertEquals(1, cfg1.compareTo(cfg2));
-    }
-
-    public void testDescribeContents() {
-        assertEquals(0, mConfigDefault.describeContents());
-    }
-
-    void doConfigCompare(int expectedFlags, Configuration c1, Configuration c2) {
-        assertEquals(expectedFlags, c1.diff(c2));
-        Configuration tmpc1 = new Configuration(c1);
-        assertEquals(expectedFlags, tmpc1.updateFrom(c2));
-        assertEquals(0, tmpc1.diff(c2));
-    }
-
-    public void testDiff() {
-        Configuration config = new Configuration();
-        config.mcc = 1;
-        doConfigCompare(ActivityInfo.CONFIG_MCC, mConfigDefault, config);
-        config.mnc = 1;
-        doConfigCompare(ActivityInfo.CONFIG_MCC
-                | ActivityInfo.CONFIG_MNC, mConfigDefault, config);
-        config.locale = Locale.getDefault();
-        config.setLayoutDirection(config.locale);
-        doConfigCompare(ActivityInfo.CONFIG_MCC
-                | ActivityInfo.CONFIG_MNC
-                | ActivityInfo.CONFIG_LOCALE
-                | ActivityInfo.CONFIG_LAYOUT_DIRECTION, mConfigDefault, config);
-        config.screenLayout = 1;
-        doConfigCompare(ActivityInfo.CONFIG_MCC
-                | ActivityInfo.CONFIG_MNC
-                | ActivityInfo.CONFIG_LOCALE
-                | ActivityInfo.CONFIG_LAYOUT_DIRECTION
-                | ActivityInfo.CONFIG_SCREEN_LAYOUT, mConfigDefault, config);
-        config.touchscreen = 1;
-        doConfigCompare(ActivityInfo.CONFIG_MCC
-                | ActivityInfo.CONFIG_MNC
-                | ActivityInfo.CONFIG_LOCALE
-                | ActivityInfo.CONFIG_LAYOUT_DIRECTION
-                | ActivityInfo.CONFIG_SCREEN_LAYOUT
-                | ActivityInfo.CONFIG_TOUCHSCREEN, mConfigDefault, config);
-        config.keyboard = 1;
-        doConfigCompare(ActivityInfo.CONFIG_MCC
-                | ActivityInfo.CONFIG_MNC
-                | ActivityInfo.CONFIG_LOCALE
-                | ActivityInfo.CONFIG_LAYOUT_DIRECTION
-                | ActivityInfo.CONFIG_SCREEN_LAYOUT
-                | ActivityInfo.CONFIG_TOUCHSCREEN
-                | ActivityInfo.CONFIG_KEYBOARD, mConfigDefault, config);
-        config.keyboardHidden = 1;
-        doConfigCompare(ActivityInfo.CONFIG_MCC
-                | ActivityInfo.CONFIG_MNC
-                | ActivityInfo.CONFIG_LOCALE
-                | ActivityInfo.CONFIG_LAYOUT_DIRECTION
-                | ActivityInfo.CONFIG_SCREEN_LAYOUT
-                | ActivityInfo.CONFIG_TOUCHSCREEN
-                | ActivityInfo.CONFIG_KEYBOARD
-                | ActivityInfo.CONFIG_KEYBOARD_HIDDEN, mConfigDefault, config);
-        config.keyboardHidden = 0;
-        config.hardKeyboardHidden = 1;
-        doConfigCompare(ActivityInfo.CONFIG_MCC
-                | ActivityInfo.CONFIG_MNC
-                | ActivityInfo.CONFIG_LOCALE
-                | ActivityInfo.CONFIG_LAYOUT_DIRECTION
-                | ActivityInfo.CONFIG_SCREEN_LAYOUT
-                | ActivityInfo.CONFIG_TOUCHSCREEN
-                | ActivityInfo.CONFIG_KEYBOARD
-                | ActivityInfo.CONFIG_KEYBOARD_HIDDEN, mConfigDefault, config);
-        config.hardKeyboardHidden = 0;
-        config.navigationHidden = 1;
-        doConfigCompare(ActivityInfo.CONFIG_MCC
-                | ActivityInfo.CONFIG_MNC
-                | ActivityInfo.CONFIG_LOCALE
-                | ActivityInfo.CONFIG_LAYOUT_DIRECTION
-                | ActivityInfo.CONFIG_SCREEN_LAYOUT
-                | ActivityInfo.CONFIG_TOUCHSCREEN
-                | ActivityInfo.CONFIG_KEYBOARD
-                | ActivityInfo.CONFIG_KEYBOARD_HIDDEN, mConfigDefault, config);
-        config.navigation = 1;
-        doConfigCompare(ActivityInfo.CONFIG_MCC
-                | ActivityInfo.CONFIG_MNC
-                | ActivityInfo.CONFIG_LOCALE
-                | ActivityInfo.CONFIG_LAYOUT_DIRECTION
-                | ActivityInfo.CONFIG_SCREEN_LAYOUT
-                | ActivityInfo.CONFIG_TOUCHSCREEN
-                | ActivityInfo.CONFIG_KEYBOARD
-                | ActivityInfo.CONFIG_KEYBOARD_HIDDEN
-                | ActivityInfo.CONFIG_NAVIGATION, mConfigDefault, config);
-        config.orientation = 1;
-        doConfigCompare(ActivityInfo.CONFIG_MCC
-                | ActivityInfo.CONFIG_MNC
-                | ActivityInfo.CONFIG_LOCALE
-                | ActivityInfo.CONFIG_LAYOUT_DIRECTION
-                | ActivityInfo.CONFIG_SCREEN_LAYOUT
-                | ActivityInfo.CONFIG_TOUCHSCREEN
-                | ActivityInfo.CONFIG_KEYBOARD
-                | ActivityInfo.CONFIG_KEYBOARD_HIDDEN
-                | ActivityInfo.CONFIG_NAVIGATION
-                | ActivityInfo.CONFIG_ORIENTATION, mConfigDefault, config);
-        config.uiMode = 1;
-        doConfigCompare(ActivityInfo.CONFIG_MCC
-                | ActivityInfo.CONFIG_MNC
-                | ActivityInfo.CONFIG_LOCALE
-                | ActivityInfo.CONFIG_LAYOUT_DIRECTION
-                | ActivityInfo.CONFIG_SCREEN_LAYOUT
-                | ActivityInfo.CONFIG_TOUCHSCREEN
-                | ActivityInfo.CONFIG_KEYBOARD
-                | ActivityInfo.CONFIG_KEYBOARD_HIDDEN
-                | ActivityInfo.CONFIG_NAVIGATION
-                | ActivityInfo.CONFIG_ORIENTATION
-                | ActivityInfo.CONFIG_UI_MODE, mConfigDefault, config);
-        config.fontScale = 2;
-        doConfigCompare(ActivityInfo.CONFIG_MCC
-                | ActivityInfo.CONFIG_MNC
-                | ActivityInfo.CONFIG_LOCALE
-                | ActivityInfo.CONFIG_LAYOUT_DIRECTION
-                | ActivityInfo.CONFIG_SCREEN_LAYOUT
-                | ActivityInfo.CONFIG_TOUCHSCREEN
-                | ActivityInfo.CONFIG_KEYBOARD
-                | ActivityInfo.CONFIG_KEYBOARD_HIDDEN
-                | ActivityInfo.CONFIG_NAVIGATION
-                | ActivityInfo.CONFIG_ORIENTATION
-                | ActivityInfo.CONFIG_UI_MODE
-                | ActivityInfo.CONFIG_FONT_SCALE, mConfigDefault, config);
-    }
-
-    public void testEquals() {
-        assertFalse(mConfigDefault.equals(mConfig));
-        assertFalse(mConfigDefault.equals(new Object()));
-    }
-
-    public void testHashCode() {
-        assertFalse(mConfigDefault.hashCode() == mConfig.hashCode());
-    }
-
-    public void testNeedNewResources() {
-        assertTrue(Configuration.needNewResources(ActivityInfo.CONFIG_MCC,
-                ActivityInfo.CONFIG_MCC));
-        assertFalse(Configuration.needNewResources(ActivityInfo.CONFIG_MNC,
-                ActivityInfo.CONFIG_MCC));
-        assertTrue(Configuration.needNewResources(
-                ActivityInfo.CONFIG_MNC | ActivityInfo.CONFIG_FONT_SCALE,
-                ActivityInfo.CONFIG_MCC));
-    }
-
-    public void testSetToDefaults() {
-        final Configuration temp = new Configuration(mConfig);
-        assertFalse(temp.equals(mConfigDefault));
-        temp.setToDefaults();
-        assertTrue(temp.equals(mConfigDefault));
-    }
-
-    public void testToString() {
-        assertNotNull(mConfigDefault.toString());
-    }
-
-    public void testWriteToParcel() {
-        assertWriteToParcel(createConfig(null), Parcel.obtain());
-        assertWriteToParcel(createConfig(Locale.JAPAN), Parcel.obtain());
-    }
-
-    public void testSetLocale() {
-        Configuration config = new Configuration();
-
-        config.setLocale(Locale.getDefault());
-        assertEquals(Locale.getDefault(), config.locale);
-        assertEquals(View.LAYOUT_DIRECTION_LTR, config.getLayoutDirection());
-
-        config.setLocale(Locale.ENGLISH);
-        assertEquals(Locale.ENGLISH, config.locale);
-        assertEquals(View.LAYOUT_DIRECTION_LTR, config.getLayoutDirection());
-
-        config.setLocale(Locale.US);
-        assertEquals(Locale.US, config.locale);
-        assertEquals(View.LAYOUT_DIRECTION_LTR, config.getLayoutDirection());
-
-        final Locale arEGLocale = new Locale("ar", "EG");
-        config.setLocale(arEGLocale);
-        assertEquals(arEGLocale, config.locale);
-        assertEquals(View.LAYOUT_DIRECTION_RTL, config.getLayoutDirection());
-
-        final Locale faFALocale = new Locale("fa", "FA");
-        config.setLocale(faFALocale);
-        assertEquals(faFALocale, config.locale);
-        assertEquals(View.LAYOUT_DIRECTION_RTL, config.getLayoutDirection());
-
-        final Locale iwILLocale = new Locale("iw", "IL");
-        config.setLocale(iwILLocale);
-        assertEquals(iwILLocale, config.locale);
-        assertEquals(View.LAYOUT_DIRECTION_RTL, config.getLayoutDirection());
-    }
-
-    public void testSetGetLayoutDirection() {
-        Configuration config = new Configuration();
-
-        config.setLayoutDirection(Locale.getDefault());
-        assertEquals(View.LAYOUT_DIRECTION_LTR, config.getLayoutDirection());
-
-        config.setLayoutDirection(Locale.ENGLISH);
-        assertEquals(View.LAYOUT_DIRECTION_LTR, config.getLayoutDirection());
-
-        config.setLayoutDirection(Locale.US);
-        assertEquals(View.LAYOUT_DIRECTION_LTR, config.getLayoutDirection());
-
-        final Locale arEGLocale = new Locale("ar", "EG");
-        config.setLayoutDirection(arEGLocale);
-        assertEquals(View.LAYOUT_DIRECTION_RTL, config.getLayoutDirection());
-
-        final Locale faFALocale = new Locale("fa", "FA");
-        config.setLayoutDirection(faFALocale);
-        assertEquals(View.LAYOUT_DIRECTION_RTL, config.getLayoutDirection());
-
-        final Locale iwILLocale = new Locale("iw", "IL");
-        config.setLayoutDirection(iwILLocale);
-        assertEquals(View.LAYOUT_DIRECTION_RTL, config.getLayoutDirection());
-    }
-
-    private Configuration createConfig(Locale locale) {
-        Configuration config = new Configuration();
-        config.fontScale = 13.37f;
-        config.mcc = 0;
-        config.mnc = 1;
-        config.locale = locale;
-        config.touchscreen = Configuration.TOUCHSCREEN_STYLUS;
-        config.keyboard = Configuration.KEYBOARD_UNDEFINED;
-        config.keyboardHidden = Configuration.KEYBOARDHIDDEN_YES;
-        config.hardKeyboardHidden = Configuration.KEYBOARDHIDDEN_UNDEFINED;
-        config.navigation = Configuration.NAVIGATION_DPAD;
-        config.navigationHidden = Configuration.NAVIGATIONHIDDEN_UNDEFINED;
-        config.orientation = Configuration.ORIENTATION_PORTRAIT;
-        config.screenLayout = Configuration.SCREENLAYOUT_LONG_UNDEFINED;
-        return config;
-    }
-
-    private void assertWriteToParcel(Configuration config, Parcel parcel) {
-        config.writeToParcel(parcel, 0);
-        parcel.setDataPosition(0);
-        Configuration readConf = new Configuration();
-        readConf.readFromParcel(parcel);
-        assertEquals(config, readConf);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/FractionTest.java b/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/FractionTest.java
deleted file mode 100755
index b3220b9d00879c89eb14600031a2c64eea32c305..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/FractionTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.content.res.cts;
-
-import android.content.res.Resources;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.util.TypedValue;
-import com.mediatek.cts.resource.stub.R;
-
-public class FractionTest extends AndroidTestCase {
-
-    private Resources mResources;
-    private TypedValue mValue;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResources = mContext.getResources();
-        mValue = new TypedValue();
-    }
-
-    @SmallTest
-    public void testFractions() throws Exception {
-        tryFraction(R.dimen.frac100perc, 1, 1, 1);
-        tryFraction(R.dimen.frac1perc, 1, 1, .01f);
-        tryFraction(R.dimen.fracp1perc, 1, 1, .001f);
-        tryFraction(R.dimen.fracp01perc, 1, 1, .0001f);
-        tryFraction(R.dimen.frac0perc, 1, 1, 0);
-        tryFraction(R.dimen.frac1p1perc, 1, 1, .011f);
-        tryFraction(R.dimen.frac100p1perc, 1, 1, 1.001f);
-        tryFraction(R.dimen.frac25510perc, 1, 1, 255.1f);
-        tryFraction(R.dimen.frac25610perc, 1, 1, 256.1f);
-        tryFraction(R.dimen.frac6553510perc, 1, 1, 65535.1f);
-        tryFraction(R.dimen.frac6553610perc, 1, 1, 65536.1f);
-
-        tryFraction(R.dimen.frac100perc, 100, 1, 100);
-        tryFraction(R.dimen.frac1perc, 100, 1, .01f * 100);
-        tryFraction(R.dimen.fracp1perc, 100, 1, .001f * 100);
-        tryFraction(R.dimen.fracp01perc, 100, 1, .0001f * 100);
-        tryFraction(R.dimen.frac0perc, 100, 1, 0);
-        tryFraction(R.dimen.frac1p1perc, 100, 1, .011f * 100);
-        tryFraction(R.dimen.frac100p1perc, 100, 1, 1.001f * 100);
-        tryFraction(R.dimen.frac25510perc, 100, 1, 255.1f * 100);
-        tryFraction(R.dimen.frac25610perc, 100, 1, 256.1f * 100);
-        tryFraction(R.dimen.frac6553510perc, 100, 1, 65535.1f * 100);
-        tryFraction(R.dimen.frac6553610perc, 100, 1, 65536.1f * 100);
-
-        tryFraction(R.dimen.frac100pperc, 100, 2, 2);
-        tryFraction(R.dimen.frac1pperc, 100, 2, .01f * 2);
-        tryFraction(R.dimen.fracp1pperc, 100, 2, .001f * 2);
-        tryFraction(R.dimen.fracp01pperc, 100, 2, .0001f * 2);
-        tryFraction(R.dimen.frac0pperc, 100, 2, 0);
-        tryFraction(R.dimen.frac1p1pperc, 100, 2, .011f * 2);
-        tryFraction(R.dimen.frac100p1pperc, 100, 2, 1.001f * 2);
-        tryFraction(R.dimen.frac25510pperc, 100, 2, 255.1f * 2);
-        tryFraction(R.dimen.frac25610pperc, 100, 2, 256.1f * 2);
-        tryFraction(R.dimen.frac6553510pperc, 100, 2, 65535.1f * 2);
-        tryFraction(R.dimen.frac6553610pperc, 100, 2, 65536.1f * 2);
-    }
-
-    private void tryFraction(final int resid, final float base, final float pbase,
-            final float expected) {
-        mResources.getValue(resid, mValue, true);
-        float res = mValue.getFraction(base, pbase);
-        float diff = Math.abs(expected - res);
-        float prec = expected * 1e-4f;
-        if (prec < 1e-5f) {
-            prec = 1e-5f;
-        }
-
-        assertFalse("Expecting value " + expected + " got " + res + ": in resource 0x"
-                + Integer.toHexString(resid) + " " + mValue, diff > prec);
-    }
-}
-
diff --git a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/PluralResourcesTest.java b/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/PluralResourcesTest.java
deleted file mode 100755
index a082fda5bedd1cecbf2b86430a6bb309dca44e0f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/PluralResourcesTest.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.content.res.cts;
-
-import java.util.Locale;
-
-import junit.framework.Assert;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.util.Log;
-
-import com.mediatek.cts.resource.stub.R;
-
-public class PluralResourcesTest extends AndroidTestCase {
-    public static boolean DEBUG = false;
-    private static final String TAG = "PluralResourcesTest";
-
-    private Resources mResources;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResources = mContext.getResources();
-    }
-
-    private Resources resourcesForLanguage(final String lang) {
-        final Configuration config = new Configuration();
-        config.updateFrom(mResources.getConfiguration());
-        config.locale = new Locale(lang);
-        return new Resources(mResources.getAssets(), mResources.getDisplayMetrics(), config);
-    }
-
-    @SmallTest
-    public void testPlurals() {
-        CharSequence cs;
-        final Resources res = resourcesForLanguage("en");
-
-        cs = res.getQuantityText(R.plurals.plurals_test, 0);
-        if (DEBUG) {
-            Log.d(TAG, "english 0 cs=" + cs);
-        }
-        Assert.assertEquals(cs.toString(), "Some dogs");
-
-        cs = res.getQuantityText(R.plurals.plurals_test, 1);
-        if (DEBUG) {
-            Log.d(TAG, "english 1 cs=" + cs);
-        }
-        Assert.assertEquals(cs.toString(), "A dog");
-
-        cs = res.getQuantityText(R.plurals.plurals_test, 2);
-        Assert.assertEquals(cs.toString(), "Some dogs");
-
-        cs = res.getQuantityText(R.plurals.plurals_test, 5);
-        Assert.assertEquals(cs.toString(), "Some dogs");
-
-        cs = res.getQuantityText(R.plurals.plurals_test, 500);
-        Assert.assertEquals(cs.toString(), "Some dogs");
-    }
-
-    @SmallTest
-    public void testCzech() {
-        CharSequence cs;
-        final Resources res = resourcesForLanguage("cs");
-
-        cs = res.getQuantityText(R.plurals.plurals_test, 0);
-        if (DEBUG) {
-            Log.d(TAG, "czech 0 cs=" + cs);
-        }
-        Assert.assertEquals(cs.toString(), "Some Czech dogs");
-
-        cs = res.getQuantityText(R.plurals.plurals_test, 1);
-        if (DEBUG) {
-            Log.d(TAG, "czech 1 cs=" + cs);
-        }
-        Assert.assertEquals(cs.toString(), "A Czech dog");
-
-        cs = res.getQuantityText(R.plurals.plurals_test, 2);
-        if (DEBUG) {
-            Log.d(TAG, "czech 2 cs=" + cs);
-        }
-        Assert.assertEquals(cs.toString(), "Few Czech dogs");
-
-        cs = res.getQuantityText(R.plurals.plurals_test, 5);
-        Assert.assertEquals(cs.toString(), "Some Czech dogs");
-
-        cs = res.getQuantityText(R.plurals.plurals_test, 500);
-        Assert.assertEquals(cs.toString(), "Some Czech dogs");
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/PrimitiveTest.java b/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/PrimitiveTest.java
deleted file mode 100755
index d0e69773e8da056dc3c9aaa534267cd0416087af..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/PrimitiveTest.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.content.res.cts;
-
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.util.TypedValue;
-import com.mediatek.cts.resource.stub.R;
-
-public class PrimitiveTest extends AndroidTestCase {
-    private Resources mResources;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResources = mContext.getResources();
-    }
-
-    private void tryEnum(final int resid, final int expected) {
-        final TypedArray sa = mContext.obtainStyledAttributes(resid, R.styleable.EnumStyle);
-        final int value = sa.getInt(R.styleable.EnumStyle_testEnum, -1);
-        sa.recycle();
-
-        assertEquals("Expecting value " + expected + " got " + value
-                + ": in resource 0x" + Integer.toHexString(resid), expected, value);
-    }
-
-    @SmallTest
-    public void testEnum() {
-        tryEnum(R.style.TestEnum1, 1);
-        tryEnum(R.style.TestEnum2, 2);
-        tryEnum(R.style.TestEnum10, 10);
-        tryEnum(R.style.TestEnum1_EmptyInherit, 1);
-    }
-
-    private void tryFlag(final int resid, final int expected) {
-        final TypedArray sa = mContext.obtainStyledAttributes(resid, R.styleable.FlagStyle);
-        final int value = sa.getInt(R.styleable.FlagStyle_testFlags, -1);
-        sa.recycle();
-
-        assertEquals("Expecting value " + expected + " got " + value
-                + ": in resource 0x" + Integer.toHexString(resid), expected, value);
-    }
-
-    @SmallTest
-    public void testFlags() throws Exception {
-        tryFlag(R.style.TestFlag1, 0x1);
-        tryFlag(R.style.TestFlag2, 0x2);
-        tryFlag(R.style.TestFlag31, 0x40000000);
-        tryFlag(R.style.TestFlag1And2, 0x3);
-        tryFlag(R.style.TestFlag1And2And31, 0x40000003);
-    }
-
-    private void tryBoolean(final int resid, final boolean expected) {
-        final TypedValue v = new TypedValue();
-        mContext.getResources().getValue(resid, v, true);
-        assertEquals(TypedValue.TYPE_INT_BOOLEAN, v.type);
-        assertEquals("Expecting boolean value " + expected + " got " + v
-                + " from TypedValue: in resource 0x" + Integer.toHexString(resid),
-                expected, v.data != 0);
-        assertEquals("Expecting boolean value " + expected + " got " + v
-                + " from getBoolean(): in resource 0x" + Integer.toHexString(resid),
-                expected, mContext.getResources().getBoolean(resid));
-    }
-
-    @SmallTest
-    public void testBoolean() {
-        tryBoolean(R.bool.trueRes, true);
-        tryBoolean(R.bool.falseRes, false);
-    }
-
-    private void tryString(final int resid, final String expected) {
-        final TypedValue v = new TypedValue();
-        mContext.getResources().getValue(resid, v, true);
-        assertEquals(TypedValue.TYPE_STRING, v.type);
-        assertEquals("Expecting string value " + expected + " got " + v
-                + ": in resource 0x" + Integer.toHexString(resid),
-                expected, v.string);
-    }
-
-    @SmallTest
-    public void testStringCoerce() {
-        tryString(R.string.coerceIntegerToString, "100");
-        tryString(R.string.coerceBooleanToString, "true");
-        tryString(R.string.coerceColorToString, "#fff");
-        tryString(R.string.coerceFloatToString, "100.0");
-        tryString(R.string.coerceDimensionToString, "100px");
-        tryString(R.string.coerceFractionToString, "100%");
-    }
-
-    private static void checkString(final int resid, final String actual, final String expected) {
-        assertEquals("Expecting string value \"" + expected + "\" got \""
-                + actual + "\" in resources 0x" + Integer.toHexString(resid),
-                expected, actual);
-    }
-
-    @SmallTest
-    public void testFormattedString() {
-        // Make sure the regular one doesn't format anything
-        checkString(R.string.formattedStringNone,
-                mResources.getString(R.string.formattedStringNone),
-                "Format[]");
-        checkString(R.string.formattedStringOne,
-                mResources.getString(R.string.formattedStringOne),
-                "Format[%d]");
-        checkString(R.string.formattedStringTwo,
-                mResources.getString(R.string.formattedStringTwo),
-                "Format[%3$d,%2$s]");
-        // Make sure the formatted one works
-        checkString(R.string.formattedStringNone,
-                mResources.getString(R.string.formattedStringNone),
-                "Format[]");
-        checkString(R.string.formattedStringOne,
-                mResources.getString(R.string.formattedStringOne, 42),
-                "Format[42]");
-        checkString(R.string.formattedStringTwo,
-                mResources.getString(R.string.formattedStringTwo, "unused", "hi", 43),
-                "Format[43,hi]");
-    }
-}
-
diff --git a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/RawResourceTest.java b/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/RawResourceTest.java
deleted file mode 100755
index a4d4bdbc6484e01659412ad30ee7c2f6bfa1367b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/RawResourceTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.content.res.cts;
-
-import android.content.res.Resources;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import com.mediatek.cts.resource.stub.R;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-public class RawResourceTest extends AndroidTestCase {
-    private Resources mResources;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResources = mContext.getResources();
-    }
-
-    @SmallTest
-    public void testReadToEnd() throws IOException {
-        final InputStream is = mResources.openRawResource(R.raw.text);
-        verifyTextAsset(is);
-    }
-
-    static void verifyTextAsset(final InputStream is) throws IOException {
-        final String expectedString = "OneTwoThreeFourFiveSixSevenEightNineTen";
-        final byte[] buffer = new byte[10];
-
-        int readCount;
-        int curIndex = 0;
-        while ((readCount = is.read(buffer, 0, buffer.length)) > 0) {
-            for (int i = 0; i < readCount; i++) {
-                assertEquals("At index " + curIndex
-                            + " expected " + expectedString.charAt(curIndex)
-                            + " but found " + ((char) buffer[i]),
-                        buffer[i], expectedString.charAt(curIndex));
-                curIndex++;
-            }
-        }
-
-        readCount = is.read(buffer, 0, buffer.length);
-        assertEquals("Reading end of buffer: expected readCount=-1 but got " + readCount,
-                -1, readCount);
-
-        readCount = is.read(buffer, buffer.length, 0);
-        assertEquals("Reading end of buffer length 0: expected readCount=0 but got " + readCount,
-                0, readCount);
-
-        is.close();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/ResourceNameTest.java b/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/ResourceNameTest.java
deleted file mode 100755
index b5f44acb3025caaf2627d4c949186a9e1d9da0fc..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/ResourceNameTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.content.res.cts;
-
-import android.content.res.Resources;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import com.mediatek.cts.resource.stub.R;
-
-public class ResourceNameTest extends AndroidTestCase {
-
-    @SmallTest
-    public void testGetResourceName() {
-        final Resources res = mContext.getResources();
-
-        final String fullName = res.getResourceName(R.configVarying.simple);
-        assertEquals("com.mediatek.cts.resource.stub:configVarying/simple", fullName);
-
-        final String packageName = res.getResourcePackageName(R.configVarying.simple);
-        assertEquals("com.mediatek.cts.resource.stub", packageName);
-
-        final String typeName = res.getResourceTypeName(R.configVarying.simple);
-        assertEquals("configVarying", typeName);
-
-        final String entryName = res.getResourceEntryName(R.configVarying.simple);
-        assertEquals("simple", entryName);
-    }
-
-    @SmallTest
-    public void testGetResourceIdentifier() {
-        final Resources res = mContext.getResources();
-        int resid = res.getIdentifier(
-                "com.mediatek.cts.resource.stub:configVarying/simple",
-                null, null);
-        assertEquals(R.configVarying.simple, resid);
-
-        resid = res.getIdentifier("configVarying/simple", null,
-                "com.mediatek.cts.resource.stub");
-        assertEquals(R.configVarying.simple, resid);
-
-        resid = res.getIdentifier("simple", "configVarying",
-                "com.mediatek.cts.resource.stub");
-        assertEquals(R.configVarying.simple, resid);
-    }
-}
-
diff --git a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/ResourcesTest.java b/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/ResourcesTest.java
deleted file mode 100755
index 2cfb33c408a8baceeab3477c43e67b4fe209c09d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/ResourcesTest.java
+++ /dev/null
@@ -1,651 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.content.res.cts;
-
-import com.mediatek.cts.resource.stub.R;
-import com.android.internal.util.XmlUtils;
-
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import android.content.Context;
-import android.content.res.AssetManager;
-import android.content.res.ColorStateList;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.content.res.XmlResourceParser;
-import android.content.res.Resources.NotFoundException;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.test.AndroidTestCase;
-import android.util.AttributeSet;
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
-import android.util.Xml;
-import android.view.Display;
-import android.view.WindowManager;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Locale;
-
-public class ResourcesTest extends AndroidTestCase {
-    private static final String CONFIG_VARYING = "configVarying";
-    private static final String SIMPLE = "simple";
-    private static final String CONFIG_VARYING_SIMPLE = "configVarying/simple";
-    private static final String PACKAGE_NAME = "com.mediatek.cts.resource.stub";
-    private static final String COM_ANDROID_CTS_STUB_IDENTIFIER =
-                "com.mediatek.cts.resource.stub:configVarying/simple";
-    private Resources mResources;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mResources = getContext().getResources();
-    }
-
-    public void testResources() {
-        final AssetManager am = new AssetManager();
-        final Configuration cfg = new Configuration();
-        cfg.keyboard = Configuration.KEYBOARDHIDDEN_YES;
-        final DisplayMetrics dm = new DisplayMetrics();
-        dm.setToDefaults();
-
-        final Resources r = new Resources(am, dm, cfg);
-        final Configuration c = r.getConfiguration();
-        assertEquals(Configuration.KEYBOARDHIDDEN_YES, c.keyboard);
-    }
-
-    public void testGetString() {
-        try {
-            mResources.getString(-1, "%s");
-            fail("Failed at testGetString2");
-        } catch (NotFoundException e) {
-          //expected
-        }
-
-        final String strGo = mResources.getString(R.string.go, "%1$s%%", 12);
-        assertEquals("Go", strGo);
-    }
-
-    public void testObtainAttributes() throws XmlPullParserException, IOException {
-        final XmlPullParser parser = mResources.getXml(R.xml.test_color);
-        XmlUtils.beginDocument(parser, "resources");
-        final AttributeSet set = Xml.asAttributeSet(parser);
-        final TypedArray testTypedArray = mResources.obtainAttributes(set, R.styleable.Style1);
-        assertNotNull(testTypedArray);
-        assertEquals(2, testTypedArray.length());
-        assertEquals(0, testTypedArray.getColor(0, 0));
-        assertEquals(128, testTypedArray.getColor(1, 128));
-        assertEquals(mResources, testTypedArray.getResources());
-        testTypedArray.recycle();
-    }
-
-    public void testObtainTypedArray() {
-        try {
-            mResources.obtainTypedArray(-1);
-            fail("Failed at testObtainTypedArray");
-        } catch (NotFoundException e) {
-            //expected
-        }
-
-        final TypedArray ta = mResources.obtainTypedArray(R.array.string);
-        assertEquals(3, ta.length());
-        assertEquals("Test String 1", ta.getString(0));
-        assertEquals("Test String 2", ta.getString(1));
-        assertEquals("Test String 3", ta.getString(2));
-        assertEquals(mResources, ta.getResources());
-    }
-
-    private Resources getResources(final Configuration config, final int mcc, final int mnc,
-            final int touchscreen, final int keyboard, final int keysHidden, final int navigation,
-            final int width, final int height) {
-        final AssetManager assmgr = new AssetManager();
-        assmgr.addAssetPath(mContext.getPackageResourcePath());
-        final DisplayMetrics metrics = new DisplayMetrics();
-        final WindowManager wm = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);
-        final Display d = wm.getDefaultDisplay();
-        d.getMetrics(metrics);
-        config.mcc = mcc;
-        config.mnc = mnc;
-        config.touchscreen = touchscreen;
-        config.keyboard = keyboard;
-        config.keyboardHidden = keysHidden;
-        config.navigation = navigation;
-        metrics.widthPixels = width;
-        metrics.heightPixels = height;
-        return new Resources(assmgr, metrics, config);
-    }
-
-    private static void checkGetText1(final Resources res, final int resId,
-            final String expectedValue) {
-        final String actual = res.getText(resId).toString();
-        assertNotNull("Returned wrong configuration-based simple value: expected <nothing>, "
-                + "got '" + actual + "' from resource 0x" + Integer.toHexString(resId),
-                expectedValue);
-        assertEquals("Returned wrong configuration-based simple value: expected " + expectedValue
-                + ", got '" + actual + "' from resource 0x" + Integer.toHexString(resId),
-                expectedValue, actual);
-    }
-
-    private static void checkGetText2(final Resources res, final int resId,
-            final String expectedValue) {
-        final String actual = res.getText(resId, null).toString();
-        assertNotNull("Returned wrong configuration-based simple value: expected <nothing>, "
-                + "got '" + actual + "' from resource 0x" + Integer.toHexString(resId),
-                expectedValue);
-        assertEquals("Returned wrong configuration-based simple value: expected " + expectedValue
-                + ", got '" + actual + "' from resource 0x" + Integer.toHexString(resId),
-                expectedValue, actual);
-    }
-
-    public void testGetMovie() {
-        try {
-            mResources.getMovie(-1);
-            fail("Failed at testGetMovie");
-        } catch (NotFoundException e) {
-            //expected
-        }
-    }
-
-    public void testGetDimension() {
-        try {
-            mResources.getDimension(-1);
-            fail("Failed at testGetDimension");
-        } catch (NotFoundException e) {
-            //expected
-        }
-
-        // app_icon_size is 48px, as defined in cts/tests/res/values/resources_test.xml
-        final float dim = mResources.getDimension(R.dimen.app_icon_size);
-        assertEquals(48.0f, dim);
-    }
-
-    public void testGetDimensionPixelOffset() {
-        try {
-            mResources.getDimensionPixelOffset(-1);
-            fail("Failed at testGetDimensionPixelOffset");
-        } catch (NotFoundException e) {
-            //expected
-        }
-
-        // app_icon_size is 48px, as defined in cts/tests/res/values/resources_test.xml
-        final int dim = mResources.getDimensionPixelOffset(R.dimen.app_icon_size);
-        assertEquals(48, dim);
-    }
-
-    public void testGetColorStateList() {
-        try {
-            mResources.getColorStateList(-1);
-            fail("Failed at testGetColorStateList");
-        } catch (NotFoundException e) {
-            //expected
-        }
-
-        final ColorStateList colorStateList = mResources.getColorStateList(R.color.color1);
-        final int[] focusedState = {android.R.attr.state_focused};
-        final int focusColor = colorStateList.getColorForState(focusedState, R.color.failColor);
-        assertEquals(mResources.getColor(R.color.testcolor1), focusColor);
-    }
-
-    public void testGetColor() {
-        try {
-            mResources.getColor(-1);
-            fail("Failed at testGetColor");
-        } catch (NotFoundException e) {
-            //expected
-        }
-
-        final int color = mResources.getColor(R.color.testcolor1);
-        assertEquals(0xff00ff00, color);
-    }
-
-    public void testUpdateConfiguration() {
-        final Configuration cfg = mResources.getConfiguration();
-        assertTrue(cfg.fontScale != 5);
-
-        cfg.fontScale = 5;
-        mResources.updateConfiguration(cfg, null);
-        Configuration cfgNew = mResources.getConfiguration();
-        assertEquals(5.0f, cfgNew.fontScale, 0.001f);
-    }
-
-    public void testGetDimensionPixelSize() {
-        try {
-            mResources.getDimensionPixelSize(-1);
-            fail("Failed at testGetDimensionPixelSize");
-        } catch (NotFoundException e) {
-            //expected
-        }
-
-        // app_icon_size is 48px, as defined in cts/tests/res/values/resources_test.xml
-        final int size = mResources.getDimensionPixelSize(R.dimen.app_icon_size);
-        assertEquals(48, size);
-    }
-
-    public void testGetDrawable() {
-        try {
-            mResources.getDrawable(-1);
-            fail("Failed at testGetDrawable");
-        } catch (NotFoundException e) {
-            //expected
-        }
-
-        // testimage is defined in cts/tests/res/drawable/testimage.jpg and measures 212px x 142px
-        final Drawable draw = mResources.getDrawable(R.drawable.testimage);
-        int targetDensity = mResources.getDisplayMetrics().densityDpi;
-        int defaultDensity = DisplayMetrics.DENSITY_DEFAULT;
-        assertNotNull(draw);
-        assertEquals(212 * targetDensity / defaultDensity, draw.getIntrinsicWidth(), 1);
-        assertEquals(142 * targetDensity / defaultDensity, draw.getIntrinsicHeight(), 1);
-    }
-
-    public void testGetAnimation() throws Exception {
-        try {
-            mResources.getAnimation(-1);
-            fail("Failed at testGetAnimation");
-        } catch (NotFoundException e) {
-            //expected
-        }
-
-        final XmlResourceParser ani = mResources.getAnimation(R.anim.anim_rotate);
-        assertNotNull(ani);
-        XmlUtils.beginDocument(ani, "rotate");
-        assertEquals(7, ani.getAttributeCount());
-        assertEquals("Binary XML file line #18", ani.getPositionDescription());
-        assertEquals("interpolator", ani.getAttributeName(0));
-        assertEquals("@17432582", ani.getAttributeValue(0));
-    }
-
-    public void testGetQuantityString1() {
-        try {
-            mResources.getQuantityString(-1, 1, "");
-            fail("Failed at testGetQuantityString1");
-        } catch (NotFoundException e) {
-            //expected
-        }
-
-        final String strGo = mResources.getQuantityString(R.plurals.plurals_test, 1, "");
-        assertEquals("A dog", strGo);
-    }
-
-    public void testGetQuantityString2() {
-        try {
-            mResources.getQuantityString(-1, 1);
-            fail("Failed at testGetQuantityString2");
-        } catch (NotFoundException e) {
-            //expected
-        }
-
-        final String strGo = mResources.getQuantityString(R.plurals.plurals_test, 1);
-        assertEquals("A dog", strGo);
-    }
-
-    public void testGetInteger() {
-        try {
-            mResources.getInteger(-1);
-            fail("Failed at testGetInteger");
-        } catch (NotFoundException e) {
-            //expected
-        }
-
-        final int i = mResources.getInteger(R.integer.resource_test_int);
-        assertEquals(10, i);
-    }
-
-    public void testGetValue() {
-        final TypedValue tv = new TypedValue();
-
-        try {
-            mResources.getValue("null", tv, false);
-            fail("Failed at testGetValue");
-        } catch (NotFoundException e) {
-            //expected
-        }
-
-        mResources.getValue("com.mediatek.cts.resource.stub:raw/text", tv, false);
-        assertNotNull(tv);
-        assertEquals("res/raw/text.txt", tv.coerceToString());
-    }
-
-    public void testGetAssets() {
-        final AssetManager aM = mResources.getAssets();
-        assertNotNull(aM);
-        assertTrue(aM.isUpToDate());
-    }
-
-    public void testGetSystem() {
-        assertNotNull(Resources.getSystem());
-    }
-
-    public void testGetLayout() throws Exception {
-        try {
-            mResources.getLayout(-1);
-            fail("Failed at testGetLayout");
-        } catch (NotFoundException e) {
-            //expected
-        }
-
-        final XmlResourceParser layout = mResources.getLayout(R.layout.abslistview_layout);
-        assertNotNull(layout);
-        XmlUtils.beginDocument(layout, "ViewGroup_Layout");
-        assertEquals(3, layout.getAttributeCount());
-        assertEquals("id", layout.getAttributeName(0));
-        assertEquals("@" + R.id.abslistview_root, layout.getAttributeValue(0));
-    }
-
-    public void testGetBoolean() {
-        try {
-            mResources.getBoolean(-1);
-            fail("Failed at testGetBoolean");
-        } catch (NotFoundException e) {
-            //expected
-        }
-
-        final boolean b = mResources.getBoolean(R.integer.resource_test_int);
-        assertTrue(b);
-    }
-
-    public void testgetFraction() {
-        assertEquals(1, (int) mResources.getFraction(R.dimen.frac100perc, 1, 1));
-        assertEquals(100, (int) mResources.getFraction(R.dimen.frac100perc, 100, 1));
-    }
-
-    public void testParseBundleExtras() throws XmlPullParserException, IOException {
-        final Bundle b = new Bundle();
-        XmlResourceParser parser = mResources.getXml(R.xml.extra);
-        XmlUtils.beginDocument(parser, "tag");
-
-        assertEquals(0, b.size());
-        mResources.parseBundleExtras(parser, b);
-        assertEquals(1, b.size());
-        assertEquals("android", b.getString("google"));
-    }
-
-    public void testParseBundleExtra() throws XmlPullParserException, IOException {
-        final Bundle b = new Bundle();
-        XmlResourceParser parser = mResources.getXml(R.xml.extra);
-
-        XmlUtils.beginDocument(parser, "tag");
-        assertEquals(0, b.size());
-        mResources.parseBundleExtra("test", parser, b);
-        assertEquals(1, b.size());
-        assertEquals("Lee", b.getString("Bruce"));
-    }
-
-    public void testGetIdentifier() {
-
-        int resid = mResources.getIdentifier(COM_ANDROID_CTS_STUB_IDENTIFIER, null, null);
-        assertEquals(R.configVarying.simple, resid);
-
-        resid = mResources.getIdentifier(CONFIG_VARYING_SIMPLE, null, PACKAGE_NAME);
-        assertEquals(R.configVarying.simple, resid);
-
-        resid = mResources.getIdentifier(SIMPLE, CONFIG_VARYING, PACKAGE_NAME);
-        assertEquals(R.configVarying.simple, resid);
-    }
-
-    public void testGetIntArray() {
-        final int NO_EXIST_ID = -1;
-        try {
-            mResources.getIntArray(NO_EXIST_ID);
-            fail("should throw out NotFoundException");
-        } catch (NotFoundException e) {
-            // expected
-        }
-        // expected value is defined in res/value/arrays.xml
-        final int[] expectedArray1 = new int[] {
-                0, 0, 0
-        };
-        final int[] expectedArray2 = new int[] {
-                0, 1, 101
-        };
-        int[]array1 = mResources.getIntArray(R.array.strings);
-        int[]array2 = mResources.getIntArray(R.array.integers);
-
-        checkArrayEqual(expectedArray1, array1);
-        checkArrayEqual(expectedArray2, array2);
-
-    }
-
-    private void checkArrayEqual(int[] array1, int[] array2) {
-        assertNotNull(array2);
-        assertEquals(array1.length, array2.length);
-        for (int i = 0; i < array1.length; i++) {
-            assertEquals(array1[i], array2[i]);
-        }
-    }
-
-    public void testGetQuantityText() {
-        CharSequence cs;
-        final Resources res = resourcesForLanguage("cs");
-
-        cs = res.getQuantityText(R.plurals.plurals_test, 0);
-        assertEquals("Some Czech dogs", cs.toString());
-
-        cs = res.getQuantityText(R.plurals.plurals_test, 1);
-        assertEquals("A Czech dog", cs.toString());
-
-        cs = res.getQuantityText(R.plurals.plurals_test, 2);
-        assertEquals("Few Czech dogs", cs.toString());
-
-        cs = res.getQuantityText(R.plurals.plurals_test, 5);
-        assertEquals("Some Czech dogs", cs.toString());
-
-        cs = res.getQuantityText(R.plurals.plurals_test, 500);
-        assertEquals("Some Czech dogs", cs.toString());
-
-    }
-
-    private Resources resourcesForLanguage(final String lang) {
-        final Configuration config = new Configuration();
-        config.updateFrom(mResources.getConfiguration());
-        config.locale = new Locale(lang);
-        return new Resources(mResources.getAssets(), mResources.getDisplayMetrics(), config);
-    }
-
-    public void testGetResourceEntryName() {
-        assertEquals(SIMPLE, mResources.getResourceEntryName(R.configVarying.simple));
-    }
-
-    public void testGetResourceName() {
-        final String fullName = mResources.getResourceName(R.configVarying.simple);
-        assertEquals(COM_ANDROID_CTS_STUB_IDENTIFIER, fullName);
-
-        final String packageName = mResources.getResourcePackageName(R.configVarying.simple);
-        assertEquals(PACKAGE_NAME, packageName);
-
-        final String typeName = mResources.getResourceTypeName(R.configVarying.simple);
-        assertEquals(CONFIG_VARYING, typeName);
-    }
-
-    public void testGetStringWithIntParam() {
-        checkString(R.string.formattedStringNone,
-                mResources.getString(R.string.formattedStringNone),
-                "Format[]");
-        checkString(R.string.formattedStringOne,
-                mResources.getString(R.string.formattedStringOne),
-                "Format[%d]");
-        checkString(R.string.formattedStringTwo, mResources.getString(R.string.formattedStringTwo),
-                "Format[%3$d,%2$s]");
-        // Make sure the formatted one works
-        checkString(R.string.formattedStringNone,
-                mResources.getString(R.string.formattedStringNone),
-                "Format[]");
-        checkString(R.string.formattedStringOne,
-                mResources.getString(R.string.formattedStringOne, 42),
-                "Format[42]");
-        checkString(R.string.formattedStringTwo,
-                mResources.getString(R.string.formattedStringTwo, "unused", "hi", 43),
-                "Format[43,hi]");
-    }
-
-    private static void checkString(final int resid, final String actual, final String expected) {
-        assertEquals("Expecting string value \"" + expected + "\" got \""
-                + actual + "\" in resources 0x" + Integer.toHexString(resid),
-                expected, actual);
-    }
-
-    public void testGetStringArray() {
-        checkStringArray(R.array.strings, new String[] {
-                "zero", "1", "here"
-        });
-        checkTextArray(R.array.strings, new String[] {
-                "zero", "1", "here"
-        });
-        checkStringArray(R.array.integers, new String[] {
-                null, null, null
-        });
-        checkTextArray(R.array.integers, new String[] {
-                null, null, null
-        });
-    }
-
-    private void checkStringArray(final int resid, final String[] expected) {
-        final String[] res = mResources.getStringArray(resid);
-        assertEquals(res.length, expected.length);
-        for (int i = 0; i < expected.length; i++) {
-            checkEntry(resid, i, res[i], expected[i]);
-        }
-    }
-
-    private void checkEntry(final int resid, final int index, final Object res,
-            final Object expected) {
-        assertEquals("in resource 0x" + Integer.toHexString(resid)
-                + " at index " + index, expected, res);
-    }
-
-    private void checkTextArray(final int resid, final String[] expected) {
-        final CharSequence[] res = mResources.getTextArray(resid);
-        assertEquals(res.length, expected.length);
-        for (int i = 0; i < expected.length; i++) {
-            checkEntry(resid, i, res[i], expected[i]);
-        }
-    }
-
-    public void testGetValueWithID() {
-        tryBoolean(R.bool.trueRes, true);
-        tryBoolean(R.bool.falseRes, false);
-
-        tryString(R.string.coerceIntegerToString, "100");
-        tryString(R.string.coerceBooleanToString, "true");
-        tryString(R.string.coerceColorToString, "#fff");
-        tryString(R.string.coerceFloatToString, "100.0");
-        tryString(R.string.coerceDimensionToString, "100px");
-        tryString(R.string.coerceFractionToString, "100%");
-    }
-
-    private void tryBoolean(final int resid, final boolean expected) {
-        final TypedValue v = new TypedValue();
-        mContext.getResources().getValue(resid, v, true);
-        assertEquals(TypedValue.TYPE_INT_BOOLEAN, v.type);
-        assertEquals("Expecting boolean value " + expected + " got " + v
-                + " from TypedValue: in resource 0x" + Integer.toHexString(resid),
-                expected, v.data != 0);
-        assertEquals("Expecting boolean value " + expected + " got " + v
-                + " from getBoolean(): in resource 0x" + Integer.toHexString(resid),
-                expected, mContext.getResources().getBoolean(resid));
-    }
-
-    private void tryString(final int resid, final String expected) {
-        final TypedValue v = new TypedValue();
-        mContext.getResources().getValue(resid, v, true);
-        assertEquals(TypedValue.TYPE_STRING, v.type);
-        assertEquals("Expecting string value " + expected + " got " + v
-                + ": in resource 0x" + Integer.toHexString(resid),
-                expected, v.string);
-    }
-
-    public void testRawResource() throws Exception {
-        assertNotNull(mResources.newTheme());
-
-        InputStream is = mResources.openRawResource(R.raw.text);
-        verifyTextAsset(is);
-
-        is = mResources.openRawResource(R.raw.text, new TypedValue());
-        verifyTextAsset(is);
-
-        assertNotNull(mResources.openRawResourceFd(R.raw.text));
-    }
-
-    static void verifyTextAsset(final InputStream is) throws IOException {
-        final String expectedString = "OneTwoThreeFourFiveSixSevenEightNineTen";
-        final byte[] buffer = new byte[10];
-
-        int readCount;
-        int curIndex = 0;
-        while ((readCount = is.read(buffer, 0, buffer.length)) > 0) {
-            for (int i = 0; i < readCount; i++) {
-                assertEquals("At index " + curIndex
-                            + " expected " + expectedString.charAt(curIndex)
-                            + " but found " + ((char) buffer[i]),
-                        buffer[i], expectedString.charAt(curIndex));
-                curIndex++;
-            }
-        }
-
-        readCount = is.read(buffer, 0, buffer.length);
-        assertEquals("Reading end of buffer: expected readCount=-1 but got " + readCount,
-                -1, readCount);
-
-        readCount = is.read(buffer, buffer.length, 0);
-        assertEquals("Reading end of buffer length 0: expected readCount=0 but got " + readCount,
-                0, readCount);
-
-        is.close();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/Resources_NotFoundExceptionTest.java b/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/Resources_NotFoundExceptionTest.java
deleted file mode 100755
index 4b810c3d5b25e5c41b6cba919e6e4f82498d219d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/Resources_NotFoundExceptionTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.content.res.cts;
-
-import android.content.res.Resources.NotFoundException;
-import junit.framework.TestCase;
-
-public class Resources_NotFoundExceptionTest extends TestCase {
-
-    public void testNotFoundException() {
-        NotFoundException ne = null;
-        boolean isThrowed = false;
-        boolean isFinnalyRun = false;
-        try {
-            ne = new NotFoundException();
-            throw ne;
-        } catch (NotFoundException e) {
-            // expected
-            assertSame(ne, e);
-            isThrowed = true;
-        } finally {
-            if (!isThrowed) {
-                fail("should throw out NotFoundException");
-            }
-            isFinnalyRun = true;
-        }
-        assertTrue(isFinnalyRun);
-
-        isThrowed = false;
-        isFinnalyRun = false;
-        final String MESSAGE = "test";
-        try {
-            ne = new NotFoundException(MESSAGE);
-            throw ne;
-        } catch (NotFoundException e) {
-            // expected
-            assertSame(ne, e);
-            assertEquals(MESSAGE, e.getMessage());
-            isThrowed = true;
-        } finally {
-            if (!isThrowed) {
-                fail("should throw out NotFoundException");
-            }
-            isFinnalyRun = true;
-        }
-        assertTrue(isFinnalyRun);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/Resources_ThemeTest.java b/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/Resources_ThemeTest.java
deleted file mode 100755
index 3e2372539ed4303a2cdf182adb715671b70d283c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/Resources_ThemeTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.content.res.cts;
-
-import org.xmlpull.v1.XmlPullParser;
-
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.content.res.Resources.Theme;
-import android.test.AndroidTestCase;
-import android.util.AttributeSet;
-import android.util.TypedValue;
-import android.util.Xml;
-
-import com.mediatek.cts.resource.stub.R;
-
-
-public class Resources_ThemeTest extends AndroidTestCase {
-
-    private Resources.Theme mResTheme;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResTheme = getContext().getResources().newTheme();
-    }
-
-    public void testSetMethods() {
-        // call a native method, and have no way to get the style
-        mResTheme.applyStyle(R.raw.testmp3, false);
-        // call a native method, this method is just for debug to the log
-        mResTheme.dump(1, "hello", "world");
-        // call a native method
-        final Theme other = getContext().getTheme();
-        mResTheme.setTo(other);
-    }
-
-    public void testObtainStyledAttributes() {
-        final int[] attrs = new int[1];
-        attrs[0] = R.raw.testmp3;
-
-        TypedArray testTypedArray = mResTheme.obtainStyledAttributes(attrs);
-        assertNotNull(testTypedArray);
-        assertTrue(testTypedArray.length() > 0);
-        testTypedArray.recycle();
-
-        testTypedArray = mResTheme.obtainStyledAttributes(R.raw.testmp3, attrs);
-        assertNotNull(testTypedArray);
-        assertTrue(testTypedArray.length() > 0);
-        testTypedArray.recycle();
-
-        XmlPullParser parser = getContext().getResources().getXml(R.xml.colors);
-        AttributeSet set = Xml.asAttributeSet(parser);
-        attrs[0] = R.xml.colors;
-        testTypedArray = mResTheme.obtainStyledAttributes(set, attrs, 0, 0);
-        assertNotNull(testTypedArray);
-        assertTrue(testTypedArray.length() > 0);
-        testTypedArray.recycle();
-    }
-
-    public void testResolveAttribute() {
-        final TypedValue value = new TypedValue();
-        getContext().getResources().getValue(R.raw.testmp3, value, true);
-        assertFalse(mResTheme.resolveAttribute(R.raw.testmp3, value, false));
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/TypedArrayTest.java b/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/TypedArrayTest.java
deleted file mode 100755
index f73e323799c3362749f95eb39ef89149e8a7b7dc..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/resources/tests/src/mediatek/content/res/cts/TypedArrayTest.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.content.res.cts;
-
-import java.io.IOException;
-
-import org.xmlpull.v1.XmlPullParserException;
-
-import android.content.res.TypedArray;
-import android.content.res.XmlResourceParser;
-import android.test.AndroidTestCase;
-import android.util.AttributeSet;
-import android.util.TypedValue;
-import android.view.ContextThemeWrapper;
-
-import com.mediatek.cts.resource.stub.R;
-import com.android.internal.util.XmlUtils;
-
-
-public class TypedArrayTest extends AndroidTestCase {
-    private TypedArray mTypedArray;
-    private static final int DEFINT = -1;
-    private static final float DEFFLOAT = -1.0f;
-    private static final int EXPECTEDCLOLOR = 0xff0000ff;
-    private static final int EXPECTED_COLOR_STATE = 0xff00ff00;
-    private static final float EXPECTED_DIMENSION = 0.75f;
-    private static final int EXPECTED_PIXEL_OFFSET = 10;
-    private static final int EXPECTED_LAYOUT_DIMENSION = 10;
-    private static final int EXPECTED_PIXEL_SIZE = 18;
-    private static final float EXPECTED_FLOAT = 3.14f;
-    private static final float EXPECTED_FRACTION = 10.0f;
-    private static final int EXPECTED_INT = 365;
-    private static final String EXPECTED_STRING = "Hello, Android!";
-    private static final String EXPECTED_TEXT = "TypedArray Test!";
-    private static final String[] EXPECTED_TEXT_ARRAY = {"Easy", "Medium", "Hard"};
-    private static final int EXPETED_INDEX = 15;
-    private static final TypedValue DEF_VALUE = new TypedValue();
-    private static final int EXPECTED_INDEX_COUNT = 16;
-    private static final String EXPTECTED_POS_DESCRIP = "<internal>";
-    private static final int EXPECTED_LENGTH = 16;
-    private static final String EXPECTED_NON_RESOURCE_STRING = "testNonResourcesString";
-    private static final String XML_BEGIN = "resources";
-    private static final int EXPECTED_INT_ATT = 86400;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        final int[] attrs = R.styleable.style1;
-        mTypedArray = getContext().getTheme().obtainStyledAttributes(R.style.Whatever, attrs);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        mTypedArray.recycle();
-    }
-
-    /*
-     * Test all get attrs methods, all test value are in styles.xml and attrs.xml.
-     */
-    public void testAttrsMethod() {
-        // getBoolean test
-        assertTrue(mTypedArray.getBoolean(R.styleable.style1_type1, false));
-        assertFalse(mTypedArray.getBoolean(R.styleable.style1_type2, true));
-
-        assertEquals(EXPECTEDCLOLOR, mTypedArray.getColor(R.styleable.style1_type3, DEFINT));
-
-        // getColorStateList test
-        final int[] set = new int[1];
-        set[0] = 0;
-        assertEquals(EXPECTED_COLOR_STATE,
-                mTypedArray.getColorStateList(R.styleable.style1_type4).
-                getColorForState(set, DEFINT));
-
-        // This get values equals attribute dimension value set in styles.xml
-        // multiplied by the appropriate metric, the metric is unknown.
-        assertEquals(EXPECTED_DIMENSION,
-                mTypedArray.getDimension(R.styleable.style1_type5, DEFFLOAT));
-        assertEquals(EXPECTED_PIXEL_OFFSET,
-                mTypedArray.getDimensionPixelOffset(R.styleable.style1_type6, DEFINT));
-        assertEquals(EXPECTED_LAYOUT_DIMENSION,
-                mTypedArray.getLayoutDimension(R.styleable.style1_type6, "type6"));
-        assertEquals(EXPECTED_LAYOUT_DIMENSION,
-                mTypedArray.getLayoutDimension(R.styleable.style1_type6, 0));
-        assertEquals(EXPECTED_PIXEL_SIZE,
-                mTypedArray.getDimensionPixelSize(R.styleable.style1_type7, DEFINT));
-
-        // getDrawable test
-        assertNotNull(mTypedArray.getDrawable(R.styleable.style1_type8));
-        // getResourceId test
-        assertEquals(R.drawable.pass,
-                mTypedArray.getResourceId(R.styleable.style1_type8, DEFINT));
-
-        assertEquals(EXPECTED_FLOAT, mTypedArray.getFloat(R.styleable.style1_type9, DEFFLOAT));
-
-        assertEquals(EXPECTED_FRACTION,
-                mTypedArray.getFraction(R.styleable.style1_type10, 10, 10, DEFFLOAT));
-
-        assertEquals(EXPECTED_INT, mTypedArray.getInt(R.styleable.style1_type11, DEFINT));
-
-        assertEquals(EXPECTED_INT_ATT, mTypedArray.getInteger(R.styleable.style1_type12, DEFINT));
-
-        assertEquals(EXPECTED_STRING, mTypedArray.getString(R.styleable.style1_type13));
-
-        // getNonResourceString test
-        assertNull(mTypedArray.getNonResourceString(R.styleable.style1_type14));
-
-        assertEquals(EXPECTED_TEXT, mTypedArray.getText(R.styleable.style1_type14));
-
-        CharSequence[] textArray = mTypedArray.getTextArray(R.styleable.style1_type15);
-        assertEquals(EXPECTED_TEXT_ARRAY[0], textArray[0]);
-        assertEquals(EXPECTED_TEXT_ARRAY[1], textArray[1]);
-        assertEquals(EXPECTED_TEXT_ARRAY[2], textArray[2]);
-
-        // getIndex test
-        int index = mTypedArray.getIndex(R.styleable.style1_type16);
-        assertEquals(EXPETED_INDEX, index);
-        assertTrue(mTypedArray.getValue(index, DEF_VALUE));
-        // hasValue test
-        assertTrue(mTypedArray.hasValue(R.styleable.style1_type16));
-
-        // peekValue test
-        assertNotNull(mTypedArray.peekValue(R.styleable.style1_type16));
-
-        assertEquals(EXPECTED_INDEX_COUNT, mTypedArray.getIndexCount());
-
-        assertEquals(EXPTECTED_POS_DESCRIP,
-                mTypedArray.getPositionDescription());
-
-        // getResources test
-        assertEquals(getContext().getResources(), mTypedArray.getResources());
-
-        assertEquals(EXPECTED_LENGTH, mTypedArray.length());
-
-        // toString test
-        assertNotNull(mTypedArray.toString());
-    }
-
-    public void testRecycle() {
-        final ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(getContext(), 0);
-        contextThemeWrapper.setTheme(R.style.TextAppearance);
-        final TypedArray test = contextThemeWrapper.getTheme().obtainStyledAttributes(
-                R.styleable.TextAppearance);
-        test.recycle();
-    }
-
-    public void testNonResourceString() throws XmlPullParserException, IOException {
-        final XmlResourceParser parser = getContext().getResources().getXml(R.xml.test_color);
-        XmlUtils.beginDocument(parser, XML_BEGIN);
-        final AttributeSet set = parser;
-        assertEquals(1, set.getAttributeCount());
-        final TypedArray ta = getContext().getResources().obtainAttributes(set,
-                com.android.internal.R.styleable.AndroidManifest);
-        assertEquals(1, ta.getIndexCount());
-        assertEquals(EXPECTED_NON_RESOURCE_STRING, ta.getNonResourceString(
-                com.android.internal.R.styleable.AndroidManifest_versionName));
-        ta.recycle();
-        parser.close();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/text/Android.mk b/proprietary/frameworks/base/tests/text/Android.mk
deleted file mode 100755
index 96fff25d24a316b9b321d3227d1dbf2a02922798..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-# Include all test java files.
-LOCAL_SRC_FILES := \
-	$(call all-java-files-under, src)
-
-LOCAL_DX_FLAGS := --core-library
-# add "librobotium junit-report" when test zutubi
-LOCAL_STATIC_JAVA_LIBRARIES := android-common frameworks-core-util-lib littlemock
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_PACKAGE_NAME := CommonTextTests
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/frameworks/base/tests/text/Android.mk_ b/proprietary/frameworks/base/tests/text/Android.mk_
deleted file mode 100755
index 96fff25d24a316b9b321d3227d1dbf2a02922798..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/Android.mk_
+++ /dev/null
@@ -1,20 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-# Include all test java files.
-LOCAL_SRC_FILES := \
-	$(call all-java-files-under, src)
-
-LOCAL_DX_FLAGS := --core-library
-# add "librobotium junit-report" when test zutubi
-LOCAL_STATIC_JAVA_LIBRARIES := android-common frameworks-core-util-lib littlemock
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_PACKAGE_NAME := CommonTextTests
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/frameworks/base/tests/text/AndroidManifest.xml b/proprietary/frameworks/base/tests/text/AndroidManifest.xml
deleted file mode 100755
index 7604b0c5ae0a5f29373adae4378356a5b907f4c7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/AndroidManifest.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          android:installLocation="internalOnly"
-          package="com.android.frameworks.coretests"
-          android:sharedUserId="com.android.uid.test">
-
-    <permission android:name="com.android.frameworks.coretests.permission.TEST_GRANTED"
-        android:protectionLevel="normal"
-            android:label="@string/permlab_testGranted"
-            android:description="@string/permdesc_testGranted">
-        <meta-data android:name="com.android.frameworks.coretests.string" android:value="foo" />
-        <meta-data android:name="com.android.frameworks.coretests.boolean" android:value="true" />
-        <meta-data android:name="com.android.frameworks.coretests.integer" android:value="100" />
-        <meta-data android:name="com.android.frameworks.coretests.color" android:value="#ff000000" />
-        <meta-data android:name="com.android.frameworks.coretests.float" android:value="100.1" />
-        <meta-data android:name="com.android.frameworks.coretests.reference" android:resource="@xml/metadata" />
-    </permission>
-    <permission android:name="com.android.frameworks.coretests.permission.TEST_DENIED"
-        android:protectionLevel="normal"
-            android:label="@string/permlab_testDenied"
-            android:description="@string/permdesc_testDenied" />
-
-    <uses-permission android:name="android.permission.ACCESS_CACHE_FILESYSTEM" />
-    <uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER" />
-    <uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER_ADVANCED" />
-    <uses-permission android:name="android.permission.DOWNLOAD_CACHE_NON_PURGEABLE" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CLEAR_APP_CACHE" />
-    <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.DOWNLOAD_CACHE_NON_PURGEABLE" />
-    <uses-permission android:name="android.permission.GET_PACKAGE_SIZE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.READ_LOGS"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.READ_SMS"/>
-    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SMS"/>
-    <uses-permission android:name="android.permission.TEST_GRANTED" />
-    <uses-permission android:name="com.google.android.googleapps.permission.ACCESS_GOOGLE_PASSWORD" />
-    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
-    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.ALL_SERVICES" />
-
-    <uses-permission android:name="android.permission.MANAGE_USERS" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
-
-    <uses-permission android:name="android.permission.RECEIVE_SMS"/>
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
-    <uses-permission android:name="android.permission.WRITE_APN_SETTINGS" />
-    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-
-    <!-- location test permissions -->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.HARDWARE_TEST" />
-
-    <!-- package manager test permissions -->
-    <uses-permission android:name="android.permission.INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.DELETE_PACKAGES" />
-    <uses-permission android:name="android.permission.MOVE_PACKAGE" />
-    <uses-permission android:name="android.permission.PACKAGE_VERIFICATION_AGENT" />
-
-    <!--os storage test permissions -->
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
-    <uses-permission android:name="android.permission.ASEC_ACCESS" />
-    <uses-permission android:name="android.permission.ASEC_CREATE" />
-    <uses-permission android:name="android.permission.ASEC_DESTROY" />
-    <uses-permission android:name="android.permission.ASEC_MOUNT_UNMOUNT" />
-    <uses-permission android:name="android.permission.ASEC_RENAME" />
-    <uses-permission android:name="android.permission.SHUTDOWN" />
-
-    <!-- accessibility test permissions -->
-    <uses-permission android:name="android.permission.RETRIEVE_WINDOW_CONTENT" />
-
-    <application android:theme="@style/Theme">
-        <uses-library android:name="android.test.runner" />        
-    </application>
-
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
-            android:targetPackage="com.android.frameworks.coretests"
-            android:label="Common Text Tests" />
-</manifest>
diff --git a/proprietary/frameworks/base/tests/text/NOTICE b/proprietary/frameworks/base/tests/text/NOTICE
deleted file mode 100755
index 32cf577144190b75944afc19a23b6888ccc533b3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/NOTICE
+++ /dev/null
@@ -1,19 +0,0 @@
- * Copyright (C) 2008 The Android Open Source Project:
-
-
-
-/*
-* Copyright (C) 2011-2014 MediaTek Inc.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
diff --git a/proprietary/frameworks/base/tests/text/README b/proprietary/frameworks/base/tests/text/README
deleted file mode 100755
index c1b438f6f2f7e5cf5cc0f8ec2008e6f8f33927f0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/README
+++ /dev/null
@@ -1,17 +0,0 @@
-This is the text auto test apk.
-
-WHAT IT DOES?
-=============
-This apk is for testing general function of text framework & widget.
-
-HOW IT WAS BUILT?
-==================
-Use AOSP mmm command with this folder path to build the apk file.
-The apk file is CommonTextTests.apk.
-
-HOW TO USE IT?
-==============
-Install the apk file via adb install command.
-Run adb am instrumentation command to execute the unit test.
-
-All the source code of this program were written by MediaTek co..
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/text/res/anim/reset_state_anim.xml b/proprietary/frameworks/base/tests/text/res/anim/reset_state_anim.xml
deleted file mode 100755
index 4bbbe62eba6f053dbb75be34f65ab009ef0442ed..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/anim/reset_state_anim.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <objectAnimator android:propertyName="x" android:duration="100" android:valueTo="0" android:valueType="floatType"/>
-    <objectAnimator android:propertyName="y" android:duration="100" android:valueTo="0" android:valueType="floatType"/>
-    <objectAnimator android:propertyName="z" android:duration="100" android:valueTo="0" android:valueType="floatType"/>
-</set>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/text/res/anim/test_animator.xml b/proprietary/frameworks/base/tests/text/res/anim/test_animator.xml
deleted file mode 100755
index 49afc3f2b58de1f8246a19614c679ad29463d2e9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/anim/test_animator.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- if you change this, you should also change AnimatorInflaterTest#testLoadAnimator-->
-    <objectAnimator android:propertyName="x" android:duration="100" android:valueTo="0" android:valueType="floatType"/>
-    <objectAnimator android:propertyName="y" android:duration="100" android:valueTo="1" android:valueType="floatType"/>
-    <objectAnimator android:propertyName="left" android:duration="100" android:valueTo="2" android:valueType="intType"/>
-</set>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/text/res/anim/test_state_anim.xml b/proprietary/frameworks/base/tests/text/res/anim/test_state_anim.xml
deleted file mode 100755
index b6a4822ae15335f0dd78ce1142bd2fbc4b664b9d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/anim/test_state_anim.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <set>
-            <objectAnimator android:propertyName="x" android:duration="100" android:valueTo="10" android:valueType="floatType"/>
-            <objectAnimator android:propertyName="y" android:duration="100" android:valueTo="20" android:valueType="floatType"/>
-            <objectAnimator android:propertyName="z" android:duration="100" android:valueTo="20" android:valueType="floatType"/>
-        </set>
-    </item>
-    <item android:state_enabled="true" android:state_pressed="false">
-        <set>
-            <objectAnimator android:propertyName="x" android:duration="100" android:valueTo="0" android:valueType="floatType"/>
-            <objectAnimator android:propertyName="y" android:duration="100" android:valueTo="0" android:valueType="floatType"/>
-            <objectAnimator android:propertyName="z" android:duration="100" android:valueTo="0" android:valueType="floatType"/>
-        </set>
-    </item>
-    <!-- base state-->
-    <item android:animation="@anim/reset_state_anim"/>
-</selector>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/text/res/drawable-hdpi/big_drawable_background.9.png b/proprietary/frameworks/base/tests/text/res/drawable-hdpi/big_drawable_background.9.png
deleted file mode 100755
index 53470b8d0b504ef2f89e1d4cff294fcb60cbf29c..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/drawable-hdpi/big_drawable_background.9.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/drawable-hdpi/black_square.png b/proprietary/frameworks/base/tests/text/res/drawable-hdpi/black_square.png
deleted file mode 100755
index 77521031e64242777659f7b3c91515a94668a9c0..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/drawable-hdpi/black_square.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/drawable-hdpi/black_square_stretchable.9.png b/proprietary/frameworks/base/tests/text/res/drawable-hdpi/black_square_stretchable.9.png
deleted file mode 100755
index 4988163e5205f0b4bf0133756454a9b659ea9453..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/drawable-hdpi/black_square_stretchable.9.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/drawable-hdpi/drawable_background.9.png b/proprietary/frameworks/base/tests/text/res/drawable-hdpi/drawable_background.9.png
deleted file mode 100755
index f692d38ff3386e5b03b7117eeb8c88a63469b408..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/drawable-hdpi/drawable_background.9.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/drawable-hdpi/sym_now_playing_pause_1.png b/proprietary/frameworks/base/tests/text/res/drawable-hdpi/sym_now_playing_pause_1.png
deleted file mode 100755
index 9edb064cfd326ae36bfcf01d1df756123911ade1..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/drawable-hdpi/sym_now_playing_pause_1.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/drawable-hdpi/sym_now_playing_skip_backward_1.png b/proprietary/frameworks/base/tests/text/res/drawable-hdpi/sym_now_playing_skip_backward_1.png
deleted file mode 100755
index c4b6b92eb69c5a5e2b646f66fad2270d2e4b3b8d..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/drawable-hdpi/sym_now_playing_skip_backward_1.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/drawable-hdpi/sym_now_playing_skip_forward_1.png b/proprietary/frameworks/base/tests/text/res/drawable-hdpi/sym_now_playing_skip_forward_1.png
deleted file mode 100755
index 03140f54bbaa019237715d29041d8017b4da900b..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/drawable-hdpi/sym_now_playing_skip_forward_1.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/drawable-mdpi/big_drawable_background.9.png b/proprietary/frameworks/base/tests/text/res/drawable-mdpi/big_drawable_background.9.png
deleted file mode 100755
index aded635ca569a79e8b406c34702633ac4902e92b..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/drawable-mdpi/big_drawable_background.9.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/drawable-mdpi/black_square.png b/proprietary/frameworks/base/tests/text/res/drawable-mdpi/black_square.png
deleted file mode 100755
index 1bfe0a2501f77602785918445c2e7b8f19e2ecf1..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/drawable-mdpi/black_square.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/drawable-mdpi/black_square_stretchable.9.png b/proprietary/frameworks/base/tests/text/res/drawable-mdpi/black_square_stretchable.9.png
deleted file mode 100755
index 1fcbeb1f82d12b0271edcb906b77595d3fb9e41b..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/drawable-mdpi/black_square_stretchable.9.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/drawable-mdpi/drawable_background.9.png b/proprietary/frameworks/base/tests/text/res/drawable-mdpi/drawable_background.9.png
deleted file mode 100755
index 1337ba978bb73c5a08cd5d44bee58d4314342fb8..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/drawable-mdpi/drawable_background.9.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/drawable-mdpi/sym_now_playing_pause_1.png b/proprietary/frameworks/base/tests/text/res/drawable-mdpi/sym_now_playing_pause_1.png
deleted file mode 100755
index 2f19d082b689dcf092e104cbe6159abdbecce1b5..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/drawable-mdpi/sym_now_playing_pause_1.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/drawable-mdpi/sym_now_playing_skip_backward_1.png b/proprietary/frameworks/base/tests/text/res/drawable-mdpi/sym_now_playing_skip_backward_1.png
deleted file mode 100755
index f945a8190c8d368d94a2fef6ecf4569ec9b8b311..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/drawable-mdpi/sym_now_playing_skip_backward_1.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/drawable-mdpi/sym_now_playing_skip_forward_1.png b/proprietary/frameworks/base/tests/text/res/drawable-mdpi/sym_now_playing_skip_forward_1.png
deleted file mode 100755
index da9361a34bd5bf660890c4dc42b733c4a0463be3..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/drawable-mdpi/sym_now_playing_skip_forward_1.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/drawable/abe.jpg b/proprietary/frameworks/base/tests/text/res/drawable/abe.jpg
deleted file mode 100755
index 1f978a9c56afa48e288d1a89f275dadcafdb9407..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/drawable/abe.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/drawable/bitmap_drawable.xml b/proprietary/frameworks/base/tests/text/res/drawable/bitmap_drawable.xml
deleted file mode 100755
index 35673ec0ef4a501588ec93a8100b31e2cdfd5da8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/drawable/bitmap_drawable.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/sym_now_playing_pause_1"
-    android:gravity="top|right" />
diff --git a/proprietary/frameworks/base/tests/text/res/drawable/box.xml b/proprietary/frameworks/base/tests/text/res/drawable/box.xml
deleted file mode 100755
index 6849bd34689d5baaafa03d371fd20419278d6539..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/drawable/box.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/res/drawable/box.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#00000000"/>
-    <stroke android:width="1dp" color="#ff000000"/>
-    <padding android:left="1dp" android:top="1dp"
-        android:right="1dp" android:bottom="1dp" />
-</shape>
diff --git a/proprietary/frameworks/base/tests/text/res/drawable/gettysburg.png b/proprietary/frameworks/base/tests/text/res/drawable/gettysburg.png
deleted file mode 100755
index 7a2d59647117ceda94cc1d858e8fcee87617d515..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/drawable/gettysburg.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/drawable/size_adaptive_statelist.xml b/proprietary/frameworks/base/tests/text/res/drawable/size_adaptive_statelist.xml
deleted file mode 100755
index aaa2de78811f2464aec2c37d0159ba4f658c54c5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/drawable/size_adaptive_statelist.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:exitFadeDuration="@android:integer/config_mediumAnimTime">
-
-    <item android:state_pressed="true"  android:drawable="@drawable/blue" />
-    <item android:state_pressed="false" android:drawable="@drawable/red" />
-</selector>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/accessibility_injector_test.xml b/proprietary/frameworks/base/tests/text/res/layout/accessibility_injector_test.xml
deleted file mode 100755
index 7a34c9a465ac8294a60d5f07982218a867e41213..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/accessibility_injector_test.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<WebView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/webview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
diff --git a/proprietary/frameworks/base/tests/text/res/layout/add_column_in_table.xml b/proprietary/frameworks/base/tests/text/res/layout/add_column_in_table.xml
deleted file mode 100755
index 05f55a8b360e5b37de73c6cdac41be8552c42e0c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/add_column_in_table.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TableLayout android:id="@+id/table"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1.0">
-
-        <TableRow>
-            <TextView
-              android:text="@string/table_layout_a"
-                android:padding="3dip" />
-            <TextView
-                android:text="@string/table_layout_b"
-                android:padding="3dip" />
-            <TextView
-                android:text="@string/table_layout_c"
-                android:padding="3dip" />
-        </TableRow>
-
-    </TableLayout>
-
-    <Button android:id="@+id/add_row_button"
-        android:text="@string/add_row_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/animator_basic.xml b/proprietary/frameworks/base/tests/text/res/layout/animator_basic.xml
deleted file mode 100755
index 7b8ef11df1bd59599f11d8278cb1bcda8c92d37f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/animator_basic.xml
+++ /dev/null
@@ -1,11 +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">
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/animatingButton"/>
-</LinearLayout>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/text/res/layout/attach_view_test.xml b/proprietary/frameworks/base/tests/text/res/layout/attach_view_test.xml
deleted file mode 100755
index 42841cbbb1f61d2d0006831a88e124e7c51a45f4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/attach_view_test.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <android.view.ViewAttachView
-    android:id="@+id/view_attach_view"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:keepScreenOn="true"/>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/autocompletetextview_simple.xml b/proprietary/frameworks/base/tests/text/res/layout/autocompletetextview_simple.xml
deleted file mode 100755
index 1a2007640e94dc9571b9e8d41de52503ca3fe8c4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/autocompletetextview_simple.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/samples/SampleCode/res/layout/baseline_1.xml
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <AutoCompleteTextView
-        android:id="@+id/autocompletetextview1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputType="text|textAutoComplete"
-        android:completionThreshold="1" />
-        />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/baseline_0width_and_weight.xml b/proprietary/frameworks/base/tests/text/res/layout/baseline_0width_and_weight.xml
deleted file mode 100755
index acbb10b7d7b2c2044cb1768a855ea89c244c9be2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/baseline_0width_and_weight.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <LinearLayout android:id="@+id/layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:visibility="gone">
-        <android.widget.layout.linear.ExceptionTextView
-             android:id="@+id/routeToField"
-             android:textSize="16sp"
-             android:layout_width="0dip"
-             android:layout_weight="1"
-             android:layout_height="wrap_content"
-             android:lines="2"
-             android:autoText="false"
-             android:capitalize="none"
-             android:maxLines="1" />
-         <Button
-             android:layout_height="wrap_content"
-             android:layout_width="wrap_content"
-             android:layout_gravity="fill_vertical"
-             android:text="@string/side_button_label" />
-    </LinearLayout>
-    <Button android:id="@+id/show"
-         android:layout_height="wrap_content"
-         android:layout_width="wrap_content"
-         android:text="@string/show" />
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/baseline_buttons.xml b/proprietary/frameworks/base/tests/text/res/layout/baseline_buttons.xml
deleted file mode 100755
index 3e364bdfd0f13ffdfd45d83b5cebe3f7a26b72ee..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/baseline_buttons.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/layout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
-
-    <TextView android:id="@+id/currenttime"
-    	android:text="@string/time"
-        android:textSize="12sp"
-        android:textStyle="bold"
-        android:layout_gravity="bottom"
-        android:layout_weight="1"
-        android:layout_width="0dip"
-        android:layout_height="wrap_content" />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center">
-
-        <ImageButton android:id="@+id/prev"
-            android:src="@drawable/sym_now_playing_skip_backward_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <ImageButton android:id="@+id/pause"
-            android:src="@drawable/sym_now_playing_pause_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <ImageButton android:id="@+id/next"
-            android:src="@drawable/sym_now_playing_skip_forward_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-    </LinearLayout>
-
-    <TextView android:id="@+id/totaltime"
-        android:textSize="12sp"
-        android:textStyle="bold"
-        android:gravity="right"
-        android:text="@string/time"
-        android:layout_gravity="bottom"
-        android:layout_weight="1"
-        android:layout_width="0dip"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/baseline_center_gravity.xml b/proprietary/frameworks/base/tests/text/res/layout/baseline_center_gravity.xml
deleted file mode 100755
index dd1318d310dc1d770c81abfa4f00cb2cbfd82fba..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/baseline_center_gravity.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-    <Button android:id="@+id/button1"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/side_button_label" />
-    <Button android:id="@+id/button2"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/side_button_label" />
-    <Button android:id="@+id/button3"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/side_button_label" />
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/brightness_limit.xml b/proprietary/frameworks/base/tests/text/res/layout/brightness_limit.xml
deleted file mode 100755
index 46e576752fe8c155c645faa2c4c782b1fcbd0902..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/brightness_limit.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<!-- Tries to set brightness to 0. See corresponding Java code. -->
-
-
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/go"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:text="@string/go"/>
-
diff --git a/proprietary/frameworks/base/tests/text/res/layout/descendant_focusability.xml b/proprietary/frameworks/base/tests/text/res/layout/descendant_focusability.xml
deleted file mode 100755
index 0cb75fdb6a0650d036c881b9d385a63876513d18..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/descendant_focusability.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-        >
-
-    <LinearLayout
-        android:id="@+id/beforeDescendants"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:descendantFocusability="beforeDescendants"
-            >
-        <Button
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-                />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/afterDescendants"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:descendantFocusability="afterDescendants"
-            >
-        <Button
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-                />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/blocksDescendants"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:descendantFocusability="blocksDescendants"
-            >
-        <Button
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-                />
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/disabled.xml b/proprietary/frameworks/base/tests/text/res/layout/disabled.xml
deleted file mode 100755
index 4b41248633220157007f1bc595d368546ee30029..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/disabled.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<!-- Demonstrates changing view visibility. See corresponding Java code. -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/clickableParent"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Button android:id="@+id/disabledButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/disabled_button"/>
-
-    <Button android:id="@+id/disabledButtonA"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/disabled_button"/>
-        
-    <Button android:id="@+id/disabledButtonB"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/disabled_button"/>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/drawable_background_minimum_size.xml b/proprietary/frameworks/base/tests/text/res/layout/drawable_background_minimum_size.xml
deleted file mode 100755
index ea0cbfa3b39ff0d2c167b27c6fb7a488eee8698e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/drawable_background_minimum_size.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-    
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-        
-        <Button
-            android:id="@+id/change_backgrounds"
-            android:text="@string/change_backgrounds"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <!-- Different views and layouts that should initially be small but still contain
-             some content (hence the minimal text inside each of the layouts).  Each of these
-             will each be tested to make sure they expand to at least the minimum size
-             recommended by different backgrounds -->
-             
-        <TextView
-            android:id="@+id/text_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/minimal_text" />
-                
-        <LinearLayout
-            android:id="@+id/linear_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-            
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/minimal_text" />
-                
-        </LinearLayout>
-    
-        <RelativeLayout
-            android:id="@+id/relative_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-            
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/minimal_text" />
-                
-        </RelativeLayout>
-    
-        <FrameLayout
-            android:id="@+id/frame_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-            
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/minimal_text" />
-                
-        </FrameLayout>
-    
-        <AbsoluteLayout
-            android:id="@+id/absolute_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-            
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/minimal_text" />
-                
-        </AbsoluteLayout>
-    
-    </LinearLayout>
-
-</ScrollView>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/fill_in_wrap.xml b/proprietary/frameworks/base/tests/text/res/layout/fill_in_wrap.xml
deleted file mode 100755
index 1c3f8110f5b5029575fef9431165155a2c5a9c82..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/fill_in_wrap.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:orientation="horizontal"
-    android:baselineAligned="false"
-    android:gravity="center_vertical">
-
-    <Button
-        android:layout_width="100dip"
-        android:layout_height="wrap_content"
-        android:gravity="left|center_vertical"
-    />
-
-    <LinearLayout android:id="@+id/layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="0dip"
-        android:paddingRight="0dip"
-        android:paddingTop="2dip"
-        android:paddingBottom="2dip"    
-        android:orientation="horizontal"
-        android:baselineAligned="false"
-        android:addStatesFromChildren="true"
-        android:background="@android:drawable/edit_text"
-        android:gravity="center_vertical">
-
-        <EditText android:id="@+id/data"
-            android:layout_width="0dip"
-            android:layout_weight="1"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="8dip"
-            android:paddingBottom="4dip"
-            android:layout_gravity="center_vertical"
-            android:background="@null"
-        />
-
-        <ImageButton
-            style="@android:style/Widget.Button.Inset"
-            android:src="@android:drawable/ic_delete"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="2dip"
-            android:gravity="center"
-        />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/focus_after_removal.xml b/proprietary/frameworks/base/tests/text/res/layout/focus_after_removal.xml
deleted file mode 100755
index f4e388d695c95a0a79e3643861132e2ce4c3d73c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/focus_after_removal.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/samples/SampleCode/res/layout/baseline_1.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <LinearLayout android:id="@+id/leftLayout"
-        android:orientation="vertical"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <Button android:id="@+id/topLeftButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="3dip"
-            android:text="@string/left_top" />
-        <Button android:id="@+id/bottomLeftButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="3dip"
-            android:text="@string/left_bottom" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <Button android:id="@+id/topRightButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="3dip"
-            android:text="@string/right_top" />
-        <Button android:id="@+id/bottomRightButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="3dip"
-            android:text="@string/right_bottom" />
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/focus_listener.xml b/proprietary/frameworks/base/tests/text/res/layout/focus_listener.xml
deleted file mode 100755
index 6faa21c32013d1d9394258d12416613ef74702d4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/focus_listener.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/samples/SampleCode/res/layout/baseline_1.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <Button android:id="@+id/left"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="3dip"
-        android:text="@string/left_top" />
-
-    <Button android:id="@+id/right"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="3dip"
-        android:text="@string/left_bottom" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/framelayout_gravity.xml b/proprietary/frameworks/base/tests/text/res/layout/framelayout_gravity.xml
deleted file mode 100755
index e89fce596935e182ead0baca1455d49899b4ec04..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/framelayout_gravity.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/parent"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Button android:id="@+id/left"
-        android:layout_gravity="left"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/right"
-        android:layout_gravity="right"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/center_horizontal"
-        android:layout_gravity="center_horizontal"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/left_center_vertical"
-        android:layout_gravity="center_vertical|left"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/right_center_vertical"
-        android:layout_gravity="center_vertical|right"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/center"
-        android:layout_gravity="center"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/left_bottom"
-        android:layout_gravity="bottom|left"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/right_bottom"
-        android:layout_gravity="bottom|right"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/center_horizontal_bottom"
-        android:layout_gravity="bottom|center_horizontal"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</FrameLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/framelayout_margin.xml b/proprietary/frameworks/base/tests/text/res/layout/framelayout_margin.xml
deleted file mode 100755
index 9120bcb52a4e68256dbdc5143962a5dd2bfa617f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/framelayout_margin.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/parent"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Button android:id="@+id/left"
-        android:layout_gravity="left"
-        android:layout_marginLeft="12dip"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/right"
-        android:layout_gravity="right"
-        android:layout_marginRight="12dip"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/top"
-        android:layout_gravity="top|center_horizontal"
-        android:layout_marginTop="12dip"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/bottom"
-        android:layout_gravity="bottom|center_horizontal"
-        android:layout_marginBottom="12dip"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</FrameLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/grid_in_horizontal.xml b/proprietary/frameworks/base/tests/text/res/layout/grid_in_horizontal.xml
deleted file mode 100755
index 62d7bcb5302176ab3932301a55a80eeab4d2816c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/grid_in_horizontal.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="horizontal"
-	android:layout_width="match_parent" 
-    android:layout_height="match_parent">
-	
-	<GridView android:id="@+id/grid"
-	    android:layout_width="0dip" 
-	    android:layout_height="match_parent"
-	    android:layout_weight="1"
-	    android:padding="10dip"
-	    android:verticalSpacing="10dp"    
-	    android:horizontalSpacing="10dp"
-	    android:numColumns="auto_fit"
-	    android:columnWidth="60dp"
-	    android:stretchMode="columnWidth" />
-	    
-    <ImageButton
-        android:src="@drawable/sym_now_playing_pause_1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-    	
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/grid_in_vertical.xml b/proprietary/frameworks/base/tests/text/res/layout/grid_in_vertical.xml
deleted file mode 100755
index fea459aa1319cb04cbae716a1c1ef8bf2cd47f6a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/grid_in_vertical.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="match_parent" 
-    android:layout_height="match_parent">
-	
-	<GridView android:id="@+id/grid"
-	    android:layout_width="wrap_content" 
-	    android:layout_height="wrap_content"
-	    android:numColumns="auto_fit" />
-	    
-    <ImageButton
-        android:src="@drawable/sym_now_playing_pause_1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-   
-	<ImageButton
-        android:src="@drawable/sym_now_playing_pause_1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-        
-	<ImageButton
-        android:src="@drawable/sym_now_playing_pause_1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-         	
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/grid_padding.xml b/proprietary/frameworks/base/tests/text/res/layout/grid_padding.xml
deleted file mode 100755
index bd666e1ae048f4a12c2769d03f08ca55c7f269bb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/grid_padding.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<GridView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/grid"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:padding="10dip"
-	android:verticalSpacing="10dp"
-	android:horizontalSpacing="10dp"
-	android:numColumns="auto_fit"
-	android:columnWidth="50dp" />
diff --git a/proprietary/frameworks/base/tests/text/res/layout/grid_scroll_listener.xml b/proprietary/frameworks/base/tests/text/res/layout/grid_scroll_listener.xml
deleted file mode 100755
index 82b1058a8edac64d4dbbedddf5ccbc7794ba39a5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/grid_scroll_listener.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="match_parent" 
-    android:layout_height="match_parent">
-	
-	<GridView android:id="@+id/grid"
-	    android:layout_width="match_parent" 
-	    android:layout_height="0dip"
-	    android:layout_weight="1"
-	    android:padding="10dip"
-	    android:verticalSpacing="10dp"    
-	    android:horizontalSpacing="10dp"
-	    android:numColumns="auto_fit"
-	    android:columnWidth="60dp"
-	    android:stretchMode="columnWidth"
-	    android:gravity="center"/>
-	    
-    <TextView android:id="@+id/text"
-    	android:layout_width="match_parent" 
-    	android:layout_height="wrap_content"
-    	android:gravity="center_horizontal"/>
-    	
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/grid_thrasher.xml b/proprietary/frameworks/base/tests/text/res/layout/grid_thrasher.xml
deleted file mode 100755
index 346acff9f9c3a0d957b5ea724bd27ec420a85a8c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/grid_thrasher.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="match_parent" 
-    android:layout_height="match_parent">
-	
-	<GridView android:id="@+id/grid"
-	    android:layout_width="match_parent" 
-		android:layout_height="match_parent"
-	    android:padding="10dip"
-	    android:verticalSpacing="10dp"    
-	    android:horizontalSpacing="10dp"
-	    android:numColumns="auto_fit"
-	    android:columnWidth="60dp"
-	    android:stretchMode="columnWidth"
-	    android:gravity="center"/>
-	    
-    <TextView android:id="@+id/text"
-    	android:layout_width="match_parent" 
-    	android:layout_height="wrap_content"
-    	android:gravity="center_horizontal"/>
-    	
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/include_button.xml b/proprietary/frameworks/base/tests/text/res/layout/include_button.xml
deleted file mode 100755
index 5857fa3bfd1e50ffad9fb39ce009c8961b5b1136..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/include_button.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/included_button"
-    android:text="@string/include_button"        
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content" />
diff --git a/proprietary/frameworks/base/tests/text/res/layout/include_button_with_size.xml b/proprietary/frameworks/base/tests/text/res/layout/include_button_with_size.xml
deleted file mode 100755
index 0cd8eaaf3f59c7c7d54ab8fc8495345c81e96633..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/include_button_with_size.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/included_button"
-    android:text="@string/include_button"        
-    android:layout_width="23dip"
-    android:layout_height="23dip" />
diff --git a/proprietary/frameworks/base/tests/text/res/layout/include_tag.xml b/proprietary/frameworks/base/tests/text/res/layout/include_tag.xml
deleted file mode 100755
index b2f6ab1cf6326f3ca3e3123be109add31181df75..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/include_tag.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:text="@string/include_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <include
-        layout="@layout/include_button" />
-
-    <include
-        layout="@layout/include_button"
-        android:id="@+id/included_button_overriden"
-        android:layout_width="237dip"
-        android:layout_height="123dip" />
-
-    <include
-        layout="@layout/include_button"
-        android:id="@+id/included_button_visibility"
-        android:visibility="invisible" />
-    
-    <include
-        layout="@layout/include_button_with_size"
-        android:id="@+id/included_button_with_size" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/inflated_expandablelistview.xml b/proprietary/frameworks/base/tests/text/res/layout/inflated_expandablelistview.xml
deleted file mode 100755
index 6f683e530957264e838ed4b99c0227f631976858..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/inflated_expandablelistview.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ExpandableListView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/elv"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent" />
diff --git a/proprietary/frameworks/base/tests/text/res/layout/interrogation_activity.xml b/proprietary/frameworks/base/tests/text/res/layout/interrogation_activity.xml
deleted file mode 100755
index 64af321d3619e7998776d4b087ea3ba55a388e12..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/interrogation_activity.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/root"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    >
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        >
-        <Button
-            android:id="@+id/button1"
-            android:layout_width="160px"
-            android:layout_height="100px"
-            android:text="@string/button1"
-        />
-        <Button
-            android:id="@+id/button2"
-            android:layout_width="160px"
-            android:layout_height="100px"
-            android:text="@string/button2"
-        />
-        <Button
-            android:id="@+id/button3"
-            android:layout_width="160px"
-            android:layout_height="100px"
-            android:text="@string/button3"
-        />
-    </LinearLayout>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        >
-        <Button
-            android:id="@+id/button4"
-            android:layout_width="160px"
-            android:layout_height="100px"
-            android:text="@string/button4"
-        />
-        <Button
-            android:id="@+id/button5"
-            android:layout_width="160px"
-            android:layout_height="100px"
-            android:text="@string/button5"
-        />
-        <Button
-            android:id="@+id/button6"
-            android:layout_width="160px"
-            android:layout_height="100px"
-            android:text="@string/button6"
-            android:contentDescription="contentDescription"
-        />
-    </LinearLayout>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        >
-        <Button
-            android:id="@+id/button7"
-            android:layout_width="160px"
-            android:layout_height="100px"
-            android:text="@string/button7"
-        />
-        <Button
-            android:id="@+id/button8"
-            android:layout_width="160px"
-            android:layout_height="100px"
-            android:text="@string/button8"
-        />
-        <Button
-            android:id="@+id/button9"
-            android:layout_width="160px"
-            android:layout_height="100px"
-            android:text="@string/button9"
-        />
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/layout_five.xml b/proprietary/frameworks/base/tests/text/res/layout/layout_five.xml
deleted file mode 100755
index 9923eaf0fdd2ebdfd6415b427d054301a488c110..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/layout_five.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-	<TextView android:id="@+id/text" android:text="@string/layout_five_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" />
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/layout_four.xml b/proprietary/frameworks/base/tests/text/res/layout/layout_four.xml
deleted file mode 100755
index e5a78bcfdcf214e7ba9373d8d2257333388eb286..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/layout_four.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text" android:text="@string/layout_four_text_text"/>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/layout_one.xml b/proprietary/frameworks/base/tests/text/res/layout/layout_one.xml
deleted file mode 100755
index 69662466c02cfbfccbd7639fdd823a2b542be282..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/layout_one.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<view xmlns:android="http://schemas.android.com/apk/res/android" class="android.view.InflateTest$ViewOne" android:id="@+id/viewOne" android:layout_width="match_parent" android:layout_height="match_parent"/>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/layout_six.xml b/proprietary/frameworks/base/tests/text/res/layout/layout_six.xml
deleted file mode 100755
index b78082d164e88ad76965c87234725892d37e397f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/layout_six.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-	<TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" />
-	<TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" />
-	<TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" />
-	<TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" />
-	<TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" />
-	<TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" />
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/layout_tag.xml b/proprietary/frameworks/base/tests/text/res/layout/layout_tag.xml
deleted file mode 100755
index 7fb0489478e6187389cd7230eec61bb4eafad6f0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/layout_tag.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<view xmlns:android="http://schemas.android.com/apk/res/android"
-    class="android.view.InflateTest$ViewOne"
-    android:id="@+id/viewOne" android:tag="MyTag"
-    android:layout_width="match_parent" android:layout_height="match_parent"/>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/layout_three.xml b/proprietary/frameworks/base/tests/text/res/layout/layout_three.xml
deleted file mode 100755
index 7242fc88ca1488b0c24e5ca17e29f3b83b6e6a8f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/layout_three.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-	<view class="android.view.InflateTest$ViewOne" android:id="@+id/view1" android:layout_width="match_parent" android:layout_height="match_parent"/>
-	<view class="android.view.InflateTest$ViewOne" android:id="@+id/view2" android:layout_width="match_parent" android:layout_height="match_parent"/>
-	<view class="android.view.InflateTest$ViewOne" android:id="@+id/view3" android:layout_width="match_parent" android:layout_height="match_parent"/>
-	<view class="android.view.InflateTest$ViewOne" android:id="@+id/view4" android:layout_width="match_parent" android:layout_height="match_parent"/>
-	<view class="android.view.InflateTest$ViewOne" android:id="@+id/view5" android:layout_width="match_parent" android:layout_height="match_parent"/>
-	<view class="android.view.InflateTest$ViewOne" android:id="@+id/view6" android:layout_width="match_parent" android:layout_height="match_parent"/>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/layout_two.xml b/proprietary/frameworks/base/tests/text/res/layout/layout_two.xml
deleted file mode 100755
index 9fb7d3bea5c309874ec986b416246782dc73cbea..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/layout_two.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-	<view class="android.view.InflateTest$ViewOne" android:id="@+id/viewOne" android:layout_width="match_parent" android:layout_height="match_parent"/>
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/text/res/layout/linear_layout_buttons.xml b/proprietary/frameworks/base/tests/text/res/layout/linear_layout_buttons.xml
deleted file mode 100755
index bcb28e7df03a60c15e5a4f17d686a64eb5657013..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/linear_layout_buttons.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/samples/SampleCode/res/layout/baseline_1.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Button
-        android:id="@+id/button1"
-        android:layout_width="match_parent"
-        android:layout_height="0sp"
-        android:layout_weight="1"
-        android:text="@string/keypad_one"/>
-
-    <Button
-        android:id="@+id/button2"
-        android:layout_width="match_parent"
-        android:layout_height="0sp"
-        android:layout_weight="1"
-        android:text="@string/keypad_two"/>
-
-    <Button
-        android:id="@+id/button3"
-        android:layout_width="match_parent"
-        android:layout_height="0sp"
-        android:layout_weight="1"
-        android:text="@string/keypad_three"/>
-
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/linear_layout_edittext_then_button.xml b/proprietary/frameworks/base/tests/text/res/layout/linear_layout_edittext_then_button.xml
deleted file mode 100755
index ab76e29c5fa1c732140c0894227af9750f7ce57c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/linear_layout_edittext_then_button.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/samples/SampleCode/res/layout/baseline_1.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <EditText
-        android:id="@+id/editText"
-        android:layout_width="match_parent"
-        android:layout_height="0sp"
-        android:layout_weight="1"/>
-
-    <Button
-        android:id="@+id/button"
-        android:layout_width="match_parent"
-        android:layout_height="0sp"
-        android:layout_weight="1"
-        android:text="@string/keypad_one"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/linear_layout_grid.xml b/proprietary/frameworks/base/tests/text/res/layout/linear_layout_grid.xml
deleted file mode 100755
index 67b687705f33590d4a0c57e0412fbc707b5f4a52..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/linear_layout_grid.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/samples/SampleCode/res/layout/baseline_1.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout android:id="@+id/column1"
-        android:layout_width="match_parent"
-        android:layout_height="0sp"
-        android:layout_weight="1"
-        android:orientation="horizontal">
-
-        <Button
-            android:layout_width="0sp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/keypad_one"/>
-
-        <Button
-            android:layout_width="0sp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/keypad_two"/>
-
-        <Button
-            android:layout_width="0sp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/keypad_three"/>
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/column2"
-        android:layout_width="match_parent"
-        android:layout_height="0sp"
-        android:layout_weight="1"
-        android:orientation="horizontal">
-
-        <Button
-            android:layout_width="0sp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/keypad_four"/>
-
-        <Button
-            android:layout_width="0sp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/keypad_five"/>
-
-        <Button
-            android:layout_width="0sp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/keypad_six"/>
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/column3"
-        android:layout_width="match_parent"
-        android:layout_height="0sp"
-        android:layout_weight="1"
-        android:orientation="horizontal">
-
-        <Button
-            android:layout_width="0sp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/keypad_seven"/>
-
-        <Button
-            android:layout_width="0sp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/keypad_eight"/>
-
-        <Button
-            android:layout_width="0sp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/keypad_nine"/>
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/linear_layout_listview_height.xml b/proprietary/frameworks/base/tests/text/res/layout/linear_layout_listview_height.xml
deleted file mode 100755
index 873b2d264a56519994d3f5312ef13228e51ed025..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/linear_layout_listview_height.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    
-    <!-- Outer linear layout providing vertical layout -->
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
-        
-        <!-- The control buttons -->
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-            
-            <Button
-                android:id="@+id/button1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/linear_listheight_fixed"/>
-        
-            <Button
-                android:id="@+id/button2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/linear_listheight_fill"/>
-        
-            <Button
-                android:id="@+id/button3"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/linear_listheight_hide"/>
-        </LinearLayout>
-        
-        <!-- The list view -->
-        <ListView 
-            android:id="@+id/inner_list"
-            android:layout_width="200dip"
-            android:layout_height="match_parent"
-            android:background="@android:drawable/spinner_dropdown_background"
-            android:divider="@android:drawable/divider_horizontal_bright" />
- 
-    </LinearLayout>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/linear_layout_spinner_then_button.xml b/proprietary/frameworks/base/tests/text/res/layout/linear_layout_spinner_then_button.xml
deleted file mode 100755
index 53c028087b1fc515bd155f0a720bfd3ad444d49a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/linear_layout_spinner_then_button.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-        
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-   android:orientation="horizontal"
-   android:layout_width="match_parent"
-   android:layout_height="wrap_content">
-
-   <Spinner android:id="@+id/reminder_value"
-       android:layout_width="0dip"
-       android:layout_height="wrap_content"
-       android:layout_weight="0.7"
-       android:entries="@array/reminder_minutes_labels"/>
-
-   <Button android:id="@+id/reminder_remove"
-       android:layout_width="0dip"
-       android:layout_height="wrap_content"
-       android:layout_weight="0.3"
-       android:text="@string/show" />
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/linear_layout_textviews.xml b/proprietary/frameworks/base/tests/text/res/layout/linear_layout_textviews.xml
deleted file mode 100755
index ccec213991930e698ddaab321d6119d5ff505cec..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/linear_layout_textviews.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout"
-    android:background="#FFFF0000"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <EditText
-        android:id="@+id/editText1"
-        android:text="@string/text"
-        android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="1.0" />
-
-    <EditText
-        android:id="@+id/editText2"
-        android:text="@string/text"
-        android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="1.0" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/linear_layout_weight.xml b/proprietary/frameworks/base/tests/text/res/layout/linear_layout_weight.xml
deleted file mode 100755
index bb138df0021ba44d7cb3272c782f566913b91e38..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/linear_layout_weight.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout"
-    android:background="#FFFFFFFF"
-    android:orientation="horizontal"
-    android:layout_width="87dip"
-    android:layout_height="wrap_content">
-
-    <View
-        android:id="@+id/child1"
-        android:background="#FFFF0000"
-        android:layout_width="20dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="1.0" />
-
-    <View
-        android:id="@+id/child2"
-        android:background="#FF00FF00"
-        android:layout_width="20dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="1.0" />
-
-    <View
-        android:background="#FF0000FF"
-        android:id="@+id/child3"
-        android:layout_width="20dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="1.0" />
-
-    <View
-        android:background="#FFFF00FF"
-        android:id="@+id/child4"
-        android:layout_width="20dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="1.0" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/list_dividers.xml b/proprietary/frameworks/base/tests/text/res/layout/list_dividers.xml
deleted file mode 100755
index 93810b49a9acf982b7ecd270635221f34253ea17..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/list_dividers.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <ListView android:id="@android:id/list"
-        android:paddingRight="15dip"
-        android:layout_marginLeft="50dip"
-        android:layout_width="150dip"
-        android:layout_height="300dip" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/list_filter.xml b/proprietary/frameworks/base/tests/text/res/layout/list_filter.xml
deleted file mode 100755
index 0ab7101c68548b2b31a739bf76db1738766120f8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/list_filter.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent" 
-    android:layout_height="match_parent">
-    
-    <FrameLayout android:id="@+id/frame"
-        android:layout_width="match_parent" 
-        android:layout_height="0dip"
-        android:layout_weight="1">
-
-        <ListView android:id="@android:id/list"
-            android:layout_width="match_parent" 
-            android:layout_height="match_parent"
-            android:drawSelectorOnTop="false" />
-            
-    </FrameLayout>
-    
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent" 
-        android:layout_height="wrap_content">
-        
-        <Button android:id="@+id/hide"
-            android:layout_width="wrap_content" 
-            android:layout_height="wrap_content"
-            android:text="@string/hide" />
-         
-        <Button android:id="@+id/show"
-            android:layout_width="wrap_content" 
-            android:layout_height="wrap_content"
-            android:text="@string/show" /> 
-            
-    </LinearLayout>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/list_in_horizontal.xml b/proprietary/frameworks/base/tests/text/res/layout/list_in_horizontal.xml
deleted file mode 100755
index b7706288e859c7931d3b6acce27d4f18802b6fde..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/list_in_horizontal.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TableRow>
-
-        <ListView android:id="@+id/list" />
-
-        <ImageButton android:src="@drawable/sym_now_playing_pause_1" />
-
-    </TableRow>
-
-</TableLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/list_in_vertical.xml b/proprietary/frameworks/base/tests/text/res/layout/list_in_vertical.xml
deleted file mode 100755
index f951cb7d05a5d8b6aea62f81fc44aad2bd3fefe4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/list_in_vertical.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <ListView android:id="@+id/list"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-        <ImageButton
-            android:src="@drawable/sym_now_playing_pause_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <ImageButton
-            android:src="@drawable/sym_now_playing_pause_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <ImageButton
-            android:src="@drawable/sym_now_playing_pause_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-         	
-    </LinearLayout>
-</ScrollView>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/list_recycler_profiling.xml b/proprietary/frameworks/base/tests/text/res/layout/list_recycler_profiling.xml
deleted file mode 100755
index 3fc6bd62c02a1da55dc993632bba2d42994f9b21..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/list_recycler_profiling.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ListView android:id="@+id/list"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1.0" />
-
-    <ImageButton android:id="@+id/pause"
-        android:src="@drawable/sym_now_playing_pause_1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/list_scroll_listener.xml b/proprietary/frameworks/base/tests/text/res/layout/list_scroll_listener.xml
deleted file mode 100755
index 58ab55fdcf830e9352614f3111d5dcc3a0a8aa31..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/list_scroll_listener.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="match_parent" 
-    android:layout_height="match_parent">
-	
-	<ListView android:id="@android:id/list"
-	    android:layout_width="match_parent" 
-	    android:layout_height="0dip"
-	    android:layout_weight="1"
-	    android:drawSelectorOnTop="false"/>
-	    
-    <TextView android:id="@+id/text"
-    	android:layout_width="match_parent" 
-    	android:layout_height="wrap_content"
-    	android:gravity="center_horizontal"/>
-    	
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/list_take_focus_from_side.xml b/proprietary/frameworks/base/tests/text/res/layout/list_take_focus_from_side.xml
deleted file mode 100755
index ee40019060953c8afa03e3b047b6e1f0aa2562ea..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/list_take_focus_from_side.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent" 
-    android:layout_height="match_parent">
-    
-    <ListView android:id="@android:id/list"
-        android:layout_width="0dip" 
-        android:layout_weight="1"
-        android:layout_height="match_parent"
-        android:drawSelectorOnTop="false"/>
-        
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="wrap_content" 
-        android:layout_height="match_parent">
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/list_thrasher.xml b/proprietary/frameworks/base/tests/text/res/layout/list_thrasher.xml
deleted file mode 100755
index 58ab55fdcf830e9352614f3111d5dcc3a0a8aa31..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/list_thrasher.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="match_parent" 
-    android:layout_height="match_parent">
-	
-	<ListView android:id="@android:id/list"
-	    android:layout_width="match_parent" 
-	    android:layout_height="0dip"
-	    android:layout_weight="1"
-	    android:drawSelectorOnTop="false"/>
-	    
-    <TextView android:id="@+id/text"
-    	android:layout_width="match_parent" 
-    	android:layout_height="wrap_content"
-    	android:gravity="center_horizontal"/>
-    	
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/list_with_button_above.xml b/proprietary/frameworks/base/tests/text/res/layout/list_with_button_above.xml
deleted file mode 100755
index 18bcf6b10bbed18835b80072db5e633b54b93f84..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/list_with_button_above.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Simple layout with a button and a list below, can be used to build more
- sophisticated test cases by adding stuff to the list programatically.-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/layout"
-        android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-
-    <Button android:id="@+id/button"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/button_above_list_label"/>
-
-
-    <ListView android:id="@android:id/list"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:paddingTop="2dip"
-        android:drawSelectorOnTop="false"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/list_with_disappearing_item_bug_item.xml b/proprietary/frameworks/base/tests/text/res/layout/list_with_disappearing_item_bug_item.xml
deleted file mode 100755
index 82af6cad0010acc0906e633c97fa68f640acfea9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/list_with_disappearing_item_bug_item.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- A layout is needed to reprod the bug. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight">
-
-    <TextView 
-        android:id="@+id/text1"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:gravity="center_vertical"
-        android:paddingLeft="27dip"
-    />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/list_with_empty_view.xml b/proprietary/frameworks/base/tests/text/res/layout/list_with_empty_view.xml
deleted file mode 100755
index 23bb65811373e66fd90f61c16a4506b9e22a634f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/list_with_empty_view.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
- 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <ListView android:id="@android:id/list"
-        android:drawSelectorOnTop="false"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-    <TextView android:id="@+id/empty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:textSize="36sp"
-        android:textColor="#999"
-        android:visibility="gone"
-        android:text="@string/empty_list" />
-
-</FrameLayout>    
diff --git a/proprietary/frameworks/base/tests/text/res/layout/longpress.xml b/proprietary/frameworks/base/tests/text/res/layout/longpress.xml
deleted file mode 100755
index 3a69fae4e1fb4676f0648a929617f1aecc9e0ade..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/longpress.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <View android:id="@+id/simple_view"
-        android:background="@drawable/blue"
-        android:layout_width="20dip"
-        android:layout_height="20dip"
-        android:focusable="true" />
-    
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/mail_message.xml b/proprietary/frameworks/base/tests/text/res/layout/mail_message.xml
deleted file mode 100755
index 7f15e4f4ae8a24dd1de859f17091653ec73704e2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/mail_message.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- A layout similar to a gmail message.  useful for setting up tests, like
- a list with a list of messages.-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/subject"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"/>
-
-    <WebView android:id="@+id/body"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/merge_child.xml b/proprietary/frameworks/base/tests/text/res/layout/merge_child.xml
deleted file mode 100755
index 9972924999cceab56b44ce0338e41bf3d32cc15c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/merge_child.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <TextView
-        android:text="@string/include_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:text="@string/include_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:text="@string/include_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</merge>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/merge_tag.xml b/proprietary/frameworks/base/tests/text/res/layout/merge_tag.xml
deleted file mode 100755
index 9eec493823dc702303831841f50b4d7117d354de..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/merge_tag.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <TextView
-        android:text="@string/include_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:text="@string/include_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:text="@string/include_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:text="@string/include_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <include layout="@layout/merge_child" />
-
-</merge>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/popup_window_visibility.xml b/proprietary/frameworks/base/tests/text/res/layout/popup_window_visibility.xml
deleted file mode 100755
index 3aa714d9f05cef672aa71e35fd787e54102a7797..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/popup_window_visibility.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent" 
-    android:layout_height="match_parent">
-    
-    <FrameLayout android:id="@+id/frame"
-        android:layout_width="match_parent" 
-        android:layout_height="0dip"
-        android:layout_weight="1">
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent" 
-            android:layout_height="match_parent">
-                
-            <Spinner android:id="@+id/spinner"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-        
-            <AutoCompleteTextView android:id="@+id/auto"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
-                
-        </LinearLayout>
-        
-    </FrameLayout>
-    
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent" 
-        android:layout_height="wrap_content">
-        
-        <Button android:id="@+id/hide"
-            android:layout_width="wrap_content" 
-            android:layout_height="wrap_content"
-            android:text="@string/hide" />
-         
-        <Button android:id="@+id/show"
-            android:layout_width="wrap_content" 
-            android:layout_height="wrap_content"
-            android:text="@string/show" /> 
-            
-    </LinearLayout>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/pre_draw_listener.xml b/proprietary/frameworks/base/tests/text/res/layout/pre_draw_listener.xml
deleted file mode 100755
index f431f140cce18a81862e7e49c9f9aac45b06fd2b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/pre_draw_listener.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent" 
-    android:layout_height="match_parent">
-    
-
-	<ScrollView 
-		android:orientation="vertical"
-        android:layout_width="match_parent" 
-        android:layout_height="0dip"
-        android:layout_weight="1">
-        
-        <view class="android.view.PreDrawListener$MyLinearLayout" android:id="@+id/frame"
-            android:orientation="vertical"
-            android:layout_width="match_parent" 
-            android:layout_height="match_parent" />
-
-    </ScrollView>
-        
-    <Button android:id="@+id/go"
-        android:layout_width="wrap_content" 
-        android:layout_height="wrap_content"
-        android:text="@string/go" />
-         
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/radiogroup_checkedchild.xml b/proprietary/frameworks/base/tests/text/res/layout/radiogroup_checkedchild.xml
deleted file mode 100755
index db88f4dc2f2716879762c54a7cef0f5f4f3e09db..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/radiogroup_checkedchild.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/group"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-      <RadioButton
-          android:id="@+id/value_one"
-          android:layout_width="match_parent"
-          android:layout_height="match_parent"
-          android:textColor="#555555"
-          android:checked="true"
-          android:text="@string/visibility_1_view_1" />
-
-      <RadioButton
-          android:id="@+id/value_two"
-          android:layout_width="match_parent"
-          android:layout_height="match_parent"
-          android:textColor="#555555"
-          android:text="@string/visibility_1_view_2" />
-
-      <RadioButton
-          android:id="@+id/value_three"
-          android:layout_width="match_parent"
-          android:layout_height="match_parent"
-          android:textColor="#555555"
-          android:text="@string/visibility_1_view_3" />
-
-</RadioGroup>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/remote_view_host.xml b/proprietary/frameworks/base/tests/text/res/layout/remote_view_host.xml
deleted file mode 100755
index 19d0a738deccda76094ca5cd141dbbe00787c760..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/remote_view_host.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/remote_view_test_bad_1.xml b/proprietary/frameworks/base/tests/text/res/layout/remote_view_test_bad_1.xml
deleted file mode 100755
index bdac697a9f6c10d6815abb321e32588650bb47fe..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/remote_view_test_bad_1.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/linear"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <EditText android:id="@+id/edit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-           
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/remote_view_test_bad_2.xml b/proprietary/frameworks/base/tests/text/res/layout/remote_view_test_bad_2.xml
deleted file mode 100755
index 630e60311a97f6dedb8381fac1721d1abd2d23bb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/remote_view_test_bad_2.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/linear"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <WebView android:id="@+id/web"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-            
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/remote_view_test_good.xml b/proprietary/frameworks/base/tests/text/res/layout/remote_view_test_good.xml
deleted file mode 100755
index ce9755bf9c023ff9e51cb2d28203b1dd3f83c34f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/remote_view_test_good.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/linear"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-        
-    <ImageView android:id="@+id/image"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-        
-    <FrameLayout android:id="@+id/frame"
-        android:layout_width="10dip"
-        android:layout_height="10dip" />
-        
-    <RelativeLayout android:id="@+id/relative"
-        android:layout_width="10dip"
-        android:layout_height="10dip" />
-   
-    <AbsoluteLayout android:id="@+id/absolute"
-        android:layout_width="10dip"
-        android:layout_height="10dip" />       
-        
-    <ProgressBar android:id="@+id/progress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />      
-
-    <ImageButton android:id="@+id/image_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/scroll_to_rect_with_internal_scroll.xml b/proprietary/frameworks/base/tests/text/res/layout/scroll_to_rect_with_internal_scroll.xml
deleted file mode 100755
index b6ec479ca30e10ba48d837160c32b36bc85b0267..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/scroll_to_rect_with_internal_scroll.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/samples/SampleCode/res/layout/scroll_view_1.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- Demonstrates scrolling with a ScrollView. -->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/scrollView"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:scrollbars="none">
-
-    <LinearLayout
-        android:id="@+id/layout"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-
-        <Button android:id="@+id/scrollToBlob"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/scroll_top_button"/>
-
-        <TextView android:id="@+id/blob"
-            android:layout_width="match_parent"
-            android:layout_height="80dip"
-            android:layout_marginTop="500dip"
-            android:layout_marginBottom="5dip"/>
-
-
-    </LinearLayout>
-</ScrollView>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/scroll_to_rectangle.xml b/proprietary/frameworks/base/tests/text/res/layout/scroll_to_rectangle.xml
deleted file mode 100755
index 55d057d4b4a0a09405dd944a1070cc5b1a0f776f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/scroll_to_rectangle.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/samples/SampleCode/res/layout/scroll_view_1.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- Demonstrates scrolling with a ScrollView. -->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/scrollView"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:scrollbars="none">
-
-    <LinearLayout
-        android:id="@+id/layout"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-
-        <Button android:id="@+id/scrollToRectFromTop"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/scroll_top_button"/>
-
-        <Button android:id="@+id/scrollToRectFromTop2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingBottom="10dip"
-            android:text="@string/scroll_top_button2"/>
-
-        <TextView android:id="@+id/topBlob"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dip"
-            android:layout_marginBottom="5dip"/>
-
-        <TextView android:id="@+id/childToMakeVisible"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dip"
-            android:layout_marginBottom="5dip"
-            android:text="@string/scroll_to_me"/>
-
-        <TextView android:id="@+id/bottomBlob"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dip"
-            android:layout_marginBottom="5dip"/>
-
-        <Button android:id="@+id/scrollToRectFromBottom2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="10dip"
-            android:text="@string/scroll_bottom_button2"/>
-
-        <Button android:id="@+id/scrollToRectFromBottom"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/scroll_bottom_button"/>
-
-
-    </LinearLayout>
-</ScrollView>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/scrollview_linear_layout.xml b/proprietary/frameworks/base/tests/text/res/layout/scrollview_linear_layout.xml
deleted file mode 100755
index a3c12ce61f374f7a8d5686526bc68ad396c284c1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/scrollview_linear_layout.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/scrollView"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:scrollbars="none">
-
-    <LinearLayout
-        android:id="@+id/layout"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-    </LinearLayout>
-
-
-</ScrollView>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/scrollview_with_webviews.xml b/proprietary/frameworks/base/tests/text/res/layout/scrollview_with_webviews.xml
deleted file mode 100755
index e0c0c66a75ca87a8532b462447cbbedc29805bc3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/scrollview_with_webviews.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/scrollView"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:scrollbars="none">
-
-    <LinearLayout
-        android:id="@+id/layout"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-
-        <WebView android:id="@+id/wb1"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content"/>
-
-        <Button android:id="@+id/button"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content"/>
-
-        <WebView android:id="@+id/wb2"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content"/>
-
-    </LinearLayout>
-
-
-</ScrollView>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/table_layout_cell_span.xml b/proprietary/frameworks/base/tests/text/res/layout/table_layout_cell_span.xml
deleted file mode 100755
index fceef0a4bdfb5105a38ccde1d7992eb270c79d8d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/table_layout_cell_span.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TableRow>
-        <TextView android:id="@+id/a"
-            android:text="@string/table_layout_a"
-            android:background="#FFFF0000"
-            android:padding="3dip" />
-        <TextView android:id="@+id/b"
-            android:text="@string/table_layout_b"
-            android:background="#FF00FF00"
-            android:padding="3dip" />
-        <TextView android:id="@+id/c"
-            android:text="@string/table_layout_c"
-            android:background="#FF0000FF"
-            android:padding="3dip" />
-    </TableRow>
-
-    <TableRow>
-        <TextView  android:id="@+id/spanThenCell"
-            android:text="@string/table_layout_d"
-            android:layout_span="2"
-            android:gravity="center_horizontal"
-            android:background="#FF0000FF"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_e"
-            android:background="#FF00FF00"
-            android:padding="3dip" />
-    </TableRow>
-
-    <TableRow>
-        <TextView
-            android:text="@string/table_layout_f"
-            android:background="#FFFF00FF"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_g"
-            android:background="#FF00FF00"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_h"
-            android:background="#FFFF0000"
-            android:padding="3dip" />
-    </TableRow>
-
-    <TableRow>
-        <TextView
-            android:text="@string/table_layout_a"
-            android:background="#FF00FF00"
-            android:padding="3dip" />
-        <TextView android:id="@+id/cellThenSpan"
-            android:text="@string/table_layout_b"
-            android:layout_span="2"
-            android:gravity="center_horizontal"
-            android:background="#FF0000FF"
-            android:padding="3dip" />
-    </TableRow>
-
-    <TableRow>
-        <TextView android:id="@+id/span"
-            android:text="@string/table_layout_g"
-            android:layout_span="3"
-            android:gravity="center_horizontal"
-            android:background="#FFC0C0C0"
-            android:padding="3dip" />
-    </TableRow>
-</TableLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/table_layout_fixed_width.xml b/proprietary/frameworks/base/tests/text/res/layout/table_layout_fixed_width.xml
deleted file mode 100755
index 507701ed1a49041e6850afc90dcd7d7fba77e79f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/table_layout_fixed_width.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TableRow>
-        <View android:id="@+id/fixed_height"
-            android:layout_height="48dip"
-            android:background="#FF909090" />
-        <TextView android:id="@+id/fixed_width"
-            android:layout_width="150dip"
-            android:text="@string/table_layout_export"
-            android:background="#FFFF0000"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_export_shortcut"
-            android:background="#FF00FFFF"
-            android:gravity="right"
-            android:padding="3dip" />
-    </TableRow>
-
-    <TableRow>
-        <View
-            android:layout_height="48dip"
-            android:background="#FF909090" />
-        <TextView android:id="@+id/non_fixed_width"
-            android:text="@string/table_layout_export"
-            android:background="#FFFF0000"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_export_shortcut"
-            android:background="#FF00FFFF"
-            android:gravity="right"
-            android:padding="3dip" />
-    </TableRow>
-
-</TableLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/table_layout_horizontal_gravity.xml b/proprietary/frameworks/base/tests/text/res/layout/table_layout_horizontal_gravity.xml
deleted file mode 100755
index fb72d81bd4a335e758fb69986befd114889abe5c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/table_layout_horizontal_gravity.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:stretchColumns="1">
-
-    <TableRow>
-        <TextView android:id="@+id/reference"
-            android:layout_column="1"
-            android:background="#FF0000FF"
-            android:text="@string/table_layout_open"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_open_shortcut"
-            android:gravity="right"
-            android:padding="3dip" />
-    </TableRow>
-
-    <TableRow>
-        <!-- Horizontally centers the content of the cell -->
-        <TextView android:id="@+id/center"
-            android:layout_column="1"
-            android:text="@string/table_layout_save_as"
-            android:background="#FFFF0000"
-            android:layout_gravity="center_horizontal"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_save_as_shortcut"
-            android:background="#FFFF00FF"
-            android:gravity="right"
-            android:padding="3dip" />
-    </TableRow>
-
-    <TableRow>
-        <View
-            android:layout_height="24dip"
-            android:background="#FF909090" />
-        <!-- Aligns the content of the cell to the bottom right -->
-        <TextView android:id="@+id/bottomRight"
-            android:text="@string/table_layout_export"
-            android:background="#FFFF0000"
-            android:layout_gravity="right|bottom"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_export_shortcut"
-            android:background="#FF00FFFF"
-            android:gravity="right"
-            android:padding="3dip" />
-    </TableRow>
-
-
-    <TableRow>
-        <TextView android:id="@+id/left"
-            android:layout_column="1"
-            android:background="#FF0000FF"
-            android:text="@string/table_layout_open"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_open_shortcut"
-            android:gravity="right"
-            android:padding="3dip" />
-    </TableRow>
-</TableLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/table_layout_vertical_gravity.xml b/proprietary/frameworks/base/tests/text/res/layout/table_layout_vertical_gravity.xml
deleted file mode 100755
index ae17ada26e62624144dad50eba7eff1af0c2cca6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/table_layout_vertical_gravity.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TableRow>
-        <View android:id="@+id/reference1"
-            android:layout_height="96dip"
-            android:background="#FF909090" />
-        <TextView
-            android:background="#FF0000FF"
-            android:text="@string/table_layout_open"
-            android:padding="3dip" />
-        <TextView android:id="@+id/cell_top"
-            android:background="#FF00FF00"
-            android:layout_gravity="top"
-            android:text="@string/table_layout_open_shortcut"
-            android:padding="3dip" />
-    </TableRow>
-
-    <TableRow>
-        <View android:id="@+id/reference2"
-            android:layout_height="96dip"
-            android:background="#FF909090" />
-        <TextView
-            android:background="#FF0000FF"
-            android:text="@string/table_layout_open"
-            android:padding="3dip" />
-        <TextView android:id="@+id/cell_center"
-            android:background="#FF00FF00"
-            android:layout_gravity="center_vertical"
-            android:text="@string/table_layout_open_shortcut"
-            android:padding="3dip" />
-    </TableRow>
-
-    <TableRow>
-        <View android:id="@+id/reference3"
-            android:layout_height="96dip"
-            android:background="#FF909090" />
-        <TextView
-            android:background="#FF0000FF"
-            android:text="@string/table_layout_open"
-            android:padding="3dip" />
-        <TextView android:id="@+id/cell_bottom"
-            android:background="#FF00FF00"
-            android:layout_gravity="bottom"
-            android:text="@string/table_layout_open_shortcut"
-            android:padding="3dip" />
-    </TableRow>
-
-</TableLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/table_layout_weight.xml b/proprietary/frameworks/base/tests/text/res/layout/table_layout_weight.xml
deleted file mode 100755
index ba4fade388dd0213071f4734e5fe1978f88ecfbb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/table_layout_weight.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TableRow android:id="@+id/row"
-        android:weightSum="0.9">
-        <View android:id="@+id/cell1"
-            android:layout_width="0dip"
-            android:layout_weight="0.3"
-            android:layout_height="190dip"
-            android:background="#FF0000FF" />
-        <View android:id="@+id/cell2"
-            android:layout_width="0dip"
-            android:layout_weight="0.3"
-            android:layout_height="190dip"
-            android:background="#FFFFFFFF" />
-        <View android:id="@+id/cell3"
-            android:layout_width="0dip"
-            android:layout_weight="0.3"
-            android:layout_height="190dip"
-            android:background="#FFFF0000" />
-    </TableRow>
-
-</TableLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/translucent_background.xml b/proprietary/frameworks/base/tests/text/res/layout/translucent_background.xml
deleted file mode 100755
index c4a1acfeda96f21af10b830a83bcafd687bd51af..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/translucent_background.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Demonstrates an activity with a fancy translucent background.
-     See corresponding Java code com.android.sdk.app.TranslucentBackground.java. -->
-
-<!-- This screen consists of a single text field that displays some text. -->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text"
-    android:layout_width="match_parent" android:layout_height="match_parent"
-    android:gravity="center_vertical|center_horizontal"
-    android:text="@string/translucent_background"/>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/viewgroupchildren.xml b/proprietary/frameworks/base/tests/text/res/layout/viewgroupchildren.xml
deleted file mode 100755
index 22595ed0f01c4c1ef31cc25154d20ba0dc191bd9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/viewgroupchildren.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<!-- Demonstrates adding/removing views from ViewGroup. See corresponding Java code. -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/group"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/viewstub.xml b/proprietary/frameworks/base/tests/text/res/layout/viewstub.xml
deleted file mode 100755
index 8b32d8f0073825f6c50f078b8527445cb44c3509..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/viewstub.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Button android:id="@+id/vis"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/visibility_1_vis" />
-
-    <ViewStub android:id="@+id/viewStub"
-        android:layout="@layout/linear_layout_buttons"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <ViewStub android:id="@+id/viewStubWithId"
-        android:inflatedId="@+id/stub_inflated"
-        android:layout="@layout/linear_layout_buttons"
-        android:layout_width="47dip"
-        android:layout_height="127dip" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/visibility.xml b/proprietary/frameworks/base/tests/text/res/layout/visibility.xml
deleted file mode 100755
index 7edfa331ee1627097e2fb628b37c8eb77fd8fc0b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/visibility.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<!-- Demonstrates changing view visibility. See corresponding Java code. -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-      android:orientation="vertical"
-      android:background="@drawable/box"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content">
-
-      <TextView android:id="@+id/refUp"
-          android:background="@drawable/red"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:text="@string/visibility_1_view_1"/>
-
-      <TextView android:id="@+id/victim"
-          android:background="@drawable/green"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:text="@string/visibility_1_view_2"/>
-
-      <TextView android:id="@+id/refDown"
-          android:background="@drawable/blue"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:text="@string/visibility_1_view_3"/>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <Button android:id="@+id/vis"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/visibility_1_vis"/>
-
-        <Button android:id="@+id/invis"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/visibility_1_invis"/>
-
-        <Button android:id="@+id/gone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/visibility_1_gone"/>
-
-    </LinearLayout>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/visibility_callback.xml b/proprietary/frameworks/base/tests/text/res/layout/visibility_callback.xml
deleted file mode 100755
index 9034b3f2329b31054fa7ec210af4d0acb718068d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/visibility_callback.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<!-- Demonstrates changing view visibility. See corresponding Java code. -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-      android:orientation="vertical"
-      android:background="@drawable/box"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content">
-
-      <TextView android:id="@+id/refUp"
-          android:background="@drawable/red"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:text="@string/visibility_1_view_1"/>
-
-      <FrameLayout android:id="@+id/parent"
-                   android:layout_width="match_parent"
-                   android:layout_height="wrap_content">
-          <view class="android.view.VisibilityCallback$MonitoredTextView"
-                android:id="@+id/victim"
-                android:background="@drawable/green"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/visibility_1_view_2"/>
-      </FrameLayout>
-
-      <TextView android:id="@+id/refDown"
-          android:background="@drawable/blue"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:text="@string/visibility_1_view_3"/>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <Button android:id="@+id/vis"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/visibility_1_vis"/>
-
-        <Button android:id="@+id/invis"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/visibility_1_invis"/>
-
-        <Button android:id="@+id/gone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/visibility_1_gone"/>
-
-    </LinearLayout>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/weight_sum.xml b/proprietary/frameworks/base/tests/text/res/layout/weight_sum.xml
deleted file mode 100755
index f8921ec3bf7b9b3cd08774a09780244d9f00b820..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/weight_sum.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<LinearLayout android:id="@+id/container" xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:weightSum="1.0"
-    android:gravity="center_horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Button android:id="@+id/child"
-        android:layout_width="0dip"
-        android:layout_weight="0.5"
-        android:layout_height="wrap_content"
-        android:text="@string/visibility_1_vis"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/with_bitmap_background.xml b/proprietary/frameworks/base/tests/text/res/layout/with_bitmap_background.xml
deleted file mode 100755
index 01605d5628c3615dce56206ea831fc9bbb5048ef..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/with_bitmap_background.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<LinearLayout android:id="@+id/container" xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/bitmap_drawable">
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/layout/zero_sized.xml b/proprietary/frameworks/base/tests/text/res/layout/zero_sized.xml
deleted file mode 100755
index f1c94f8a6929514c9a098f28ac64c2009069bafa..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/layout/zero_sized.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<!-- Demonstrates changing view visibility. See corresponding Java code. -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <View android:id="@+id/dimension"
-        android:background="#ffff0000"
-        android:layout_width="42dip"
-        android:layout_height="42dip" />
-
-    <View android:id="@+id/noWidth"
-          android:background="#ff00ff00"
-        android:layout_width="0dip"
-        android:layout_height="42dip" />
-
-    <View android:id="@+id/noHeight"
-          android:background="#ff0000ff"
-        android:layout_width="42dip"
-        android:layout_height="0dip" />
-
-    <View android:id="@+id/noDimension"
-        android:background="#ffffffff"
-        android:layout_width="0dip"
-        android:layout_height="0dip" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/raw/history_v1 b/proprietary/frameworks/base/tests/text/res/raw/history_v1
deleted file mode 100755
index de79491c032e13c800c647e165cc2523db015197..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/history_v1 and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/install_app1_cert1 b/proprietary/frameworks/base/tests/text/res/raw/install_app1_cert1
deleted file mode 100755
index f880c0b1126b9258ca74196377e24449e7d9f032..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/install_app1_cert1 and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/install_app1_cert1_cert2 b/proprietary/frameworks/base/tests/text/res/raw/install_app1_cert1_cert2
deleted file mode 100755
index ed89fbb2eb35377af4252c1e7f8708ae9add57be..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/install_app1_cert1_cert2 and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/install_app1_cert2 b/proprietary/frameworks/base/tests/text/res/raw/install_app1_cert2
deleted file mode 100755
index 5551c7ebff07cdec8fa89e0af4d2b9b7192da0d1..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/install_app1_cert2 and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/install_app1_cert3 b/proprietary/frameworks/base/tests/text/res/raw/install_app1_cert3
deleted file mode 100755
index 0d1a4dcce854208c4783815f58e6522a933f6442..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/install_app1_cert3 and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/install_app1_cert3_cert4 b/proprietary/frameworks/base/tests/text/res/raw/install_app1_cert3_cert4
deleted file mode 100755
index 29ff3b6c59714ac551d988d22d593e0acf18a7c5..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/install_app1_cert3_cert4 and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/install_app1_unsigned b/proprietary/frameworks/base/tests/text/res/raw/install_app1_unsigned
deleted file mode 100755
index 01b39e28866f8965d53f4b0ac4d73adf9cd65786..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/install_app1_unsigned and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/install_app2_cert1 b/proprietary/frameworks/base/tests/text/res/raw/install_app2_cert1
deleted file mode 100755
index 12bfc6f5aa5d71bb02ea912f0a53feeb372f3825..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/install_app2_cert1 and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/install_app2_cert1_cert2 b/proprietary/frameworks/base/tests/text/res/raw/install_app2_cert1_cert2
deleted file mode 100755
index 39095ba7faa22eafeee9d8d3085f7a9ac0dcd3c4..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/install_app2_cert1_cert2 and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/install_app2_cert2 b/proprietary/frameworks/base/tests/text/res/raw/install_app2_cert2
deleted file mode 100755
index f6d965be6f3743a15c38b2c1a8f34252559fd2ac..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/install_app2_cert2 and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/install_app2_cert3 b/proprietary/frameworks/base/tests/text/res/raw/install_app2_cert3
deleted file mode 100755
index 3d8b6f17f397d0fc5b73fabe1e6ccdd12f994fbf..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/install_app2_cert3 and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/install_app2_unsigned b/proprietary/frameworks/base/tests/text/res/raw/install_app2_unsigned
deleted file mode 100755
index b69d9fe5c6f93116d98cdac558cb01a849314f08..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/install_app2_unsigned and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/install_shared1_cert1 b/proprietary/frameworks/base/tests/text/res/raw/install_shared1_cert1
deleted file mode 100755
index 714f9fffde4e0c5aa321268a13a8cacfe6658a7d..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/install_shared1_cert1 and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/install_shared1_cert1_cert2 b/proprietary/frameworks/base/tests/text/res/raw/install_shared1_cert1_cert2
deleted file mode 100755
index 83725e0d2b2633861d4355f83d8461e092898e0d..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/install_shared1_cert1_cert2 and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/install_shared1_cert2 b/proprietary/frameworks/base/tests/text/res/raw/install_shared1_cert2
deleted file mode 100755
index 6a3157e1196c7a0a9e1dd708d0e5b4b037c218e2..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/install_shared1_cert2 and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/install_shared1_unsigned b/proprietary/frameworks/base/tests/text/res/raw/install_shared1_unsigned
deleted file mode 100755
index 2a2e5f5fdad8d4e41d3034196c431d6d34f778d9..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/install_shared1_unsigned and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/install_shared2_cert1 b/proprietary/frameworks/base/tests/text/res/raw/install_shared2_cert1
deleted file mode 100755
index 7006edcc67b255c85ef1dfd8c3da444016bc7891..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/install_shared2_cert1 and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/install_shared2_cert1_cert2 b/proprietary/frameworks/base/tests/text/res/raw/install_shared2_cert1_cert2
deleted file mode 100755
index b7b084c0a77983979c637698d72cfddd01dea9ba..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/install_shared2_cert1_cert2 and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/install_shared2_cert2 b/proprietary/frameworks/base/tests/text/res/raw/install_shared2_cert2
deleted file mode 100755
index 0f04388c371e38ab047ef935d6be04d73f9de390..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/install_shared2_cert2 and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/install_shared2_unsigned b/proprietary/frameworks/base/tests/text/res/raw/install_shared2_unsigned
deleted file mode 100755
index 2794282512deaa8f3d6cf924d79581ab5849e907..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/install_shared2_unsigned and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/medium.xml b/proprietary/frameworks/base/tests/text/res/raw/medium.xml
deleted file mode 100755
index 5757a24e290ff06c589caff2294f08e03f9b5df5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/raw/medium.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<LinearLayout id="@+id/content" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-	<TextView id="@+id/text" android:text="S" android:layout_width="match_parent" android:layout_height="wrap_content" />
-	<TextView id="@+id/text" android:text="M" android:layout_width="match_parent" android:layout_height="wrap_content" />
-	<TextView id="@+id/text" android:text="T" android:layout_width="match_parent" android:layout_height="wrap_content" />
-	<TextView id="@+id/text" android:text="W" android:layout_width="match_parent" android:layout_height="wrap_content" />
-	<TextView id="@+id/text" android:text="H" android:layout_width="match_parent" android:layout_height="wrap_content" />
-	<TextView id="@+id/text" android:text="F" android:layout_width="match_parent" android:layout_height="wrap_content" />
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/text/res/raw/obb_enc_file100_orig1.obb b/proprietary/frameworks/base/tests/text/res/raw/obb_enc_file100_orig1.obb
deleted file mode 100755
index 373b8e4bd01feeac424a30bd09c9fac3779fddda..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/obb_enc_file100_orig1.obb and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/obb_enc_file100_orig3.obb b/proprietary/frameworks/base/tests/text/res/raw/obb_enc_file100_orig3.obb
deleted file mode 100755
index aa531d8b35bd7e6184125c57e80d656a58f59133..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/obb_enc_file100_orig3.obb and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/obb_file1.obb b/proprietary/frameworks/base/tests/text/res/raw/obb_file1.obb
deleted file mode 100755
index e71a6808a68bdf5cb1b66165419c4449423db2f7..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/obb_file1.obb and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/obb_file2.obb b/proprietary/frameworks/base/tests/text/res/raw/obb_file2.obb
deleted file mode 100755
index 1c397df5ab6ea0ef7befc38a28526303d84d9aa0..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/obb_file2.obb and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/obb_file2_nosign.obb b/proprietary/frameworks/base/tests/text/res/raw/obb_file2_nosign.obb
deleted file mode 100755
index 8292361d12f49bccc4e65ccbfc698f26fa8dc14c..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/obb_file2_nosign.obb and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/obb_file3.obb b/proprietary/frameworks/base/tests/text/res/raw/obb_file3.obb
deleted file mode 100755
index 7f97a8808fa492879b31c09596d057e2b44be2e7..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/obb_file3.obb and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/obb_file3_bad_packagename.obb b/proprietary/frameworks/base/tests/text/res/raw/obb_file3_bad_packagename.obb
deleted file mode 100755
index baa714aae5483985231b970c14f4a86efebbbf8b..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/text/res/raw/obb_file3_bad_packagename.obb and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/text/res/raw/small.xml b/proprietary/frameworks/base/tests/text/res/raw/small.xml
deleted file mode 100755
index ee859b99b2179765838e4e3043cb4eb95ee0f98c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/raw/small.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<view class="com.android.tests.InflateTest$ViewOne" id="@+id/viewOne" android:layout_width="match_parent" android:layout_height="match_parent"/>
diff --git a/proprietary/frameworks/base/tests/text/res/raw/text.txt b/proprietary/frameworks/base/tests/text/res/raw/text.txt
deleted file mode 100755
index 3d8c5195bffcf0a36aec4727d59d344b722fa2e9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/raw/text.txt
+++ /dev/null
@@ -1 +0,0 @@
-OneTwoThreeFourFiveSixSevenEightNineTen
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/text/res/raw/xt_qtaguid_iface_fmt_typical b/proprietary/frameworks/base/tests/text/res/raw/xt_qtaguid_iface_fmt_typical
deleted file mode 100755
index 656d5bb82da4086cdcb5b052243420340527e862..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/raw/xt_qtaguid_iface_fmt_typical
+++ /dev/null
@@ -1,4 +0,0 @@
-ifname total_skb_rx_bytes total_skb_rx_packets total_skb_tx_bytes total_skb_tx_packets
-rmnet2 4968 35 3081 39
-rmnet1 11153922 8051 190226 2468
-rmnet0 6824 16 5692 10
diff --git a/proprietary/frameworks/base/tests/text/res/raw/xt_qtaguid_iface_typical b/proprietary/frameworks/base/tests/text/res/raw/xt_qtaguid_iface_typical
deleted file mode 100755
index 610723aef2f201d67a86bceda9f403fd7ef90d15..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/raw/xt_qtaguid_iface_typical
+++ /dev/null
@@ -1,6 +0,0 @@
-rmnet3 1 0 0 0 0 20822 501 1149991 815
-rmnet2 1 0 0 0 0 1594 15 1313 15
-rmnet1 1 0 0 0 0 207398 458 166918 565
-rmnet0 1 0 0 0 0 2112 24 700 10
-test1 1 1 2 3 4 5 6 7 8
-test2 0 1 2 3 4 5 6 7 8
diff --git a/proprietary/frameworks/base/tests/text/res/raw/xt_qtaguid_typical b/proprietary/frameworks/base/tests/text/res/raw/xt_qtaguid_typical
deleted file mode 100755
index c1b0d259955c34e9ad795cbc92cde00601050468..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/raw/xt_qtaguid_typical
+++ /dev/null
@@ -1,71 +0,0 @@
-idx iface acct_tag_hex uid_tag_int cnt_set rx_bytes rx_packets tx_bytes tx_packets rx_tcp_bytes rx_tcp_packets rx_udp_bytes rx_udp_packets rx_other_bytes rx_other_packets tx_tcp_bytes tx_tcp_packets tx_udp_bytes tx_udp_packets tx_other_bytes tx_other_packets
-2 wlan0 0x0 0 0 18621 96 2898 44 312 6 15897 58 2412 32 312 6 1010 16 1576 22
-3 wlan0 0x0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-4 wlan0 0x0 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-5 wlan0 0x0 1000 1 1949 13 1078 14 0 0 1600 10 349 3 0 0 600 10 478 4
-6 wlan0 0x0 10005 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-7 wlan0 0x0 10005 1 32081 38 5315 50 32081 38 0 0 0 0 5315 50 0 0 0 0
-8 wlan0 0x0 10011 0 35777 53 5718 57 0 0 0 0 35777 53 0 0 0 0 5718 57
-9 wlan0 0x0 10011 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-10 wlan0 0x0 10014 0 0 0 1098 13 0 0 0 0 0 0 0 0 0 0 1098 13
-11 wlan0 0x0 10014 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-12 wlan0 0x0 10021 0 562386 573 49228 549 0 0 0 0 562386 573 0 0 0 0 49228 549
-13 wlan0 0x0 10021 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-14 wlan0 0x0 10031 0 3425 5 586 6 0 0 0 0 3425 5 0 0 0 0 586 6
-15 wlan0 0x0 10031 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-16 wlan0 0x7fffff0100000000 10021 0 562386 573 49228 549 0 0 0 0 562386 573 0 0 0 0 49228 549
-17 wlan0 0x7fffff0100000000 10021 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-18 wlan0 0x7fffff0100000000 10031 0 3425 5 586 6 0 0 0 0 3425 5 0 0 0 0 586 6
-19 wlan0 0x7fffff0100000000 10031 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-20 rmnet2 0x0 0 0 547 5 118 2 40 1 243 1 264 3 0 0 62 1 56 1
-21 rmnet2 0x0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-22 rmnet2 0x0 10001 0 1125899906842624 5 984 11 632 5 0 0 0 0 984 11 0 0 0 0
-23 rmnet2 0x0 10001 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-24 rmnet1 0x0 0 0 26736 174 7098 130 7210 97 18382 64 1144 13 2932 64 4054 64 112 2
-25 rmnet1 0x0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-26 rmnet1 0x0 1000 0 75774 77 18038 78 75335 72 439 5 0 0 17668 73 370 5 0 0
-27 rmnet1 0x0 1000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-28 rmnet1 0x0 10007 0 269945 578 111632 586 269945 578 0 0 0 0 111632 586 0 0 0 0
-29 rmnet1 0x0 10007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-30 rmnet1 0x0 10011 0 1741256 6918 769778 7019 1741256 6918 0 0 0 0 769778 7019 0 0 0 0
-31 rmnet1 0x0 10011 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-32 rmnet1 0x0 10014 0 0 0 786 12 0 0 0 0 0 0 786 12 0 0 0 0
-33 rmnet1 0x0 10014 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-34 rmnet1 0x0 10021 0 433533 1454 393420 1604 433533 1454 0 0 0 0 393420 1604 0 0 0 0
-35 rmnet1 0x0 10021 1 21215 33 10278 33 21215 33 0 0 0 0 10278 33 0 0 0 0
-36 rmnet1 0x0 10036 0 6310 25 3284 29 6310 25 0 0 0 0 3284 29 0 0 0 0
-37 rmnet1 0x0 10036 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-38 rmnet1 0x0 10047 0 34264 47 3936 34 34264 47 0 0 0 0 3936 34 0 0 0 0
-39 rmnet1 0x0 10047 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-40 rmnet1 0x4e7700000000 10011 0 9187 27 4248 33 9187 27 0 0 0 0 4248 33 0 0 0 0
-41 rmnet1 0x4e7700000000 10011 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-42 rmnet1 0x1000000000000000 10007 0 2109 4 791 4 2109 4 0 0 0 0 791 4 0 0 0 0
-43 rmnet1 0x1000000000000000 10007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-44 rmnet1 0x1000000400000000 10007 0 9811 22 6286 22 9811 22 0 0 0 0 6286 22 0 0 0 0
-45 rmnet1 0x1000000400000000 10007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-46 rmnet1 0x1010000000000000 10021 0 164833 426 135392 527 164833 426 0 0 0 0 135392 527 0 0 0 0
-47 rmnet1 0x1010000000000000 10021 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-48 rmnet1 0x1144000400000000 10011 0 10112 18 3334 17 10112 18 0 0 0 0 3334 17 0 0 0 0
-49 rmnet1 0x1144000400000000 10011 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-50 rmnet1 0x1244000400000000 10011 0 1300 3 848 2 1300 3 0 0 0 0 848 2 0 0 0 0
-51 rmnet1 0x1244000400000000 10011 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-52 rmnet1 0x3000000000000000 10007 0 10389 14 1521 12 10389 14 0 0 0 0 1521 12 0 0 0 0
-53 rmnet1 0x3000000000000000 10007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-54 rmnet1 0x3000000400000000 10007 0 238070 380 93938 404 238070 380 0 0 0 0 93938 404 0 0 0 0
-55 rmnet1 0x3000000400000000 10007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-56 rmnet1 0x3010000000000000 10021 0 219110 578 227423 676 219110 578 0 0 0 0 227423 676 0 0 0 0
-57 rmnet1 0x3010000000000000 10021 1 742 3 1265 3 742 3 0 0 0 0 1265 3 0 0 0 0
-58 rmnet1 0x3020000000000000 10021 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-59 rmnet1 0x3020000000000000 10021 1 20473 30 9013 30 20473 30 0 0 0 0 9013 30 0 0 0 0
-60 rmnet1 0x3144000400000000 10011 0 43963 92 34414 116 43963 92 0 0 0 0 34414 116 0 0 0 0
-61 rmnet1 0x3144000400000000 10011 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-62 rmnet1 0x3244000400000000 10011 0 3486 8 1520 9 3486 8 0 0 0 0 1520 9 0 0 0 0
-63 rmnet1 0x3244000400000000 10011 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-64 rmnet1 0x7fffff0100000000 10021 0 29102 56 8865 60 29102 56 0 0 0 0 8865 60 0 0 0 0
-65 rmnet1 0x7fffff0100000000 10021 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-66 rmnet1 0x7fffff0300000000 1000 0 995 13 14145 14 995 13 0 0 0 0 14145 14 0 0 0 0
-67 rmnet1 0x7fffff0300000000 1000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-68 rmnet0 0x0 0 0 4312 49 1288 23 0 0 0 0 4312 49 0 0 0 0 1288 23
-69 rmnet0 0x0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-70 rmnet0 0x0 10080 0 22266 30 20976 30 0 0 0 0 22266 30 0 0 0 0 20976 30
-71 rmnet0 0x0 10080 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
diff --git a/proprietary/frameworks/base/tests/text/res/values-land/dimens.xml b/proprietary/frameworks/base/tests/text/res/values-land/dimens.xml
deleted file mode 100755
index 1ee9f1dbcd5dec6f3e2cecfe7fd03951c5285762..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/values-land/dimens.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<resources>
-    <dimen name="resource_cache_test_orientation_dependent">3dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/text/res/values/arrays.xml b/proprietary/frameworks/base/tests/text/res/values/arrays.xml
deleted file mode 100755
index f76da8579fc96bbdf4edd2a5c61bf43654da05ff..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/values/arrays.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <string-array name="reminder_minutes_labels">
-        <item>5 minutes</item>
-        <item>10 minutes</item>
-        <item>15 minutes</item>
-        <item>20 minutes</item>
-        <item>25 minutes</item>
-        <item>30 minutes</item>
-        <item>45 minutes</item>
-        <item>1 hour</item>
-        <item>2 hours</item>
-        <item>3 hours</item>
-        <item>12 hours</item>
-        <item>24 hours</item>
-        <item>2 days</item>
-        <item>1 week</item>
-    </string-array>
-</resources>
diff --git a/proprietary/frameworks/base/tests/text/res/values/attrs.xml b/proprietary/frameworks/base/tests/text/res/values/attrs.xml
deleted file mode 100755
index bf59e74b9f7de7d6c5e60a71aa4ea9785e857570..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/values/attrs.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-     <declare-styleable name="SelectableRowView">
-        <attr name="numRows" format="integer" />
-    </declare-styleable>
-</resources>
diff --git a/proprietary/frameworks/base/tests/text/res/values/colors.xml b/proprietary/frameworks/base/tests/text/res/values/colors.xml
deleted file mode 100755
index f881660249f2570a170829078a5ed37634deeea9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/values/colors.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/samples/SampleCode/res/values/colors.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<resources>
-    <drawable name="red">#ffff0000</drawable>
-    <drawable name="blue">#ff0000ff</drawable>
-    <drawable name="green">#ff00ff00</drawable>
-    <drawable name="yellow">#ffffff00</drawable>
-</resources>
diff --git a/proprietary/frameworks/base/tests/text/res/values/dimens.xml b/proprietary/frameworks/base/tests/text/res/values/dimens.xml
deleted file mode 100755
index 00fc414327f1f210a2b3c4dfef0e708b5d3e6c88..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/values/dimens.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<resources>
-    <dimen name="resource_cache_test_generic">10dp</dimen>
-    <dimen name="resource_cache_test_orientation_dependent">20dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/text/res/values/strings.xml b/proprietary/frameworks/base/tests/text/res/values/strings.xml
deleted file mode 100755
index 04b0478c96d11d7b2f4a7c94e077b81ee22135ae..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/values/strings.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">FrameworkTestApplication</string>
-
-    <!-- FocusAfterRemoval -->
-    <string name="left_top">parent GONE</string>
-    <string name="left_bottom">parent INVISIBLE</string>
-    <string name="right_top">me GONE</string>
-    <string name="right_bottom">me INVISIBLE</string>
-
-    <!-- Strings for the 12 key dialer -->
-    <string name="keypad_one">1</string>
-    <string name="keypad_two">"2\nabc"</string>
-    <string name="keypad_three">"3\ndef"</string>
-    <string name="keypad_four">"4\nghi"</string>
-    <string name="keypad_five">"5\njkl"</string>
-    <string name="keypad_six">"6\nmno"</string>
-    <string name="keypad_seven">"7\npqrs"</string>
-    <string name="keypad_eight">"8\ntuv"</string>
-    <string name="keypad_nine">"9\nwxyz"</string>
-    <string name="keypad_zero">0</string>
-    <string name="keypad_star">*</string>
-    <string name="keypad_pound">"#"</string>
-    
-
-    <!-- HorizontalGravity -->
-    <string name="table_layout_open">Open\u2026</string>
-    <string name="table_layout_open_shortcut">Ctrl-O</string>
-    <string name="table_layout_save_as">Save As\u2026</string>
-    <string name="table_layout_save_as_shortcut">Ctrl-Shift-S</string>
-    <string name="table_layout_export">Export\u2026</string>
-    <string name="table_layout_export_shortcut">Ctrl-E</string>
-
-    <!-- CellSpan -->
-    <string name="table_layout_a">A</string>
-    <string name="table_layout_b">BB</string>
-    <string name="table_layout_c">CCCC</string>
-    <string name="table_layout_d">D</string>
-    <string name="table_layout_e">E</string>
-    <string name="table_layout_f">F</string>
-    <string name="table_layout_g">G</string>
-    <string name="table_layout_h">H</string>
-    
-    <!-- scroll_to_rectangle -->
-    <string name="scroll_top_button">Click to make "hi!" on screen</string>
-    <string name="scroll_top_button2">Click to make blob on screen</string>
-    <string name="scroll_to_me">hi!</string>
-    <string name="scroll_bottom_button2">Click to make blob on screen</string>
-    <string name="scroll_bottom_button">Click to make "hi!" on screen</string>
-
-    <!-- Visibility -->
-    <string name="visibility_1_view_1">View A</string>
-    <string name="visibility_1_view_2">View B</string>
-    <string name="visibility_1_view_3">View C</string>
-    <string name="visibility_1_vis">Visible</string>
-    <string name="visibility_1_invis">Invisible</string>
-    <string name="visibility_1_gone">Gone</string>
-
-    <string name="submit">submit</string>
-    <string name="cancel">cancel</string>
-    <string name="enter_title">enter title</string>
-    <string name="enter_url">enter url</string>
-
-    <!-- List with button above -->
-    <string name="button_above_list_label">Button above list</string>
-    
-    <!-- List take focus from side -->
-    <string name="side_button_label">X</string>
-    
-    <!-- Linear Layout show/hide & sizing -->
-    <string name="linear_listheight_fixed">Fixed Size</string>
-    <string name="linear_listheight_fill">Fill Screen</string>
-    <string name="linear_listheight_hide">Hide</string>
-
-    <!-- Baseline -->
-    <string name="show">Show</string>
-    <string name="time">00:00:00</string>
-    
-    <!-- Drawable -->
-    <string name="minimal_text">a</string>
-    <string name="change_backgrounds">Change backgrounds</string>
-
-    <!-- List with empty view -->
-    <string name="empty_list">Empty list</string>
-    <string name="menu_add">Add</string>
-    <string name="menu_remove">Remove</string>
-
-    <!-- Misc. -->
-    <string name="add_row_button">Add Row</string>
-    <string name="disabled_button">Disabled</string>
-    <string name="translucent_background">Example of how you can make an
-            activity have a translucent background, compositing over
-            whatever is behind it.</string>
-    <string name="text">Lorem ipsum datum carat casus belli honorare</string>
-    
-	<string name="hide">Hide</string>
-    <string name="go">Go</string>
-
-    <string name="include_label">Included views below:</string>
-    <string name="include_button">I was included!</string>
-
-    <string name="view">View</string>
-
-    <string name="layout_five_text_text">S</string>
-    <string name="layout_four_text_text">S</string>
-    <string name="layout_six_text_text">S</string>
-
-    <string name="menu_test">test</string>
-    <string name="metadata_text">text</string>
-
-    <string name="permlab_testGranted">Test Granted</string>
-    <string name="permdesc_testGranted">Used for running unit tests, for
-        testing operations where we have the permission.</string>
-    <string name="permlab_testDenied">Test Denied</string>
-    <string name="permdesc_testDenied">Used for running unit tests, for
-        testing operations where we do not have the permission.</string>
-
-    <string name="searchable_label">SearchManager Test</string>
-    <string name="searchable_hint">A search hint</string>
-
-    <!-- InterrogationActivity -->
-    <string name="button1">Button1</string>
-    <string name="button2">Button2</string>
-    <string name="button3">Button3</string>
-    <string name="button4">Button4</string>
-    <string name="button5">Button5</string>
-    <string name="button6">Button6</string>
-    <string name="button7">Button7</string>
-    <string name="button8">Button8</string>
-    <string name="button9">Button9</string>
-
-    <string name="textview_hebrew_text">&#x05DD;&#x05DE;ab?!</string>
-
-    <!-- SizeAdaptiveLayout -->
-    <string name="first">Four score and seven years ago our fathers brought forth on this continent, a new nation, conceived in Liberty, and dedicated to the proposition that all men are created equal.</string>
-    <string name="actor">Abe Lincoln</string>
-    <string name="caption">Lincoln adressing the crowd at Gettysburgh</string>
-
-    <!-- RestrictionsManagerTest -->
-    <string name="restrictionManager_title">Title</string>
-    <string name="restrictionManager_desc">Description</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/text/res/values/styles.xml b/proprietary/frameworks/base/tests/text/res/values/styles.xml
deleted file mode 100755
index 7a90197c5b6639eca4058ce0d056f27403133530..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/values/styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<resources>
-    <style name="Theme" parent="android:Theme">
-        <item name="android:windowAnimationStyle">@style/Animation</item>
-    </style>
-
-    <style name="Animation">
-        <item name="android:activityOpenEnterAnimation">@null</item>
-        <item name="android:activityOpenExitAnimation">@null</item>
-        <item name="android:activityCloseEnterAnimation">@null</item>
-        <item name="android:activityCloseExitAnimation">@null</item>
-        <item name="android:taskOpenEnterAnimation">@null</item>
-        <item name="android:taskOpenExitAnimation">@null</item>
-        <item name="android:taskCloseEnterAnimation">@null</item>
-        <item name="android:taskCloseExitAnimation">@null</item>
-        <item name="android:taskToFrontEnterAnimation">@null</item>
-        <item name="android:taskToFrontExitAnimation">@null</item>
-        <item name="android:taskToBackEnterAnimation">@null</item>
-        <item name="android:taskToBackExitAnimation">@null</item>
-    </style>
-</resources>
diff --git a/proprietary/frameworks/base/tests/text/res/xml/app_restrictions.xml b/proprietary/frameworks/base/tests/text/res/xml/app_restrictions.xml
deleted file mode 100755
index c84cabcc00d3e89ed3a7c1d4e6f7ac62c2c23c6b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/xml/app_restrictions.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<restrictions xmlns:android="http://schemas.android.com/apk/res/android">
-    <restriction android:key="hidden_key"
-                 android:restrictionType="hidden"/>
-    <restriction
-            android:defaultValue="true"
-            android:description="@string/restrictionManager_desc"
-            android:key="bool_key"
-            android:restrictionType="bool"
-            android:title="@string/restrictionManager_title"/>
-    <restriction
-            android:defaultValue="test"
-            android:key="string_key"
-            android:restrictionType="string"/>
-
-    <restriction android:key="int_key"
-                 android:restrictionType="integer"
-                 android:defaultValue="15"/>
-    <restriction android:key="bundle_key"
-                 android:restrictionType="bundle">
-        <restriction
-                android:key="bundle_string_key"
-                android:restrictionType="string"/>
-        <restriction
-                android:defaultValue="true"
-                android:key="bundle_bool_key"
-                android:restrictionType="bool"/>
-
-    </restriction>
-    <restriction android:key="bundle_array_key"
-                 android:restrictionType="bundle_array">
-        <restriction android:key="bundle_array_int"
-                     android:restrictionType="integer"/>
-        <restriction android:key="bundle_array_bundle_key"
-                     android:restrictionType="bundle">
-            <restriction android:key="bundle_array_bundle_int_key"
-                         android:restrictionType="integer"/>
-        </restriction>
-    </restriction>
-</restrictions>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/text/res/xml/metadata.xml b/proprietary/frameworks/base/tests/text/res/xml/metadata.xml
deleted file mode 100755
index e352f27f814817f23051490aa7105ba39e566339..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/xml/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<thedata xmlns:android="http://schemas.android.com/apk/res/android"
-    rawText="some raw text"
-    rawColor="#ffffff00"
-    android:color="#f00"
-    android:text="@string/metadata_text"
-
-/>
diff --git a/proprietary/frameworks/base/tests/text/res/xml/metadata_app.xml b/proprietary/frameworks/base/tests/text/res/xml/metadata_app.xml
deleted file mode 100755
index c37e6badcb7e5bf9e429d64ec3356e0914eee98a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/xml/metadata_app.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<thedata xmlns:android="http://schemas.android.com/apk/res/android"
-    rawText="some raw text"
-    rawColor="#ffffff00"
-    android:color="#f00"
-    android:text="@string/metadata_text"
-    appInfo="true"
-
-/>
diff --git a/proprietary/frameworks/base/tests/text/res/xml/searchable.xml b/proprietary/frameworks/base/tests/text/res/xml/searchable.xml
deleted file mode 100755
index 9d293b5ac425a31997655b8e42f8bc2c9b98637f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/res/xml/searchable.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<searchable xmlns:android="http://schemas.android.com/apk/res/android"
-    android:label="@string/searchable_label"
-    android:hint="@string/searchable_hint"
-    android:searchSuggestAuthority="com.android.unit_tests.SuggestionProvider"
-    >
-
-        <actionkey android:keycode="KEYCODE_CALL"
-            android:suggestActionMsgColumn="suggest_action_msg_call" />
-
-</searchable>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/text/src/android/text/DynamicLayoutBlocksTest.java b/proprietary/frameworks/base/tests/text/src/android/text/DynamicLayoutBlocksTest.java
deleted file mode 100755
index a2fb4be1e423ec3f8120ad49ac7f98d6173194ec..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/src/android/text/DynamicLayoutBlocksTest.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package android.text;
-
-import static android.text.Layout.Alignment.*;
-
-import android.text.DynamicLayout;
-
-import junit.framework.TestCase;
-
-/**
- * Tests DynamciLayout updateBlocks method.
- *
- * Requires disabling access checks in the vm since this calls package-private APIs.
- *
- * @Suppress
- */
-public class DynamicLayoutBlocksTest extends TestCase {
-    private DynamicLayout dl = new DynamicLayout("", new TextPaint(), 0, ALIGN_NORMAL, 0, 0, false);
-    private static final int ___ = DynamicLayout.INVALID_BLOCK_INDEX;
-
-    private int[] initialBlockEnds;
-    private int[] initialBlockIndices;
-
-    private void defineInitialState(int[] ends, int[] indices) {
-        initialBlockEnds = ends;
-        initialBlockIndices = indices;
-        assertEquals(initialBlockEnds.length, initialBlockIndices.length);
-    }
-
-    public void printBlocks(String message) {
-        System.out.print(message);
-        for (int i = 0; i < dl.getNumberOfBlocks(); i++) {
-            System.out.print("  " + Integer.toString(dl.getBlockEndLines()[i]));
-        }
-        System.out.println();
-    }
-
-    public void checkInvariants() {
-        assertTrue(dl.getNumberOfBlocks() > 0);
-        assertTrue(dl.getNumberOfBlocks() <= dl.getBlockEndLines().length);
-        assertEquals(dl.getBlockEndLines().length, dl.getBlockIndices().length);
-
-        for (int i = 1; i < dl.getNumberOfBlocks(); i++) {
-            assertTrue(dl.getBlockEndLines()[i] > dl.getBlockEndLines()[i - 1]);
-        }
-    }
-
-    private void update(int startLine, int endLine, int newLineCount) {
-        TextUtils.setBlocksDataForTest(dl, initialBlockEnds, initialBlockIndices, initialBlockEnds.length);
-        checkInvariants();
-        TextUtils.updateBlocksForTest(dl, startLine, endLine, newLineCount) ;
-    }
-
-    private void assertState(int[] sizes, int[] indices) {
-        checkInvariants();
-
-        assertEquals(sizes.length, dl.getNumberOfBlocks());
-        assertEquals(indices.length, dl.getNumberOfBlocks());
-
-        int[] ends = new int[sizes.length];
-        for (int i = 0; i < ends.length; i++) {
-            ends[i] = i == 0 ? (sizes[0] == 0 ? 0 : sizes[0] - 1) : ends[i - 1] + sizes[i];
-        }
-
-        for (int i = 0; i < dl.getNumberOfBlocks(); i++) {
-            assertEquals(ends[i], dl.getBlockEndLines()[i]);
-            /// M: temporarily remove and confirming later
-            //assertEquals(indices[i], dl.getBlockIndices()[i]);
-        }
-    }
-
-    private void assertState(int[] sizes) {
-        int[] ids = new int[sizes.length];
-        for (int i = 0; i < sizes.length; i++) {
-            ids[i] = DynamicLayout.INVALID_BLOCK_INDEX;
-        }
-        assertState(sizes, ids);
-    }
-
-    public void testFrom0() {
-        defineInitialState(new int[] { 0 }, new int[] { 123 });
-
-        update(0, 0, 0);
-        assertState(new int[] { 0 });
-
-        update(0, 0, 1);
-        assertState(new int[] { 0 });
-
-        update(0, 0, 10);
-        assertState(new int[] { 10 });
-    }
-
-    public void testFrom1ReplaceByEmpty() {
-        defineInitialState(new int[] { 100 }, new int[] { 123 });
-
-        update(0, 0, 0);
-        assertState(new int[] { 100 });
-
-        update(0, 10, 0);
-        assertState(new int[] { 90 });
-
-        update(0, 100, 0);
-        assertState(new int[] { 0 });
-
-        update(20, 30, 0);
-        assertState(new int[] { 20, 70 });
-
-        update(20, 20, 0);
-        assertState(new int[] { 20, 80 });
-
-        update(40, 100, 0);
-        assertState(new int[] { 40 });
-
-        update(100, 100, 0);
-        assertState(new int[] { 100 });
-    }
-
-    public void testFrom1ReplaceFromFirstLine() {
-        defineInitialState(new int[] { 100 }, new int[] { 123 });
-
-        update(0, 0, 1);
-        assertState(new int[] { 0, 100 });
-
-        update(0, 0, 10);
-        assertState(new int[] { 10, 100 });
-
-        update(0, 30, 31);
-        assertState(new int[] { 31, 70 });
-
-        update(0, 100, 20);
-        assertState(new int[] { 20 });
-    }
-
-    public void testFrom1ReplaceFromCenter() {
-        defineInitialState(new int[] { 100 }, new int[] { 123 });
-
-        update(20, 20, 1);
-        assertState(new int[] { 20, 1, 80 });
-
-        update(20, 20, 10);
-        assertState(new int[] { 20, 10, 80 });
-
-        update(20, 30, 50);
-        assertState(new int[] { 20, 50, 70 });
-
-        update(20, 100, 50);
-        assertState(new int[] { 20, 50 });
-    }
-
-    public void testFrom1ReplaceFromEnd() {
-        defineInitialState(new int[] { 100 }, new int[] { 123 });
-
-        update(100, 100, 0);
-        assertState(new int[] { 100 });
-
-        update(100, 100, 1);
-        assertState(new int[] { 100, 1 });
-
-        update(100, 100, 10);
-        assertState(new int[] { 100, 10 });
-    }
-
-    public void testFrom2ReplaceFromFirstLine() {
-        defineInitialState(new int[] { 10, 20 }, new int[] { 123, 456 });
-
-        update(0, 4, 50);
-        assertState(new int[] { 50, 10 - 4, 20 - 10 }, new int[] { ___, ___, 456 });
-
-        update(0, 10, 50);
-        assertState(new int[] { 50, 20 - 10 }, new int[] { ___, 456 });
-
-        update(0, 15, 50);
-        assertState(new int[] { 50, 20 - 15 }, new int[] { ___, ___ });
-
-        update(0, 20, 50);
-        assertState(new int[] { 50 }, new int[] { ___ });
-    }
-
-    public void testFrom2ReplaceFromFirstBlock() {
-        defineInitialState(new int[] { 10, 20 }, new int[] { 123, 456 });
-
-        update(3, 7, 50);
-        assertState(new int[] { 3, 50, 10 - 7, 20 - 10 }, new int[] { ___, ___, ___, 456 });
-
-        update(3, 10, 50);
-        assertState(new int[] { 3, 50, 20 - 10 }, new int[] { ___, ___, 456 });
-
-        update(3, 14, 50);
-        assertState(new int[] { 3, 50, 20 - 14 }, new int[] { ___, ___, ___ });
-
-        update(3, 20, 50);
-        assertState(new int[] { 3, 50 }, new int[] { ___, ___ });
-    }
-
-    public void testFrom2ReplaceFromBottomBoundary() {
-        defineInitialState(new int[] { 10, 20 }, new int[] { 123, 456 });
-
-        update(10, 10, 50);
-        assertState(new int[] { 10, 50, 20 - 10 }, new int[] { ___, ___, 456 });
-
-        update(10, 14, 50);
-        assertState(new int[] { 10, 50, 20 - 14 }, new int[] { ___, ___, ___ });
-
-        update(10, 20, 50);
-        assertState(new int[] { 10, 50 }, new int[] { ___, ___ });
-    }
-
-    public void testFrom2ReplaceFromTopBoundary() {
-        defineInitialState(new int[] { 10, 20 }, new int[] { 123, 456 });
-
-        update(11, 11, 50);
-        assertState(new int[] { 11, 50, 20 - 11 }, new int[] { 123, ___, ___ });
-
-        update(11, 14, 50);
-        assertState(new int[] { 11, 50, 20 - 14 }, new int[] { 123, ___, ___ });
-
-        update(11, 20, 50);
-        assertState(new int[] { 11, 50 }, new int[] { 123, ___ });
-    }
-
-    public void testFrom2ReplaceFromSecondBlock() {
-        defineInitialState(new int[] { 10, 20 }, new int[] { 123, 456 });
-
-        update(14, 14, 50);
-        assertState(new int[] { 11, 14 - 11, 50, 20 - 14 }, new int[] { 123, ___, ___, ___ });
-
-        update(14, 17, 50);
-        assertState(new int[] { 11, 14 - 11, 50, 20 - 17 }, new int[] { 123, ___, ___, ___ });
-
-        update(14, 20, 50);
-        assertState(new int[] { 11, 14 - 11, 50 }, new int[] { 123, ___, ___ });
-    }
-
-    public void testFrom2RemoveFromFirst() {
-        defineInitialState(new int[] { 10, 20 }, new int[] { 123, 456 });
-
-        update(0, 4, 0);
-        assertState(new int[] { 10 - 4, 20 - 10 }, new int[] { ___, 456 });
-
-        update(0, 10, 0);
-        assertState(new int[] { 20 - 10 }, new int[] { 456 });
-
-        update(0, 14, 0);
-        assertState(new int[] { 20 - 14 }, new int[] { ___ });
-
-        update(0, 20, 0);
-        assertState(new int[] { 0 }, new int[] { ___ });
-    }
-
-    public void testFrom2RemoveFromFirstBlock() {
-        defineInitialState(new int[] { 10, 20 }, new int[] { 123, 456 });
-
-        update(4, 7, 0);
-        assertState(new int[] { 4, 10 - 7, 20 - 10 }, new int[] { ___, ___, 456 });
-
-        update(4, 10, 0);
-        assertState(new int[] { 4, 20 - 10 }, new int[] { ___, 456 });
-
-        update(4, 14, 0);
-        assertState(new int[] { 4, 20 - 14 }, new int[] { ___, ___ });
-
-        update(4, 20, 0);
-        assertState(new int[] { 4 }, new int[] { ___ });
-    }
-
-    public void testFrom2RemoveFromSecondBlock() {
-        defineInitialState(new int[] { 10, 20 }, new int[] { 123, 456 });
-
-        update(14, 17, 0);
-        assertState(new int[] { 11, 14 - 11, 20 - 17 }, new int[] { 123, ___, ___ });
-
-        update(14, 20, 0);
-        assertState(new int[] { 11, 14 - 11 }, new int[] { 123, ___ });
-    }
-
-    public void testFrom3ReplaceFromFirstBlock() {
-        defineInitialState(new int[] { 10, 30, 60 }, new int[] { 123, 456, 789 });
-
-        update(3, 7, 50);
-        assertState(new int[] { 3, 50, 10 - 7, 30 - 10, 60 - 30 }, new int[] { ___, ___, ___, 456, 789 });
-
-        update(3, 10, 50);
-        assertState(new int[] { 3, 50, 30 - 10, 60 - 30 }, new int[] { ___, ___, 456, 789 });
-
-        update(3, 17, 50);
-        assertState(new int[] { 3, 50, 30 - 17, 60 - 30 }, new int[] { ___, ___, ___, 789 });
-
-        update(3, 30, 50);
-        assertState(new int[] { 3, 50, 60 - 30 }, new int[] { ___, ___, 789 });
-
-        update(3, 40, 50);
-        assertState(new int[] { 3, 50, 60 - 40 }, new int[] { ___, ___, ___ });
-
-        update(3, 60, 50);
-        assertState(new int[] { 3, 50 }, new int[] { ___, ___ });
-    }
-
-    public void testFrom3ReplaceFromSecondBlock() {
-        defineInitialState(new int[] { 10, 30, 60 }, new int[] { 123, 456, 789 });
-
-        update(13, 17, 50);
-        assertState(new int[] { 11, 2, 50, 30 - 17, 60 - 30 }, new int[] { 123, ___, ___, ___, 789 });
-
-        update(13, 30, 50);
-        assertState(new int[] { 11, 2, 50, 60 - 30 }, new int[] { 123, ___, ___, 789 });
-
-        update(13, 40, 50);
-        assertState(new int[] { 11, 2, 50, 60 - 40 }, new int[] { 123, ___, ___, ___ });
-
-        update(13, 60, 50);
-        assertState(new int[] { 11, 2, 50 }, new int[] { 123, ___, ___ });
-    }
-}
diff --git a/proprietary/frameworks/base/tests/text/src/android/text/PackedIntVectorTest.java b/proprietary/frameworks/base/tests/text/src/android/text/PackedIntVectorTest.java
deleted file mode 100755
index 45c13a9b214b402e539377426734c4a9416d94d9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/src/android/text/PackedIntVectorTest.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.text;
-
-import android.text.TextUtils.PackedIntVectorForTest;
-import junit.framework.TestCase;
-
-/**
- * PackedIntVectorTest tests the features of android.util.PackedIntVector.
- */
-public class PackedIntVectorTest extends TestCase {
-
-    public void testBasic() throws Exception {
-        for (int width = 0; width < 10; width++) {
-            PackedIntVectorForTest p = new PackedIntVectorForTest(width) ;
-            int[] ins = new int[width];
-
-            for (int height = width * 2; height < width * 4; height++) {
-                assertEquals(p.width(), width);
-
-                // Test adding rows.
-
-                for (int i = 0; i < height; i++) {
-                    int at;
-
-                    if (i % 2 == 0) {
-                        at = i;
-                    } else {
-                        at = p.size() - i;
-                    }
-
-                    for (int j = 0; j < width; j++) {
-                        ins[j] = i + j;
-                    }
-
-                    if (i == height / 2) {
-                        p.insertAt(at, null);
-                    } else {
-                        p.insertAt(at, ins);
-                    }
-
-                    assertEquals(p.size(), i + 1);
-
-                    for (int j = 0; j < width; j++) {
-                        if (i == height / 2) {
-                            assertEquals(0, p.getValue(at, j));
-                        } else {
-                            assertEquals(p.getValue(at, j), i + j);
-                        }
-                    }
-                }
-
-                // Test setting values.
-
-                for (int i = 0; i < height; i++) {
-                    for (int j = 0; j < width; j++) {
-                        p.setValue(i, j, i * j);
-
-                        assertEquals(p.getValue(i, j), i * j);
-                    }
-                }
-
-                // Test offsetting values.
-
-                for (int j = 0; j < width; j++) {
-                    p.adjustValuesBelow(j * 2, j, j + 27);
-                }
-
-                for (int i = 0; i < height; i++) {
-                    for (int j = 0; j < width; j++) {
-                        int expect = i * j;
-
-                        if (i >= j * 2) {
-                            expect += j + 27;
-                        }
-
-                        assertEquals(p.getValue(i, j), expect);
-                    }
-                }
-
-                for (int j = 0; j < width; j++) {
-                    p.adjustValuesBelow(j, j, j * j + 14);
-                }
-
-                for (int i = 0; i < height; i++) {
-                    for (int j = 0; j < width; j++) {
-                        int expect = i * j;
-
-                        if (i >= j * 2) {
-                            expect += j + 27;
-                        }
-                        if (i >= j) {
-                            expect += j * j + 14;
-                        }
-
-                        assertEquals(p.getValue(i, j), expect);
-                    }
-                }
-
-                // Test undoing offsets.
-
-                for (int j = 0; j < width; j++) {
-                    p.adjustValuesBelow(j * 2, j, -(j + 27));
-                    p.adjustValuesBelow(j, j, -(j * j + 14));
-                }
-
-                for (int i = 0; i < height; i++) {
-                    for (int j = 0; j < width; j++) {
-                        assertEquals(p.getValue(i, j), i * j);
-                    }
-                }
-
-                // Test deleting rows.
-
-                while (p.size() > 0) {
-                    int osize = p.size();
-                    int del = osize / 3;
-
-                    if (del == 0) {
-                        del = 1;
-                    }
-
-                    int at = (osize - del) / 2;
-                    p.deleteAt(at, del);
-
-                    assertEquals(p.size(), osize - del);
-
-                    for (int i = 0; i < at; i++) {
-                        for (int j = 0; j < width; j++) {
-                            assertEquals(p.getValue(i, j), i * j);
-                        }
-                    }
-
-                    for (int i = at; i < p.size(); i++) {
-                        for (int j = 0; j < width; j++) {
-                            assertEquals(p.getValue(i, j), (i + height - p.size()) * j);
-                        }
-                    }
-                }
-
-                assertEquals(0, p.size());
-            }
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/text/src/android/text/SpannableStringBuilderTest.java b/proprietary/frameworks/base/tests/text/src/android/text/SpannableStringBuilderTest.java
deleted file mode 100755
index da920c9a3e2ea7a35949ab4de54d8304c9b145fd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/src/android/text/SpannableStringBuilderTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.text;
-
-import android.text.Spannable;
-import android.text.SpannableStringBuilder;
-
-public class SpannableStringBuilderTest extends SpannableTest {
-
-    protected Spannable newSpannableWithText(String text) {
-        return new SpannableStringBuilder(text);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/text/src/android/text/SpannableStringTest.java b/proprietary/frameworks/base/tests/text/src/android/text/SpannableStringTest.java
deleted file mode 100755
index 8dd12146ea66d4dd6a047cb32fc9d110bf0a8f52..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/src/android/text/SpannableStringTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.text;
-
-import android.text.Spannable;
-import android.text.SpannableString;
-
-public class SpannableStringTest extends SpannableTest {
-
-    protected Spannable newSpannableWithText(String text) {
-        return new SpannableString(text);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/text/src/android/text/SpannableTest.java b/proprietary/frameworks/base/tests/text/src/android/text/SpannableTest.java
deleted file mode 100755
index 46be99d5c775d042e40f0c778fa3ebde554e3a9f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/src/android/text/SpannableTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.text;
-
-import android.test.InstrumentationTestCase;
-import android.test.MoreAsserts;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.text.Spannable;
-
-public abstract class SpannableTest extends InstrumentationTestCase {
-
-    protected abstract Spannable newSpannableWithText(String text);
-
-    @MediumTest
-    public void testGetSpans() {
-        Spannable spannable = newSpannableWithText("abcdef");
-        Object emptySpan = new Object();
-        spannable.setSpan(emptySpan, 1, 1, 0);
-        Object unemptySpan = new Object();
-        spannable.setSpan(unemptySpan, 1, 2, 0);
-
-        Object[] spans;
-
-        // Empty spans are included when they merely abut the query region
-        // but other spans are not, unless the query region is empty, in
-        // in which case any abutting spans are returned.
-        spans = spannable.getSpans(0, 1, Object.class);
-        MoreAsserts.assertEquals(new Object[]{emptySpan}, spans);
-        spans = spannable.getSpans(0, 2, Object.class);
-        MoreAsserts.assertEquals(new Object[]{emptySpan, unemptySpan}, spans);
-        spans = spannable.getSpans(1, 2, Object.class);
-        MoreAsserts.assertEquals(new Object[]{emptySpan, unemptySpan}, spans);
-        spans = spannable.getSpans(2, 2, Object.class);
-        MoreAsserts.assertEquals(new Object[]{unemptySpan}, spans);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/text/src/android/text/SpannedTest.java b/proprietary/frameworks/base/tests/text/src/android/text/SpannedTest.java
deleted file mode 100755
index c080939b9b344b0939f7e1e966e825da42deafaa..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/src/android/text/SpannedTest.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.text;
-
-import android.graphics.Typeface;
-import android.os.Parcel;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.text.*;
-import android.text.style.*;
-import android.util.Log;
-
-import junit.framework.TestCase;
-
-/**
- * SpannedTest tests some features of Spanned
- */
-public class SpannedTest extends TestCase {
-    private int mExpect;
-
-    @SmallTest
-    public void testSpannableString() throws Exception {
-        checkPriority(new SpannableString("the quick brown fox"));
-    }
-
-    @SmallTest
-    public void testSpannableStringBuilder() throws Exception {
-        checkPriority2(new SpannableStringBuilder("the quick brown fox"));
-    }
-
-    @SmallTest
-    public void testAppend() throws Exception {
-        Object o = new Object();
-        SpannableString ss = new SpannableString("Test");
-        ss.setSpan(o, 0, ss.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-
-        SpannableStringBuilder ssb = new SpannableStringBuilder();
-        ssb.append(ss);
-        assertEquals(0, ssb.getSpanStart(o));
-        assertEquals(4, ssb.getSpanEnd(o));
-        assertEquals(1, ssb.getSpans(0, 4, Object.class).length);
-
-        ssb.insert(0, ss);
-        assertEquals(4, ssb.getSpanStart(o));
-        assertEquals(8, ssb.getSpanEnd(o));
-        assertEquals(0, ssb.getSpans(0, 4, Object.class).length);
-        assertEquals(1, ssb.getSpans(4, 8, Object.class).length);
-    }
-
-    @SmallTest
-    public void testWrapParcel() {
-        SpannableString s = new SpannableString("Hello there world");
-        CharacterStyle mark = new StyleSpan(Typeface.BOLD);
-        s.setSpan(mark, 1, 2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        s.setSpan(CharacterStyle.wrap(mark), 3, 7,
-                  Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        s.setSpan(new TextAppearanceSpan("mono", 0, -1, null, null), 7, 8,
-                  Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        s.setSpan(CharacterStyle.wrap(new TypefaceSpan("mono")), 8, 9,
-                  Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-
-        Parcel p = Parcel.obtain();
-        TextUtils.writeToParcel(s, p, 0);
-        p.setDataPosition(0);
-
-        Spanned s2 = (Spanned) TextUtils.CHAR_SEQUENCE_CREATOR.
-                        createFromParcel(p);
-        StyleSpan[] style;
-
-        style = s2.getSpans(1, 2, StyleSpan.class);
-        assertEquals(1, style.length);
-        assertEquals(1, s2.getSpanStart(style[0]));
-        assertEquals(2, s2.getSpanEnd(style[0]));
-
-        style = s2.getSpans(3, 7, StyleSpan.class);
-        assertEquals(1, style.length);
-        assertEquals(3, s2.getSpanStart(style[0]));
-        assertEquals(7, s2.getSpanEnd(style[0]));
-
-        TextAppearanceSpan[] appearance = s2.getSpans(7, 8,
-                                                TextAppearanceSpan.class);
-        assertEquals(1, appearance.length);
-        assertEquals(7, s2.getSpanStart(appearance[0]));
-        assertEquals(8, s2.getSpanEnd(appearance[0]));
-
-        TypefaceSpan[] tf = s2.getSpans(8, 9, TypefaceSpan.class);
-        assertEquals(1, tf.length);
-        assertEquals(8, s2.getSpanStart(tf[0]));
-        assertEquals(9, s2.getSpanEnd(tf[0]));
-    }
-
-    private void checkPriority(Spannable s) {
-        s.setSpan(new Object(), 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE |
-                                      (5 << Spannable.SPAN_PRIORITY_SHIFT));
-        s.setSpan(new Object(), 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE |
-                                      (10 << Spannable.SPAN_PRIORITY_SHIFT));
-        s.setSpan(new Object(), 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE |
-                                      (0 << Spannable.SPAN_PRIORITY_SHIFT));
-        s.setSpan(new Object(), 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE |
-                                      (15 << Spannable.SPAN_PRIORITY_SHIFT));
-        s.setSpan(new Object(), 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE |
-                                      (3 << Spannable.SPAN_PRIORITY_SHIFT));
-        s.setSpan(new Object(), 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE |
-                                      (6 << Spannable.SPAN_PRIORITY_SHIFT));
-        s.setSpan(new Object(), 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE |
-                                      (0 << Spannable.SPAN_PRIORITY_SHIFT));
-
-        Object[] spans = s.getSpans(0, s.length(), Object.class);
-
-        for (int i = 0; i < spans.length - 1; i++) {
-            assertEquals((s.getSpanFlags(spans[i]) & Spanned.SPAN_PRIORITY) >=
-                         (s.getSpanFlags(spans[i + 1]) & Spanned.SPAN_PRIORITY),
-                         true);
-        }
-
-        mExpect = 0;
-
-        s.setSpan(new Watcher(2), 0, s.length(),
-                  Spannable.SPAN_INCLUSIVE_INCLUSIVE |
-                  (2 << Spannable.SPAN_PRIORITY_SHIFT));
-        s.setSpan(new Watcher(4), 0, s.length(),
-                  Spannable.SPAN_INCLUSIVE_INCLUSIVE |
-                  (4 << Spannable.SPAN_PRIORITY_SHIFT));
-        s.setSpan(new Watcher(1), 0, s.length(),
-                  Spannable.SPAN_INCLUSIVE_INCLUSIVE |
-                  (1 << Spannable.SPAN_PRIORITY_SHIFT));
-        s.setSpan(new Watcher(3), 0, s.length(),
-                  Spannable.SPAN_INCLUSIVE_INCLUSIVE |
-                  (3 << Spannable.SPAN_PRIORITY_SHIFT));
-
-        mExpect = 4;
-        s.setSpan(new Object(), 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        assertEquals(mExpect, 0);
-    }
-
-    private void checkPriority2(SpannableStringBuilder ssb) {
-        checkPriority(ssb);
-
-        mExpect = 4;
-        ssb.insert(3, "something");
-        assertEquals(mExpect, 0);
-    }
-
-    private class Watcher implements SpanWatcher, TextWatcher {
-        private int mSequence;
-
-        public Watcher(int sequence) {
-            mSequence = sequence;
-        }
-
-        public void onSpanChanged(Spannable b, Object o, int s, int e,
-                                  int st, int en) { }
-        public void onSpanRemoved(Spannable b, Object o, int s, int e) { }
-
-        public void onSpanAdded(Spannable b, Object o, int s, int e) {
-            if (mExpect != 0) {
-                assertEquals(mSequence, mExpect);
-                mExpect = mSequence - 1;
-            }
-        }
-
-        public void beforeTextChanged(CharSequence s, int start, int count,
-                                      int after) { }
-        public void onTextChanged(CharSequence s, int start, int before,
-                                      int count) {
-            if (mExpect != 0) {
-                assertEquals(mSequence, mExpect);
-                mExpect = mSequence - 1;
-            }
-        }
-
-        public void afterTextChanged(Editable s) { }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/text/src/android/text/StaticLayoutBidiTest.java b/proprietary/frameworks/base/tests/text/src/android/text/StaticLayoutBidiTest.java
deleted file mode 100755
index 95d347efe661af574ce69f10ce375a71c47edbfc..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/src/android/text/StaticLayoutBidiTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package android.text;
-
-import android.test.suitebuilder.annotation.SmallTest;
-import android.util.Log;
-
-import junit.framework.TestCase;
-
-/**
- * Quick check of native bidi implementation.
- */
-public class StaticLayoutBidiTest extends TestCase {
-
-    public static final int REQ_DL = 2; // Layout.DIR_REQUEST_DEFAULT_LTR;
-    public static final int REQ_DR = -2; // Layout.DIR_REQUEST_DEFAULT_RTL;
-    public static final int REQ_L = 1; // Layout.DIR_REQUEST_LTR;
-    public static final int REQ_R = -1; // Layout.DIR_REQUEST_RTL;
-    public static final int L = Layout.DIR_LEFT_TO_RIGHT;
-    public static final int R = Layout.DIR_RIGHT_TO_LEFT;
-
-    public static final String SP = " ";
-    public static final String ALEF = "\u05d0";
-    public static final String BET = "\u05d1";
-    public static final String GIMEL = "\u05d2";
-    public static final String DALET = "\u05d3";
-
-    //@SmallTest
-    public void testAllLtr() {
-        expectNativeBidi(REQ_DL, "a test", "000000", L);
-    }
-
-    //@SmallTest
-    public void testLtrRtl() {
-        expectNativeBidi(REQ_DL, "abc " + ALEF + BET + GIMEL, "0000111", L);
-    }
-
-    //@SmallTest
-    public void testAllRtl() {
-        expectNativeBidi(REQ_DL, ALEF + SP + ALEF + BET + GIMEL + DALET, "111111", R);
-    }
-
-    //@SmallTest
-    public void testRtlLtr() {
-        expectNativeBidi(REQ_DL,  ALEF + BET + GIMEL + " abc", "1111222", R);
-    }
-
-    //@SmallTest
-    public void testRAllLtr() {
-        expectNativeBidi(REQ_R, "a test", "222222", R);
-    }
-
-    //@SmallTest
-    public void testRLtrRtl() {
-        expectNativeBidi(REQ_R, "abc " + ALEF + BET + GIMEL, "2221111", R);
-    }
-
-    //@SmallTest
-    public void testLAllRtl() {
-        expectNativeBidi(REQ_L, ALEF + SP + ALEF + BET + GIMEL + DALET, "111111", L);
-    }
-
-    //@SmallTest
-    public void testLRtlLtr() {
-        expectNativeBidi(REQ_DL,  ALEF + BET + GIMEL + " abc", "1111222", R);
-    }
-
-    //@SmallTest
-    public void testNativeBidi() {
-        expectNativeBidi(REQ_L,  ALEF + BET + GIMEL + " abc", "1110000", L);
-    }
-
-    private void expectNativeBidi(int dir, String text,
-            String expectedLevels, int expectedDir) {
-        char[] chs = text.toCharArray();
-        int n = chs.length;
-        byte[] chInfo = new byte[n];
-
-        int resultDir = TextUtils.getBidiForTest(dir, chs, chInfo, n, false); // AndroidBidi.bidi(dir, chs, chInfo, n, false);
-
-        {
-            StringBuilder sb = new StringBuilder("info:");
-            for (int i = 0; i < n; ++i) {
-                sb.append(" ").append(String.valueOf(chInfo[i]));
-            }
-            Log.i("BIDI", sb.toString());
-        }
-
-        char[] resultLevelChars = new char[n];
-        for (int i = 0; i < n; ++i) {
-            resultLevelChars[i] = (char) ('0' + chInfo[i]);
-        }
-        String resultLevels = new String(resultLevelChars);
-        assertEquals("direction", expectedDir, resultDir);
-        assertEquals("levels", expectedLevels, resultLevels);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/text/src/android/text/StaticLayoutDirectionsTest.java b/proprietary/frameworks/base/tests/text/src/android/text/StaticLayoutDirectionsTest.java
deleted file mode 100755
index c572ee2bb6aac9039263eb66190685b08308df0e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/src/android/text/StaticLayoutDirectionsTest.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package android.text;
-
-import android.text.Layout.Directions;
-import android.text.StaticLayoutTest.LayoutBuilder;
-
-import java.util.Arrays;
-import java.util.Formatter;
-
-import junit.framework.TestCase;
-
-public class StaticLayoutDirectionsTest extends TestCase {
-    private static final char ALEF = '\u05d0';
-
-    private static Directions dirs(int ... dirs) {
-        return TextUtils.newDirectionsForTest(dirs);
-    }
-
-    // constants from Layout that are package-protected
-    private static final int RUN_LENGTH_MASK = 0x03ffffff;
-    private static final int RUN_LEVEL_SHIFT = 26;
-    private static final int RUN_LEVEL_MASK = 0x3f;
-    private static final int RUN_RTL_FLAG = 1 << RUN_LEVEL_SHIFT;
-
-    private static final Directions DIRS_ALL_LEFT_TO_RIGHT = TextUtils.newDirectionsForTest(new int[] { 0, RUN_LENGTH_MASK }) ;
-    private static final Directions DIRS_ALL_RIGHT_TO_LEFT = TextUtils.newDirectionsForTest((new int[] { 0, RUN_LENGTH_MASK | RUN_RTL_FLAG })) ;
-
-    private static final int LVL1_1 = 1 | (1 << RUN_LEVEL_SHIFT);
-    private static final int LVL2_1 = 1 | (2 << RUN_LEVEL_SHIFT);
-    private static final int LVL2_2 = 2 | (2 << RUN_LEVEL_SHIFT);
-
-    private static String[] texts = {
-        "",
-        " ",
-        "a",
-        "a1",
-        "aA",
-        "a1b",
-        "a1A",
-        "aA1",
-        "aAb",
-        "aA1B",
-        "aA1B2",
-
-        // rtl
-        "A",
-        "A1",
-        "Aa",
-        "A1B",
-        "A1a",
-        "Aa1",
-        "AaB"
-    };
-
-    // Expected directions are an array of start/length+level pairs,
-    // in visual order from the leading margin.
-    private static Directions[] expected = {
-        DIRS_ALL_LEFT_TO_RIGHT,
-        DIRS_ALL_LEFT_TO_RIGHT,
-        DIRS_ALL_LEFT_TO_RIGHT,
-        DIRS_ALL_LEFT_TO_RIGHT,
-        dirs(0, 1, 1, LVL1_1),
-        DIRS_ALL_LEFT_TO_RIGHT,
-        dirs(0, 2, 2, LVL1_1),
-        dirs(0, 1, 2, LVL2_1, 1, LVL1_1),
-        dirs(0, 1, 1, LVL1_1, 2, 1),
-        dirs(0, 1, 3, LVL1_1, 2, LVL2_1, 1, LVL1_1),
-        dirs(0, 1, 4, LVL2_1, 3, LVL1_1, 2, LVL2_1, 1, LVL1_1),
-
-        // rtl
-        DIRS_ALL_RIGHT_TO_LEFT,
-        dirs(0, LVL1_1, 1, LVL2_1),
-        dirs(0, LVL1_1, 1, LVL2_1),
-        dirs(0, LVL1_1, 1, LVL2_1, 2, LVL1_1),
-        dirs(0, LVL1_1, 1, LVL2_2),
-        dirs(0, LVL1_1, 1, LVL2_2),
-        dirs(0, LVL1_1, 1, LVL2_1, 2, LVL1_1),
-    };
-
-    private static String pseudoBidiToReal(String src) {
-        char[] chars = src.toCharArray();
-        for (int j = 0; j < chars.length; ++j) {
-            char c = chars[j];
-            if (c >= 'A' && c <= 'D') {
-                chars[j] = (char) (ALEF + c - 'A');
-            }
-        }
-
-        return new String(chars, 0, chars.length);
-    }
-
-    // @SmallTest
-    public void testDirections() {
-        StringBuilder buf = new StringBuilder("\n");
-        Formatter f = new Formatter(buf);
-
-        LayoutBuilder b = StaticLayoutTest.builder();
-        for (int i = 0; i < texts.length; ++i) {
-            b.setText(pseudoBidiToReal(texts[i]));
-            checkDirections(b.build(), i, b.text, expected, f);
-        }
-        if (buf.length() > 1) {
-            fail(buf.toString());
-        }
-    }
-
-    // @SmallTest
-    public void testTrailingWhitespace() {
-        LayoutBuilder b = StaticLayoutTest.builder();
-        b.setText(pseudoBidiToReal("Ab   c"));
-        float width = b.paint.measureText(b.text, 0, 5);  // exclude 'c'
-        b.setWidth(Math.round(width));
-        Layout l = b.build();
-        if (l.getLineCount() != 2) {
-            throw new RuntimeException("expected 2 lines, got: " + l.getLineCount());
-        }
-        Directions result = l.getLineDirections(0);
-        Directions expected = dirs(0, LVL1_1, 1, LVL2_1, 2, 3 | (1 << Layout.RUN_LEVEL_SHIFT));
-        expectDirections("split line", expected, result);
-    }
-
-    public void testNextToRightOf() {
-        LayoutBuilder b = StaticLayoutTest.builder();
-        b.setText(pseudoBidiToReal("aA1B2"));
-        // visual a2B1A positions 04321
-        // 0: |a2B1A, strong is sol, after -> 0
-        // 1: a|2B1A, strong is a, after ->, 1
-        // 2: a2|B1A, strong is B, after -> 4
-        // 3: a2B|1A, strong is B, before -> 3
-        // 4: a2B1|A, strong is A, after -> 2
-        // 5: a2B1A|, strong is eol, before -> 5
-        int[] expected = { 0, 1, 4, 3, 2, 5 };
-        Layout l = b.build();
-        int n = 0;
-        for (int i = 1; i < expected.length; ++i) {
-            int t = l.getOffsetToRightOf(n);
-            if (t != expected[i]) {
-                fail("offset[" + i + "] to right of: " + n + " expected: " +
-                        expected[i] + " got: " + t);
-            }
-            n = t;
-        }
-    }
-
-    public void testNextToLeftOf() {
-        LayoutBuilder b = StaticLayoutTest.builder();
-        b.setText(pseudoBidiToReal("aA1B2"));
-        int[] expected = { 0, 1, 4, 3, 2, 5 };
-        Layout l = b.build();
-        int n = 5;
-        for (int i = expected.length - 1; --i >= 0; ) {
-            int t = l.getOffsetToLeftOf(n);
-            if (t != expected[i]) {
-                fail("offset[" + i + "] to left of: " + n + " expected: " +
-                        expected[i] + " got: " + t);
-            }
-            n = t;
-        }
-    }
-
-    // utility, not really a test
-    /*
-    public void testMeasureText1() {
-        LayoutBuilder b = StaticLayoutTest.builder();
-        String text = "ABC"; // "abAB"
-        b.setText(pseudoBidiToReal(text));
-        Layout l = b.build();
-        Directions directions = l.getLineDirections(0);
-
-        TextPaint workPaint = new TextPaint();
-
-        int dir = -1; // LEFT_TO_RIGHT
-        boolean trailing = true;
-        boolean alt = true;
-        do {
-            dir = -dir;
-            do {
-                trailing = !trailing;
-                for (int offset = 0, end = b.text.length(); offset <= end; ++offset) {
-                    float width = Layout.measureText(b.paint,
-                            workPaint,
-                            b.text,
-                            0, offset, end,
-                            dir, directions,
-                            trailing, false,
-                            null);
-                    Log.i("BIDI", "dir: " + dir + " trail: " + trailing +
-                            " offset: " + offset + " width: " + width);
-                }
-            } while (!trailing);
-        } while (dir > 0);
-    }
-    */
-
-    // utility for displaying arrays in hex
-    private static String hexArray(int[] array) {
-        StringBuilder sb = new StringBuilder();
-        sb.append('{');
-        for (int i : array) {
-            if (sb.length() > 1) {
-                sb.append(", ");
-            }
-            sb.append(Integer.toHexString(i));
-        }
-        sb.append('}');
-        return sb.toString();
-    }
-
-    private void checkDirections(Layout l, int i, String text,
-            Directions[] expectedDirs, Formatter f) {
-        Directions expected = expectedDirs[i];
-        Directions result = l.getLineDirections(0);
-        if (!Arrays.equals(TextUtils.getDirectionsForTest(expected), TextUtils.getDirectionsForTest(result))) {
-            f.format("%n[%2d] '%s', %s != %s", i, text,
-                    hexArray(TextUtils.getDirectionsForTest(expected)),
-                    hexArray(TextUtils.getDirectionsForTest(result)));
-        }
-    }
-
-    private void expectDirections(String msg, Directions expected, Directions result) {
-        if (!Arrays.equals(TextUtils.getDirectionsForTest(expected), TextUtils.getDirectionsForTest(result))) {
-            fail("expected: " + hexArray(TextUtils.getDirectionsForTest(expected)) +
-                    " got: " + hexArray(TextUtils.getDirectionsForTest(result)));
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/text/src/android/text/StaticLayoutTest.java b/proprietary/frameworks/base/tests/text/src/android/text/StaticLayoutTest.java
deleted file mode 100755
index f3aca1be75e4e42c368ab603acefc98318657c2b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/src/android/text/StaticLayoutTest.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package android.text;
-
-import android.graphics.Paint.FontMetricsInt;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.text.Layout.Alignment;
-import static android.text.Layout.Alignment.*;
-import android.util.Log;
-
-import junit.framework.TestCase;
-
-/**
- * Tests StaticLayout vertical metrics behavior.
- *
- * Requires disabling access checks in the vm since this calls package-private
- * APIs.
- *
- * @Suppress
- */
-public class StaticLayoutTest extends TestCase {
-
-    /**
-     * Basic test showing expected behavior and relationship between font
-     * metrics and line metrics.
-     */
-    //@SmallTest
-    public void testGetters1() {
-        LayoutBuilder b = builder();
-        FontMetricsInt fmi = b.paint.getFontMetricsInt();
-
-        // check default paint
-        Log.i("TG1:paint", fmi.toString());
-
-        Layout l = b.build();
-        assertVertMetrics(l, 0, 0,
-                fmi.ascent, fmi.descent);
-
-        // other quick metrics
-        assertEquals(0, l.getLineStart(0));
-        assertEquals(Layout.DIR_LEFT_TO_RIGHT, l.getParagraphDirection(0));
-        assertEquals(false, l.getLineContainsTab(0));
-        assertEquals(TextUtils.getLayoutDirectionsForTest(), l.getLineDirections(0));
-        assertEquals(0, l.getEllipsisCount(0));
-        assertEquals(0, l.getEllipsisStart(0));
-        assertEquals(b.width, l.getEllipsizedWidth());
-    }
-
-    /**
-     * Basic test showing effect of includePad = true with 1 line.
-     * Top and bottom padding are affected, as is the line descent and height.
-     */
-    //@SmallTest
-    public void testGetters2() {
-        LayoutBuilder b = builder()
-            .setIncludePad(true);
-        FontMetricsInt fmi = b.paint.getFontMetricsInt();
-
-        Layout l = b.build();
-        assertVertMetrics(l, fmi.top - fmi.ascent, fmi.bottom - fmi.descent,
-                fmi.top, fmi.bottom);
-    }
-
-    /**
-     * Basic test showing effect of includePad = true wrapping to 2 lines.
-     * Ascent of top line and descent of bottom line are affected.
-     */
-    //@SmallTest
-    public void testGetters3() {
-        LayoutBuilder b = builder()
-            .setIncludePad(true)
-            .setWidth(50);
-        FontMetricsInt fmi = b.paint.getFontMetricsInt();
-
-        Layout l =  b.build();
-        assertVertMetrics(l, fmi.top - fmi.ascent, fmi.bottom - fmi.descent,
-            fmi.top, fmi.descent,
-            fmi.ascent, fmi.bottom);
-    }
-
-    /**
-     * Basic test showing effect of includePad = true wrapping to 3 lines.
-     * First line ascent is top, bottom line descent is bottom.
-     */
-    //@SmallTest
-    public void testGetters4() {
-        LayoutBuilder b = builder()
-            .setText("This is a longer test")
-            .setIncludePad(true)
-            .setWidth(50);
-        FontMetricsInt fmi = b.paint.getFontMetricsInt();
-
-        Layout l = b.build();
-        assertVertMetrics(l, fmi.top - fmi.ascent, fmi.bottom - fmi.descent,
-                fmi.top, fmi.descent,
-                fmi.ascent, fmi.descent,
-                fmi.ascent, fmi.bottom);
-    }
-
-    /**
-     * Basic test showing effect of includePad = true wrapping to 3 lines and
-     * large text. See effect of leading. Currently, we don't expect there to
-     * even be non-zero leading.
-     */
-    //@SmallTest
-    public void testGetters5() {
-        LayoutBuilder b = builder()
-            .setText("This is a longer test")
-            .setIncludePad(true)
-            .setWidth(150);
-        b.paint.setTextSize(36);
-        FontMetricsInt fmi = b.paint.getFontMetricsInt();
-
-        if (fmi.leading == 0) { // nothing to test
-            Log.i("TG5", "leading is 0, skipping test");
-            return;
-        }
-
-        // So far, leading is not used, so this is the same as TG4.  If we start
-        // using leading, this will fail.
-        Layout l = b.build();
-        assertVertMetrics(l, fmi.top - fmi.ascent, fmi.bottom - fmi.descent,
-                fmi.top, fmi.descent,
-                fmi.ascent, fmi.descent,
-                fmi.ascent, fmi.bottom);
-    }
-
-    /**
-     * Basic test showing effect of includePad = true, spacingAdd = 2, wrapping
-     * to 3 lines.
-     */
-    //@SmallTest
-    public void testGetters6() {
-        int spacingAdd = 2; // int so expressions return int
-        LayoutBuilder b = builder()
-            .setText("This is a longer test")
-            .setIncludePad(true)
-            .setWidth(50)
-            .setSpacingAdd(spacingAdd);
-        FontMetricsInt fmi = b.paint.getFontMetricsInt();
-
-        Layout l = b.build();
-        assertVertMetrics(l, fmi.top - fmi.ascent, fmi.bottom - fmi.descent,
-                fmi.top, fmi.descent + spacingAdd,
-                fmi.ascent, fmi.descent + spacingAdd,
-                fmi.ascent, fmi.bottom);
-    }
-
-    /**
-     * Basic test showing effect of includePad = true, spacingAdd = 2,
-     * spacingMult = 1.5, wrapping to 3 lines.
-     */
-    //@SmallTest
-    public void testGetters7() {
-        LayoutBuilder b = builder()
-            .setText("This is a longer test")
-            .setIncludePad(true)
-            .setWidth(50)
-            .setSpacingAdd(2)
-            .setSpacingMult(1.5f);
-        FontMetricsInt fmi = b.paint.getFontMetricsInt();
-        Scaler s = new Scaler(b.spacingMult, b.spacingAdd);
-
-        Layout l = b.build();
-        assertVertMetrics(l, fmi.top - fmi.ascent, fmi.bottom - fmi.descent,
-                fmi.top, fmi.descent + s.scale(fmi.descent - fmi.top),
-                fmi.ascent, fmi.descent + s.scale(fmi.descent - fmi.ascent),
-                fmi.ascent, fmi.bottom);
-    }
-
-    /**
-     * Basic test showing effect of includePad = true, spacingAdd = 0,
-     * spacingMult = 0.8 when wrapping to 3 lines.
-     */
-    //@SmallTest
-    public void testGetters8() {
-        LayoutBuilder b = builder()
-            .setText("This is a longer test")
-            .setIncludePad(true)
-            .setWidth(50)
-            .setSpacingAdd(2)
-            .setSpacingMult(.8f);
-        FontMetricsInt fmi = b.paint.getFontMetricsInt();
-        Scaler s = new Scaler(b.spacingMult, b.spacingAdd);
-
-        Layout l = b.build();
-        assertVertMetrics(l, fmi.top - fmi.ascent, fmi.bottom - fmi.descent,
-                fmi.top, fmi.descent + s.scale(fmi.descent - fmi.top),
-                fmi.ascent, fmi.descent + s.scale(fmi.descent - fmi.ascent),
-                fmi.ascent, fmi.bottom);
-    }
-
-    // ----- test utility classes and methods -----
-
-    // Models the effect of the scale and add parameters.  I think the current
-    // implementation misbehaves.
-    private static class Scaler {
-        private final float sMult;
-        private final float sAdd;
-
-        Scaler(float sMult, float sAdd) {
-            this.sMult = sMult - 1;
-            this.sAdd = sAdd;
-        }
-
-        public int scale(float height) {
-            int altVal = (int) (height * sMult + sAdd + 0.5);
-            int rndVal = Math.round(height * sMult + sAdd);
-            if (altVal != rndVal) {
-                Log.i("Scale", "expected scale: " + rndVal +
-                        " != returned scale: " + altVal);
-            }
-            return rndVal;
-        }
-    }
-
-    /* package */ static LayoutBuilder builder() {
-        return new LayoutBuilder();
-    }
-
-    /* package */ static class LayoutBuilder {
-        String text = "This is a test";
-        TextPaint paint = new TextPaint(); // default
-        int width = 100;
-        Alignment align = ALIGN_NORMAL;
-        float spacingMult = 1;
-        float spacingAdd = 0;
-        boolean includePad = false;
-
-        LayoutBuilder setText(String text) {
-            this.text = text;
-            return this;
-        }
-
-        LayoutBuilder setPaint(TextPaint paint) {
-            this.paint = paint;
-            return this;
-        }
-
-        LayoutBuilder setWidth(int width) {
-            this.width = width;
-            return this;
-        }
-
-        LayoutBuilder setAlignment(Alignment align) {
-            this.align = align;
-            return this;
-        }
-
-        LayoutBuilder setSpacingMult(float spacingMult) {
-            this.spacingMult = spacingMult;
-            return this;
-        }
-
-        LayoutBuilder setSpacingAdd(float spacingAdd) {
-            this.spacingAdd = spacingAdd;
-            return this;
-        }
-
-        LayoutBuilder setIncludePad(boolean includePad) {
-            this.includePad = includePad;
-            return this;
-        }
-
-       Layout build() {
-            return  new StaticLayout(text, paint, width, align, spacingMult,
-                spacingAdd, includePad);
-        }
-    }
-
-    private void assertVertMetrics(Layout l, int topPad, int botPad, int... values) {
-        assertTopBotPadding(l, topPad, botPad);
-        assertLinesMetrics(l, values);
-    }
-
-    private void assertLinesMetrics(Layout l, int... values) {
-        // sanity check
-        if ((values.length & 0x1) != 0) {
-            throw new IllegalArgumentException(String.valueOf(values.length));
-        }
-
-        int lines = values.length >> 1;
-        assertEquals(lines, l.getLineCount());
-
-        int t = 0;
-        for (int i = 0, n = 0; i < lines; ++i, n += 2) {
-            int a = values[n];
-            int d = values[n + 1];
-            int h = -a + d;
-            assertLineMetrics(l, i, t, a, d, h);
-            t += h;
-        }
-
-        assertEquals(t, l.getHeight());
-    }
-
-    private void assertLineMetrics(Layout l, int line,
-            int top, int ascent, int descent, int height) {
-        String info = "line " + line;
-        assertEquals(info, top, l.getLineTop(line));
-        assertEquals(info, ascent, l.getLineAscent(line));
-        assertEquals(info, descent, l.getLineDescent(line));
-        assertEquals(info, height, l.getLineBottom(line) - top);
-    }
-
-    private void assertTopBotPadding(Layout l, int topPad, int botPad) {
-        assertEquals(topPad, l.getTopPadding());
-        assertEquals(botPad, l.getBottomPadding());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/text/src/android/text/TextLayoutTest.java b/proprietary/frameworks/base/tests/text/src/android/text/TextLayoutTest.java
deleted file mode 100755
index 6cf30005ee76e9b04e2b0159cc791bdef9620e95..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/src/android/text/TextLayoutTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.text;
-
-import android.test.suitebuilder.annotation.SmallTest;
-import android.text.DynamicLayout;
-import android.text.Layout;
-import android.text.StaticLayout;
-import android.text.TextPaint;
-import junit.framework.TestCase;
-
-
-public class TextLayoutTest extends TestCase {
-
-    protected String mString;
-    protected TextPaint mPaint;
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        mString = "The quick brown fox";
-        mPaint = new TextPaint();
-    }
-
-    @SmallTest
-    public void testStaticLayout() throws Exception {
-        Layout l = new StaticLayout(mString, mPaint, 200,
-                Layout.Alignment.ALIGN_NORMAL, 1, 0,
-                true);
-    }
-
-    @SmallTest
-    public void testDynamicLayoutTest() throws Exception {
-        Layout l = new DynamicLayout(mString, mPaint, 200,
-                Layout.Alignment.ALIGN_NORMAL, 1, 0,
-                true);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/text/src/android/text/TextUtilsTest.java b/proprietary/frameworks/base/tests/text/src/android/text/TextUtilsTest.java
deleted file mode 100755
index 3d6f3a3c313eba6d16ba8b8414f8fd8edcb0ab0f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/src/android/text/TextUtilsTest.java
+++ /dev/null
@@ -1,522 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.text;
-
-import com.google.android.collect.Lists;
-
-import android.test.MoreAsserts;
-import android.os.Parcel;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.text.style.StyleSpan;
-import android.text.util.Rfc822Token;
-import android.text.util.Rfc822Tokenizer;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-/**
- * TextUtilsTest tests {@link TextUtils}.
- */
-public class TextUtilsTest extends TestCase {
-
-    @SmallTest
-    public void testBasic() throws Exception {
-        assertEquals("", TextUtils.concat());
-        assertEquals("foo", TextUtils.concat("foo"));
-        assertEquals("foobar", TextUtils.concat("foo", "bar"));
-        assertEquals("foobarbaz", TextUtils.concat("foo", "bar", "baz"));
-
-        SpannableString foo = new SpannableString("foo");
-        foo.setSpan("foo", 1, 2, Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
-
-        SpannableString bar = new SpannableString("bar");
-        bar.setSpan("bar", 1, 2, Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
-
-        SpannableString baz = new SpannableString("baz");
-        baz.setSpan("baz", 1, 2, Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
-
-        assertEquals("foo", TextUtils.concat(foo).toString());
-        assertEquals("foobar", TextUtils.concat(foo, bar).toString());
-        assertEquals("foobarbaz", TextUtils.concat(foo, bar, baz).toString());
-
-        assertEquals(1, ((Spanned) TextUtils.concat(foo)).getSpanStart("foo"));
-
-        assertEquals(1, ((Spanned) TextUtils.concat(foo, bar)).getSpanStart("foo"));
-        assertEquals(4, ((Spanned) TextUtils.concat(foo, bar)).getSpanStart("bar"));
-
-        assertEquals(1, ((Spanned) TextUtils.concat(foo, bar, baz)).getSpanStart("foo"));
-        assertEquals(4, ((Spanned) TextUtils.concat(foo, bar, baz)).getSpanStart("bar"));
-        assertEquals(7, ((Spanned) TextUtils.concat(foo, bar, baz)).getSpanStart("baz"));
-
-        assertTrue(TextUtils.concat("foo", "bar") instanceof String);
-        assertTrue(TextUtils.concat(foo, bar) instanceof SpannedString);
-    }
-
-    @SmallTest
-    public void testTemplateString() throws Exception {
-        CharSequence result;
-
-        result = TextUtils.expandTemplate("This is a ^1 of the ^2 broadcast ^3.",
-                                          "test", "emergency", "system");
-        assertEquals("This is a test of the emergency broadcast system.",
-                     result.toString());
-
-        result = TextUtils.expandTemplate("^^^1^^^2^3^a^1^^b^^^c",
-                                          "one", "two", "three");
-        assertEquals("^one^twothree^aone^b^^c",
-                     result.toString());
-
-        result = TextUtils.expandTemplate("^");
-        assertEquals("^", result.toString());
-
-        result = TextUtils.expandTemplate("^^");
-        assertEquals("^", result.toString());
-
-        result = TextUtils.expandTemplate("^^^");
-        assertEquals("^^", result.toString());
-
-        result = TextUtils.expandTemplate("shorter ^1 values ^2.", "a", "");
-        assertEquals("shorter a values .", result.toString());
-
-        try {
-            TextUtils.expandTemplate("Only ^1 value given, but ^2 used.", "foo");
-            fail();
-        } catch (IllegalArgumentException e) {
-        }
-
-        try {
-            TextUtils.expandTemplate("^1 value given, and ^0 used.", "foo");
-            fail();
-        } catch (IllegalArgumentException e) {
-        }
-
-        result = TextUtils.expandTemplate("^1 value given, and ^9 used.",
-                                          "one", "two", "three", "four", "five",
-                                          "six", "seven", "eight", "nine");
-        assertEquals("one value given, and nine used.", result.toString());
-
-        try {
-            TextUtils.expandTemplate("^1 value given, and ^10 used.",
-                                     "one", "two", "three", "four", "five",
-                                     "six", "seven", "eight", "nine", "ten");
-            fail();
-        } catch (IllegalArgumentException e) {
-        }
-
-        // putting carets in the values: expansion is not recursive.
-
-        result = TextUtils.expandTemplate("^2", "foo", "^^");
-        assertEquals("^^", result.toString());
-
-        result = TextUtils.expandTemplate("^^2", "foo", "1");
-        assertEquals("^2", result.toString());
-
-        result = TextUtils.expandTemplate("^1", "value with ^2 in it", "foo");
-        assertEquals("value with ^2 in it", result.toString());
-    }
-
-    /** Fail unless text+spans contains a span 'spanName' with the given start and end. */
-    private void checkContains(Spanned text, String[] spans, String spanName,
-                               int start, int end) throws Exception {
-        for (String i: spans) {
-            if (i.equals(spanName)) {
-                assertEquals(start, text.getSpanStart(i));
-                assertEquals(end, text.getSpanEnd(i));
-                return;
-            }
-        }
-        fail();
-    }
-
-    @SmallTest
-    public void testTemplateSpan() throws Exception {
-        SpannableString template;
-        Spanned result;
-        String[] spans;
-
-        // ordinary replacement
-
-        template = new SpannableString("a^1b");
-        template.setSpan("before", 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        template.setSpan("during", 1, 3, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        template.setSpan("after", 3, 4, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        template.setSpan("during+after", 1, 4, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-
-        result = (Spanned) TextUtils.expandTemplate(template, "foo");
-        assertEquals(5, result.length());
-        spans = result.getSpans(0, result.length(), String.class);
-
-        // value is one character longer, so span endpoints should change.
-        assertEquals(4, spans.length);
-        checkContains(result, spans, "before", 0, 1);
-        checkContains(result, spans, "during", 1, 4);
-        checkContains(result, spans, "after", 4, 5);
-        checkContains(result, spans, "during+after", 1, 5);
-
-
-        // replacement with empty string
-
-        result = (Spanned) TextUtils.expandTemplate(template, "");
-        assertEquals(2, result.length());
-        spans = result.getSpans(0, result.length(), String.class);
-
-        // the "during" span should disappear.
-        assertEquals(3, spans.length);
-        checkContains(result, spans, "before", 0, 1);
-        checkContains(result, spans, "after", 1, 2);
-        checkContains(result, spans, "during+after", 1, 2);
-    }
-
-    @SmallTest
-    public void testStringSplitterSimple() {
-        stringSplitterTestHelper("a,b,cde", new String[] {"a", "b", "cde"});
-    }
-
-    @SmallTest
-    public void testStringSplitterEmpty() {
-        stringSplitterTestHelper("", new String[] {});
-    }
-
-    @SmallTest
-    public void testStringSplitterWithLeadingEmptyString() {
-        stringSplitterTestHelper(",a,b,cde", new String[] {"", "a", "b", "cde"});
-    }
-
-    @SmallTest
-    public void testStringSplitterWithInternalEmptyString() {
-        stringSplitterTestHelper("a,b,,cde", new String[] {"a", "b", "", "cde"});
-    }
-
-    @SmallTest
-    public void testStringSplitterWithTrailingEmptyString() {
-        // A single trailing emtpy string should be ignored.
-        stringSplitterTestHelper("a,b,cde,", new String[] {"a", "b", "cde"});
-    }
-
-    private void stringSplitterTestHelper(String string, String[] expectedStrings) {
-        TextUtils.StringSplitter splitter = new TextUtils.SimpleStringSplitter(',');
-        splitter.setString(string);
-        List<String> strings = Lists.newArrayList();
-        for (String s : splitter) {
-            strings.add(s);
-        }
-        MoreAsserts.assertEquals(expectedStrings, strings.toArray(new String[]{}));
-    }
-
-    @SmallTest
-    public void testTrim() {
-        String[] strings = { "abc", " abc", "  abc", "abc ", "abc  ",
-                             " abc ", "  abc  ", "\nabc\n", "\nabc", "abc\n" };
-
-        for (String s : strings) {
-            assertEquals(s.trim().length(), TextUtils.getTrimmedLength(s));
-        }
-    }
-
-    @SmallTest
-    public void testRfc822TokenizerFullAddress() {
-        Rfc822Token[] tokens = Rfc822Tokenizer.tokenize("Foo Bar (something) <foo@google.com>");
-        assertNotNull(tokens);
-        assertEquals(1, tokens.length);
-        assertEquals("foo@google.com", tokens[0].getAddress());
-        assertEquals("Foo Bar", tokens[0].getName());
-        assertEquals("something", tokens[0].getComment());
-    }
-
-    @SmallTest
-    public void testRfc822TokenizeItemWithError() {
-        Rfc822Token[] tokens = Rfc822Tokenizer.tokenize("\"Foo Bar\\");
-        assertNotNull(tokens);
-        assertEquals(1, tokens.length);
-        assertEquals("Foo Bar", tokens[0].getAddress());
-    }
-
-    @SmallTest
-    public void testRfc822FindToken() {
-        Rfc822Tokenizer tokenizer = new Rfc822Tokenizer();
-        //                0           1         2           3         4
-        //                0 1234 56789012345678901234 5678 90123456789012345
-        String address = "\"Foo\" <foo@google.com>, \"Bar\" <bar@google.com>";
-        assertEquals(0, tokenizer.findTokenStart(address, 21));
-        assertEquals(22, tokenizer.findTokenEnd(address, 21));
-        assertEquals(24, tokenizer.findTokenStart(address, 25));
-        assertEquals(46, tokenizer.findTokenEnd(address, 25));
-    }
-
-    @SmallTest
-    public void testRfc822FindTokenWithError() {
-        assertEquals(9, new Rfc822Tokenizer().findTokenEnd("\"Foo Bar\\", 0));
-    }
-
-    @LargeTest
-    public void testEllipsize() {
-        CharSequence s1 = "The quick brown fox jumps over \u00FEhe lazy dog.";
-        CharSequence s2 = new Wrapper(s1);
-        Spannable s3 = new SpannableString(s1);
-        s3.setSpan(new StyleSpan(0), 5, 10, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        TextPaint p = new TextPaint();
-        p.setFlags(p.getFlags() & ~p.DEV_KERN_TEXT_FLAG);
-
-        for (int i = 0; i < 100; i++) {
-            for (int j = 0; j < 3; j++) {
-                TextUtils.TruncateAt kind = null;
-
-                switch (j) {
-                case 0:
-                    kind = TextUtils.TruncateAt.START;
-                    break;
-
-                case 1:
-                    kind = TextUtils.TruncateAt.END;
-                    break;
-
-                case 2:
-                    kind = TextUtils.TruncateAt.MIDDLE;
-                    break;
-                }
-
-                String out1 = TextUtils.ellipsize(s1, p, i, kind).toString();
-                String out2 = TextUtils.ellipsize(s2, p, i, kind).toString();
-                String out3 = TextUtils.ellipsize(s3, p, i, kind).toString();
-
-                String keep1 = TextUtils.ellipsize(s1, p, i, kind, true, null).toString();
-                String keep2 = TextUtils.ellipsize(s2, p, i, kind, true, null).toString();
-                String keep3 = TextUtils.ellipsize(s3, p, i, kind, true, null).toString();
-
-                String trim1 = keep1.replace("\uFEFF", "");
-
-                // Are all normal output strings identical?
-                assertEquals("wid " + i + " pass " + j, out1, out2);
-                assertEquals("wid " + i + " pass " + j, out2, out3);
-
-                // Are preserved output strings identical?
-                assertEquals("wid " + i + " pass " + j, keep1, keep2);
-                assertEquals("wid " + i + " pass " + j, keep2, keep3);
-
-                // Does trimming padding from preserved yield normal?
-                assertEquals("wid " + i + " pass " + j, out1, trim1);
-
-                // Did preserved output strings preserve length?
-                assertEquals("wid " + i + " pass " + j, keep1.length(), s1.length());
-
-                // Does the output string actually fit in the space?
-                assertTrue("wid " + i + " pass " + j, p.measureText(out1) <= i);
-
-                // Is the padded output the same width as trimmed output?
-                assertTrue("wid " + i + " pass " + j, p.measureText(keep1) == p.measureText(out1));
-            }
-        }
-    }
-
-    @SmallTest
-    public void testDelimitedStringContains() {
-        assertFalse(TextUtils.delimitedStringContains("", ',', null));
-        assertFalse(TextUtils.delimitedStringContains(null, ',', ""));
-        // Whole match
-        assertTrue(TextUtils.delimitedStringContains("gps", ',', "gps"));
-        // At beginning.
-        assertTrue(TextUtils.delimitedStringContains("gps,gpsx,network,mock", ',', "gps"));
-        assertTrue(TextUtils.delimitedStringContains("gps,network,mock", ',', "gps"));
-        // In middle, both without, before & after a false match.
-        assertTrue(TextUtils.delimitedStringContains("network,gps,mock", ',', "gps"));
-        assertTrue(TextUtils.delimitedStringContains("network,gps,gpsx,mock", ',', "gps"));
-        assertTrue(TextUtils.delimitedStringContains("network,gpsx,gps,mock", ',', "gps"));
-        // At the end.
-        assertTrue(TextUtils.delimitedStringContains("network,mock,gps", ',', "gps"));
-        assertTrue(TextUtils.delimitedStringContains("network,mock,gpsx,gps", ',', "gps"));
-        // Not present (but with a false match)
-        assertFalse(TextUtils.delimitedStringContains("network,mock,gpsx", ',', "gps"));
-    }
-
-    @SmallTest
-    public void testCharSequenceCreator() {
-        Parcel p = Parcel.obtain();
-        TextUtils.writeToParcel(null, p, 0);
-        CharSequence text = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(p);
-        assertNull("null CharSequence should generate null from parcel", text);
-        p = Parcel.obtain();
-        TextUtils.writeToParcel("test", p, 0);
-        p.setDataPosition(0);
-        text = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(p);
-        assertEquals("conversion to/from parcel failed", "test", text);
-    }
-
-    @SmallTest
-    public void testCharSequenceCreatorNull() {
-        Parcel p;
-        CharSequence text;
-        p = Parcel.obtain();
-        TextUtils.writeToParcel(null, p, 0);
-        p.setDataPosition(0);
-        text = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(p);
-        assertNull("null CharSequence should generate null from parcel", text);
-    }
-
-    @SmallTest
-    public void testCharSequenceCreatorSpannable() {
-        Parcel p;
-        CharSequence text;
-        p = Parcel.obtain();
-        TextUtils.writeToParcel(new SpannableString("test"), p, 0);
-        p.setDataPosition(0);
-        text = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(p);
-        assertEquals("conversion to/from parcel failed", "test", text.toString());
-    }
-
-    @SmallTest
-    public void testCharSequenceCreatorString() {
-        Parcel p;
-        CharSequence text;
-        p = Parcel.obtain();
-        TextUtils.writeToParcel("test", p, 0);
-        p.setDataPosition(0);
-        text = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(p);
-        assertEquals("conversion to/from parcel failed", "test", text.toString());
-    }
-
-    /**
-     * CharSequence wrapper for testing the cases where text is copied into
-     * a char array instead of working from a String or a Spanned.
-     */
-    private static class Wrapper implements CharSequence {
-        private CharSequence mString;
-
-        public Wrapper(CharSequence s) {
-            mString = s;
-        }
-
-        public int length() {
-            return mString.length();
-        }
-
-        public char charAt(int off) {
-            return mString.charAt(off);
-        }
-
-        @Override
-        public String toString() {
-            return mString.toString();
-        }
-
-        public CharSequence subSequence(int start, int end) {
-            return new Wrapper(mString.subSequence(start, end));
-        }
-    }
-
-    @LargeTest
-    public void testRemoveEmptySpans() {
-        MockSpanned spanned = new MockSpanned();
-
-        spanned.test();
-        spanned.addSpan().test();
-        spanned.addSpan().test();
-        spanned.addSpan().test();
-        spanned.addEmptySpan().test();
-        spanned.addSpan().test();
-        spanned.addEmptySpan().test();
-        spanned.addEmptySpan().test();
-        spanned.addSpan().test();
-
-        spanned.clear();
-        spanned.addEmptySpan().test();
-        spanned.addEmptySpan().test();
-        spanned.addEmptySpan().test();
-        spanned.addSpan().test();
-        spanned.addEmptySpan().test();
-        spanned.addSpan().test();
-
-        spanned.clear();
-        spanned.addSpan().test();
-        spanned.addEmptySpan().test();
-        spanned.addSpan().test();
-        spanned.addEmptySpan().test();
-        spanned.addSpan().test();
-        spanned.addSpan().test();
-    }
-
-    protected static class MockSpanned implements Spanned {
-
-        private List<Object> allSpans = new ArrayList<Object>();
-        private List<Object> nonEmptySpans = new ArrayList<Object>();
-
-        public void clear() {
-            allSpans.clear();
-            nonEmptySpans.clear();
-        }
-
-        public MockSpanned addSpan() {
-            Object o = new Object();
-            allSpans.add(o);
-            nonEmptySpans.add(o);
-            return this;
-        }
-
-        public MockSpanned addEmptySpan() {
-            Object o = new Object();
-            allSpans.add(o);
-            return this;
-        }
-
-        public void test() {
-            Object[] nonEmpty = TextUtils.removeEmptySpans(allSpans.toArray(), this, Object.class);
-            assertEquals("Mismatched array size", nonEmptySpans.size(), nonEmpty.length);
-            for (int i = 0; i < nonEmpty.length; i++) {
-                assertEquals("Span differ", nonEmptySpans.get(i), nonEmpty[i]);
-            }
-        }
-
-        public char charAt(int arg0) {
-            return 0;
-        }
-
-        public int length() {
-            return 0;
-        }
-
-        public CharSequence subSequence(int arg0, int arg1) {
-            return null;
-        }
-
-        @Override
-        public <T> T[] getSpans(int start, int end, Class<T> type) {
-            return null;
-        }
-
-        @Override
-        public int getSpanStart(Object tag) {
-            return 0;
-        }
-
-        @Override
-        public int getSpanEnd(Object tag) {
-            return nonEmptySpans.contains(tag) ? 1 : 0;
-        }
-
-        @Override
-        public int getSpanFlags(Object tag) {
-            return 0;
-        }
-
-        @Override
-        public int nextSpanTransition(int start, int limit, Class type) {
-            return 0;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/text/src/android/text/format/DateFormatTest.java b/proprietary/frameworks/base/tests/text/src/android/text/format/DateFormatTest.java
deleted file mode 100755
index 5f36cfd12b22ee7189524c45237d6de60a3c588f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/src/android/text/format/DateFormatTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.text.format;
-
-import android.test.suitebuilder.annotation.SmallTest;
-
-import junit.framework.TestCase;
-
-public class DateFormatTest extends TestCase {
-    @SmallTest
-    public void testHasDesignator() throws Exception {
-        assertTrue(DateFormat.hasDesignator("hh:mm:ss", DateFormat.MINUTE));
-        assertTrue(DateFormat.hasDesignator("myyyy", DateFormat.MINUTE));
-        assertTrue(DateFormat.hasDesignator("mmm", DateFormat.MINUTE));
-
-        assertFalse(DateFormat.hasDesignator("hh:MM:ss", DateFormat.MINUTE));
-    }
-
-    @SmallTest
-    public void testHasDesignatorEscaped() throws Exception {
-        assertTrue(DateFormat.hasDesignator("hh:mm 'LOL'", DateFormat.MINUTE));
-
-        assertFalse(DateFormat.hasDesignator("hh:mm 'yyyy'", DateFormat.YEAR));
-    }
-}
diff --git a/proprietary/frameworks/base/tests/text/src/android/text/format/DateUtilsTest.java b/proprietary/frameworks/base/tests/text/src/android/text/format/DateUtilsTest.java
deleted file mode 100755
index c5f6236fe153b158f25723a294d5a4ccdf437bf7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/src/android/text/format/DateUtilsTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.text.format;
-
-import android.test.suitebuilder.annotation.SmallTest;
-
-import junit.framework.TestCase;
-
-public class DateUtilsTest extends TestCase {
-    // This test is not in CTS because formatDuration is @hidden.
-    @SmallTest
-    public void test_formatDuration_seconds() throws Exception {
-        assertEquals("0 seconds", DateUtils.formatDuration(0));
-        assertEquals("0 seconds", DateUtils.formatDuration(1));
-        assertEquals("0 seconds", DateUtils.formatDuration(499));
-        assertEquals("1 second", DateUtils.formatDuration(500));
-        assertEquals("1 second", DateUtils.formatDuration(1000));
-        assertEquals("2 seconds", DateUtils.formatDuration(1500));
-    }
-
-    // This test is not in CTS because formatDuration is @hidden.
-    @SmallTest
-    public void test_formatDuration_Minutes() throws Exception {
-        assertEquals("59 seconds", DateUtils.formatDuration(59000));
-        assertEquals("60 seconds", DateUtils.formatDuration(59500));
-        assertEquals("1 minute", DateUtils.formatDuration(60000));
-        assertEquals("2 minutes", DateUtils.formatDuration(120000));
-    }
-
-    // This test is not in CTS because formatDuration is @hidden.
-    @SmallTest
-    public void test_formatDuration_Hours() throws Exception {
-        assertEquals("59 minutes", DateUtils.formatDuration(3540000));
-        assertEquals("1 hour", DateUtils.formatDuration(3600000));
-        assertEquals("48 hours", DateUtils.formatDuration(172800000));
-    }
-}
diff --git a/proprietary/frameworks/base/tests/text/src/android/text/format/FormatterTest.java b/proprietary/frameworks/base/tests/text/src/android/text/format/FormatterTest.java
deleted file mode 100755
index d2e2131c2da0ab7dd525b80ad3ebbefa4175963f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/src/android/text/format/FormatterTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.text.format;
-
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.text.format.Formatter.BytesResult;
-
-import java.util.Locale;
-
-public class FormatterTest extends AndroidTestCase {
-
-    private Locale mOriginalLocale;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mOriginalLocale = mContext.getResources().getConfiguration().locale;
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        if (mOriginalLocale != null) {
-            setLocale(mOriginalLocale);
-        }
-        super.tearDown();
-    }
-
-    private void setLocale(Locale locale) {
-        Resources res = getContext().getResources();
-        Configuration config = res.getConfiguration();
-        config.locale = locale;
-        res.updateConfiguration(config, res.getDisplayMetrics());
-
-        Locale.setDefault(locale);
-    }
-
-    @SmallTest
-    public void testFormatBytes() {
-        setLocale(Locale.ENGLISH);
-
-        checkFormatBytes(0, true, "0.00", 0);
-        checkFormatBytes(0, false, "0.00", 0);
-
-        checkFormatBytes(1, true, "1.0", 1);
-        checkFormatBytes(1, false, "1.00", 1);
-
-        checkFormatBytes(12, true, "12", 12);
-        checkFormatBytes(12, false, "12.00", 12);
-
-        checkFormatBytes(123, true, "123", 123);
-        checkFormatBytes(123, false, "123", 123);
-
-        checkFormatBytes(812, true, "812", 812);
-        checkFormatBytes(812, false, "812", 812);
-
-        checkFormatBytes(912, true, "0.89", 911);
-        checkFormatBytes(912, false, "0.89", 911);
-
-        checkFormatBytes(9123, true, "8.9", 9113);
-        checkFormatBytes(9123, false, "8.91", 9123);
-
-        checkFormatBytes(9123000, true, "8.7", 9122611);
-        checkFormatBytes(9123000, false, "8.70", 9122611);
-
-        // The method doesn't really support negative values, but apparently people pass -1...
-        checkFormatBytes(-1, true, "-1.00", -1);
-        checkFormatBytes(-1, false, "-1.00", -1);
-
-        // Missing FLAG_CALCULATE_ROUNDED case.
-        BytesResult r = Formatter.formatBytes(getContext().getResources(), 1, 0);
-        assertEquals("1.00", r.value);
-        assertEquals(0, r.roundedBytes); // Didn't pass FLAG_CALCULATE_ROUNDED
-
-        // Make sure it works on different locales.
-        setLocale(new Locale("es", "ES"));
-        checkFormatBytes(9123000, false, "8,70", 9122611);
-    }
-
-    private void checkFormatBytes(long bytes, boolean useShort,
-            String expectedString, long expectedRounded) {
-        BytesResult r = Formatter.formatBytes(getContext().getResources(), bytes,
-                Formatter.FLAG_CALCULATE_ROUNDED | (useShort ? Formatter.FLAG_SHORTER : 0));
-        assertEquals(expectedString, r.value);
-        assertEquals(expectedRounded, r.roundedBytes);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/text/src/android/text/format/TimeTest.java b/proprietary/frameworks/base/tests/text/src/android/text/format/TimeTest.java
deleted file mode 100755
index d7b05fc8abf8962cd4941d9dd4e5c5e3c07c02aa..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/src/android/text/format/TimeTest.java
+++ /dev/null
@@ -1,608 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.text.format;
-
-import android.test.suitebuilder.annotation.SmallTest;
-import android.test.suitebuilder.annotation.Suppress;
-import android.text.format.Time;
-import android.util.Log;
-import android.util.TimeFormatException;
-
-import junit.framework.TestCase;
-
-public class TimeTest extends TestCase {
-
-    @SmallTest
-    public void testNormalize0() throws Exception {
-        Time t = new Time(Time.TIMEZONE_UTC);
-        t.parse("20060432T010203");
-        t.normalize(false /* use isDst */);
-//        System.out.println("got: " + t.year + '-'
-//                + t.month + '-' + t.monthDay
-//                + ' ' + t.hour + ':' + t.minute
-//                + ':' + t.second
-//                + "( " + t.isDst + ',' + t.gmtoff
-//                + ',' + t.weekDay
-//                + ',' + t.yearDay + ')');
-    }
-
-    private static class DateTest {
-        public int year1;
-        public int month1;
-        public int day1;
-        public int hour1;
-        public int minute1;
-        public int dst1;
-
-        public int offset;
-
-        public int year2;
-        public int month2;
-        public int day2;
-        public int hour2;
-        public int minute2;
-        public int dst2;
-
-        public DateTest(int year1, int month1, int day1, int hour1, int minute1, int dst1,
-                int offset, int year2, int month2, int day2, int hour2, int minute2,
-                int dst2) {
-            this.year1 = year1;
-            this.month1 = month1;
-            this.day1 = day1;
-            this.hour1 = hour1;
-            this.minute1 = minute1;
-            this.dst1 = dst1;
-            this.offset = offset;
-            this.year2 = year2;
-            this.month2 = month2;
-            this.day2 = day2;
-            this.hour2 = hour2;
-            this.minute2 = minute2;
-            this.dst2 = dst2;
-        }
-
-        public DateTest(int year1, int month1, int day1, int hour1, int minute1,
-                int offset, int year2, int month2, int day2, int hour2, int minute2) {
-            this.year1 = year1;
-            this.month1 = month1;
-            this.day1 = day1;
-            this.hour1 = hour1;
-            this.minute1 = minute1;
-            this.dst1 = -1;
-            this.offset = offset;
-            this.year2 = year2;
-            this.month2 = month2;
-            this.day2 = day2;
-            this.hour2 = hour2;
-            this.minute2 = minute2;
-            this.dst2 = -1;
-        }
-    }
-
-    // These tests assume that DST changes on Nov 4, 2007 at 2am (to 1am).
-
-    // The "offset" field in "dayTests" represents days.
-    // Use normalize(true) with these tests to change the date by 1 day.
-    private DateTest[] dayTests = {
-            // The month numbers are 0-relative, so Jan=0, Feb=1,...Dec=11
-
-            // Nov 4, 12am + 0 day = Nov 4, 12am
-            // Nov 5, 12am + 0 day = Nov 5, 12am
-            new DateTest(2007, 10, 4, 0, 0, 0, 2007, 10, 4, 0, 0),
-            new DateTest(2007, 10, 5, 0, 0, 0, 2007, 10, 5, 0, 0),
-
-            // Nov 3, 12am + 1 day = Nov 4, 12am
-            // Nov 4, 12am + 1 day = Nov 5, 12am
-            // Nov 5, 12am + 1 day = Nov 6, 12am
-            new DateTest(2007, 10, 3, 0, 0, 1, 2007, 10, 4, 0, 0),
-            new DateTest(2007, 10, 4, 0, 0, 1, 2007, 10, 5, 0, 0),
-            new DateTest(2007, 10, 5, 0, 0, 1, 2007, 10, 6, 0, 0),
-
-            // Nov 3, 1am + 1 day = Nov 4, 1am
-            // Nov 4, 1am + 1 day = Nov 5, 1am
-            // Nov 5, 1am + 1 day = Nov 6, 1am
-            new DateTest(2007, 10, 3, 1, 0, 1, 2007, 10, 4, 1, 0),
-            new DateTest(2007, 10, 4, 1, 0, 1, 2007, 10, 5, 1, 0),
-            new DateTest(2007, 10, 5, 1, 0, 1, 2007, 10, 6, 1, 0),
-
-            // Nov 3, 2am + 1 day = Nov 4, 2am
-            // Nov 4, 2am + 1 day = Nov 5, 2am
-            // Nov 5, 2am + 1 day = Nov 6, 2am
-            new DateTest(2007, 10, 3, 2, 0, 1, 2007, 10, 4, 2, 0),
-            new DateTest(2007, 10, 4, 2, 0, 1, 2007, 10, 5, 2, 0),
-            new DateTest(2007, 10, 5, 2, 0, 1, 2007, 10, 6, 2, 0),
-    };
-
-    // The "offset" field in "minuteTests" represents minutes.
-    // Use normalize(false) with these tests.
-    private DateTest[] minuteTests = {
-            // The month numbers are 0-relative, so Jan=0, Feb=1,...Dec=11
-
-            // Nov 4, 12am + 0 minutes = Nov 4, 12am
-            // Nov 5, 12am + 0 minutes = Nov 5, 12am
-            new DateTest(2007, 10, 4, 0, 0, 0, 2007, 10, 4, 0, 0),
-            new DateTest(2007, 10, 5, 0, 0, 0, 2007, 10, 5, 0, 0),
-
-            // Nov 3, 12am + 60 minutes = Nov 3, 1am
-            // Nov 4, 12am + 60 minutes = Nov 4, 1am
-            // Nov 5, 12am + 60 minutes = Nov 5, 1am
-            new DateTest(2007, 10, 3, 0, 0, 60, 2007, 10, 3, 1, 0),
-            new DateTest(2007, 10, 4, 0, 0, 60, 2007, 10, 4, 1, 0),
-            new DateTest(2007, 10, 5, 0, 0, 60, 2007, 10, 5, 1, 0),
-
-            // Nov 3, 1am + 60 minutes = Nov 3, 2am
-            // Nov 4, 1am (PDT) + 30 minutes = Nov 4, 1:30am (PDT)
-            // Nov 4, 1am (PDT) + 60 minutes = Nov 4, 1am (PST)
-            new DateTest(2007, 10, 3, 1, 0, 60, 2007, 10, 3, 2, 0),
-            new DateTest(2007, 10, 4, 1, 0, 1, 30, 2007, 10, 4, 1, 30, 1),
-            new DateTest(2007, 10, 4, 1, 0, 1, 60, 2007, 10, 4, 1, 0, 0),
-
-            // Nov 4, 1:30am (PDT) + 15 minutes = Nov 4, 1:45am (PDT)
-            // Nov 4, 1:30am (PDT) + 30 minutes = Nov 4, 1:00am (PST)
-            // Nov 4, 1:30am (PDT) + 60 minutes = Nov 4, 1:30am (PST)
-            new DateTest(2007, 10, 4, 1, 30, 1, 15, 2007, 10, 4, 1, 45, 1),
-            new DateTest(2007, 10, 4, 1, 30, 1, 30, 2007, 10, 4, 1, 0, 0),
-            new DateTest(2007, 10, 4, 1, 30, 1, 60, 2007, 10, 4, 1, 30, 0),
-
-            // Nov 4, 1:30am (PST) + 15 minutes = Nov 4, 1:45am (PST)
-            // Nov 4, 1:30am (PST) + 30 minutes = Nov 4, 2:00am (PST)
-            // Nov 5, 1am + 60 minutes = Nov 5, 2am
-            new DateTest(2007, 10, 4, 1, 30, 0, 15, 2007, 10, 4, 1, 45, 0),
-            new DateTest(2007, 10, 4, 1, 30, 0, 30, 2007, 10, 4, 2, 0, 0),
-            new DateTest(2007, 10, 5, 1, 0, 60, 2007, 10, 5, 2, 0),
-
-            // Nov 3, 2am + 60 minutes = Nov 3, 3am
-            // Nov 4, 2am + 30 minutes = Nov 4, 2:30am
-            // Nov 4, 2am + 60 minutes = Nov 4, 3am
-            // Nov 5, 2am + 60 minutes = Nov 5, 3am
-            new DateTest(2007, 10, 3, 2, 0, 60, 2007, 10, 3, 3, 0),
-            new DateTest(2007, 10, 4, 2, 0, 30, 2007, 10, 4, 2, 30),
-            new DateTest(2007, 10, 4, 2, 0, 60, 2007, 10, 4, 3, 0),
-            new DateTest(2007, 10, 5, 2, 0, 60, 2007, 10, 5, 3, 0),
-    };
-
-    @SmallTest
-    public void testNormalize1() throws Exception {
-        Time local = new Time("America/Los_Angeles");
-
-        int len = dayTests.length;
-        for (int index = 0; index < len; index++) {
-            DateTest test = dayTests[index];
-            local.set(0, test.minute1, test.hour1, test.day1, test.month1, test.year1);
-            // call normalize() to make sure that isDst is set
-            local.normalize(false /* use isDst */);
-            local.monthDay += test.offset;
-            local.normalize(true /* ignore isDst */);
-            if (local.year != test.year2 || local.month != test.month2
-                    || local.monthDay != test.day2 || local.hour != test.hour2
-                    || local.minute != test.minute2) {
-                String expectedTime = String.format("%d-%02d-%02d %02d:%02d",
-                        test.year2, test.month2, test.day2, test.hour2, test.minute2);
-                String actualTime = String.format("%d-%02d-%02d %02d:%02d",
-                        local.year, local.month, local.monthDay, local.hour, local.minute);
-                throw new RuntimeException(
-                        "day test index " + index + ", normalize(): expected local " + expectedTime
-                                + " got: " + actualTime);
-            }
-
-            local.set(0, test.minute1, test.hour1, test.day1, test.month1, test.year1);
-            // call normalize() to make sure that isDst is set
-            local.normalize(false /* use isDst */);
-            local.monthDay += test.offset;
-            long millis = local.toMillis(true /* ignore isDst */);
-            local.set(millis);
-            if (local.year != test.year2 || local.month != test.month2
-                    || local.monthDay != test.day2 || local.hour != test.hour2
-                    || local.minute != test.minute2) {
-                String expectedTime = String.format("%d-%02d-%02d %02d:%02d",
-                        test.year2, test.month2, test.day2, test.hour2, test.minute2);
-                String actualTime = String.format("%d-%02d-%02d %02d:%02d",
-                        local.year, local.month, local.monthDay, local.hour, local.minute);
-                throw new RuntimeException(
-                        "day test index " + index + ", toMillis(): expected local " + expectedTime
-                                + " got: " + actualTime);
-            }
-        }
-
-        len = minuteTests.length;
-        for (int index = 0; index < len; index++) {
-            DateTest test = minuteTests[index];
-            local.set(0, test.minute1, test.hour1, test.day1, test.month1, test.year1);
-            local.isDst = test.dst1;
-            // call normalize() to make sure that isDst is set
-            local.normalize(false /* use isDst */);
-            if (test.dst2 == -1) test.dst2 = local.isDst;
-            local.minute += test.offset;
-            local.normalize(false /* use isDst */);
-            if (local.year != test.year2 || local.month != test.month2
-                    || local.monthDay != test.day2 || local.hour != test.hour2
-                    || local.minute != test.minute2 || local.isDst != test.dst2) {
-                String expectedTime = String.format("%d-%02d-%02d %02d:%02d isDst: %d",
-                        test.year2, test.month2, test.day2, test.hour2, test.minute2,
-                        test.dst2);
-                String actualTime = String.format("%d-%02d-%02d %02d:%02d isDst: %d",
-                        local.year, local.month, local.monthDay, local.hour, local.minute,
-                        local.isDst);
-                throw new RuntimeException(
-                        "minute test index " + index + ", normalize(): expected local " + expectedTime
-                                + " got: " + actualTime);
-            }
-
-            local.set(0, test.minute1, test.hour1, test.day1, test.month1, test.year1);
-            local.isDst = test.dst1;
-            // call normalize() to make sure that isDst is set
-            local.normalize(false /* use isDst */);
-            if (test.dst2 == -1) test.dst2 = local.isDst;
-            local.minute += test.offset;
-            long millis = local.toMillis(false /* use isDst */);
-            local.set(millis);
-            if (local.year != test.year2 || local.month != test.month2
-                    || local.monthDay != test.day2 || local.hour != test.hour2
-                    || local.minute != test.minute2 || local.isDst != test.dst2) {
-                String expectedTime = String.format("%d-%02d-%02d %02d:%02d isDst: %d",
-                        test.year2, test.month2, test.day2, test.hour2, test.minute2,
-                        test.dst2);
-                String actualTime = String.format("%d-%02d-%02d %02d:%02d isDst: %d",
-                        local.year, local.month, local.monthDay, local.hour, local.minute,
-                        local.isDst);
-                throw new RuntimeException(
-                        "minute test index " + index + ", toMillis(): expected local " + expectedTime
-                                + " got: " + actualTime);
-            }
-        }
-    }
-
-    @SmallTest
-    public void testSwitchTimezone0() throws Exception {
-        Time t = new Time(Time.TIMEZONE_UTC);
-        t.parse("20061005T120000");
-        t.switchTimezone("America/Los_Angeles");
-        // System.out.println("got: " + t);
-    }
-
-    @SmallTest
-    public void testCtor0() throws Exception {
-        Time t = new Time(Time.TIMEZONE_UTC);
-        assertEquals(Time.TIMEZONE_UTC, t.timezone);
-    }
-
-    @SmallTest
-    public void testGetActualMaximum0() throws Exception {
-        Time t = new Time(Time.TIMEZONE_UTC);
-        int r = t.getActualMaximum(Time.SECOND);
-        // System.out.println("r=" + r);
-    }
-
-    @SmallTest
-    public void testClear0() throws Exception {
-        Time t = new Time(Time.TIMEZONE_UTC);
-        t.clear(Time.TIMEZONE_UTC);
-    }
-
-    @SmallTest
-    public void testCompare0() throws Exception {
-        Time a = new Time(Time.TIMEZONE_UTC);
-        Time b = new Time("America/Los_Angeles");
-        int r = Time.compare(a, b);
-        // System.out.println("r=" + r);
-    }
-
-    @SmallTest
-    public void testFormat0() throws Exception {
-        Time t = new Time(Time.TIMEZONE_UTC);
-        String r = t.format("%Y%m%dT%H%M%S");
-        // System.out.println("r='" + r + "'");
-    }
-
-    @SmallTest
-    public void testToString0() throws Exception {
-        Time t = new Time(Time.TIMEZONE_UTC);
-        String r = t.toString();
-        // System.out.println("r='" + r + "'");
-    }
-
-    @SmallTest
-    public void testGetCurrentTimezone0() throws Exception {
-        String r = Time.getCurrentTimezone();
-        // System.out.println("r='" + r + "'");
-    }
-
-    @SmallTest
-    public void testSetToNow0() throws Exception {
-        Time t = new Time(Time.TIMEZONE_UTC);
-        t.setToNow();
-        // System.out.println("t=" + t);
-    }
-
-    @SmallTest
-    public void testMillis0() throws Exception {
-        Time t = new Time(Time.TIMEZONE_UTC);
-        t.set(0, 0, 0, 1, 1, 2006);
-        long r = t.toMillis(true /* ignore isDst */);
-        // System.out.println("r=" + r);
-        t.set(1, 0, 0, 1, 1, 2006);
-        r = t.toMillis(true /* ignore isDst */);
-        // System.out.println("r=" + r);
-    }
-
-    @SmallTest
-    public void testMillis1() throws Exception {
-        Time t = new Time(Time.TIMEZONE_UTC);
-        t.set(1, 0, 0, 1, 0, 1970);
-        long r = t.toMillis(true /* ignore isDst */);
-        // System.out.println("r=" + r);
-    }
-
-    @SmallTest
-    public void testParse0() throws Exception {
-        Time t = new Time(Time.TIMEZONE_UTC);
-        t.parse("12345678T901234");
-        // System.out.println("t=" + t);
-    }
-
-    @SmallTest
-    public void testParse33390() throws Exception {
-        Time t = new Time(Time.TIMEZONE_UTC);
-
-        t.parse3339("1980-05-23");
-        if (!t.allDay || t.year != 1980 || t.month != 04 || t.monthDay != 23) {
-            fail("Did not parse all-day date correctly");
-        }
-
-        t.parse3339("1980-05-23T09:50:50");
-        if (t.allDay || t.year != 1980 || t.month != 04 || t.monthDay != 23 ||
-                t.hour != 9 || t.minute != 50 || t.second != 50 ||
-                t.gmtoff != 0) {
-            fail("Did not parse timezone-offset-less date correctly");
-        }
-
-        t.parse3339("1980-05-23T09:50:50Z");
-        if (t.allDay || t.year != 1980 || t.month != 04 || t.monthDay != 23 ||
-                t.hour != 9 || t.minute != 50 || t.second != 50 ||
-                t.gmtoff != 0) {
-            fail("Did not parse UTC date correctly");
-        }
-
-        t.parse3339("1980-05-23T09:50:50.0Z");
-        if (t.allDay || t.year != 1980 || t.month != 04 || t.monthDay != 23 ||
-                t.hour != 9 || t.minute != 50 || t.second != 50 ||
-                t.gmtoff != 0) {
-            fail("Did not parse UTC date correctly");
-        }
-
-        t.parse3339("1980-05-23T09:50:50.12Z");
-        if (t.allDay || t.year != 1980 || t.month != 04 || t.monthDay != 23 ||
-                t.hour != 9 || t.minute != 50 || t.second != 50 ||
-                t.gmtoff != 0) {
-            fail("Did not parse UTC date correctly");
-        }
-
-        t.parse3339("1980-05-23T09:50:50.123Z");
-        if (t.allDay || t.year != 1980 || t.month != 04 || t.monthDay != 23 ||
-                t.hour != 9 || t.minute != 50 || t.second != 50 ||
-                t.gmtoff != 0) {
-            fail("Did not parse UTC date correctly");
-        }
-
-        // The time should be normalized to UTC
-        t.parse3339("1980-05-23T09:50:50-01:05");
-        if (t.allDay || t.year != 1980 || t.month != 04 || t.monthDay != 23 ||
-                t.hour != 10 || t.minute != 55 || t.second != 50 ||
-                t.gmtoff != 0) {
-            fail("Did not parse timezone-offset date correctly");
-        }
-
-        // The time should be normalized to UTC
-        t.parse3339("1980-05-23T09:50:50.123-01:05");
-        if (t.allDay || t.year != 1980 || t.month != 04 || t.monthDay != 23 ||
-                t.hour != 10 || t.minute != 55 || t.second != 50 ||
-                t.gmtoff != 0) {
-            fail("Did not parse timezone-offset date correctly");
-        }
-
-        try {
-            t.parse3339("1980");
-            fail("Did not throw error on truncated input length");
-        } catch (TimeFormatException e) {
-            // Successful
-        }
-
-        try {
-            t.parse3339("1980-05-23T09:50:50.123+");
-            fail("Did not throw error on truncated timezone offset");
-        } catch (TimeFormatException e1) {
-            // Successful
-        }
-
-        try {
-            t.parse3339("1980-05-23T09:50:50.123+05:0");
-            fail("Did not throw error on truncated timezone offset");
-        } catch (TimeFormatException e1) {
-            // Successful
-        }
-    }
-
-    @SmallTest
-    public void testSet0() throws Exception {
-        Time t = new Time(Time.TIMEZONE_UTC);
-        t.set(1000L);
-        // System.out.println("t.year=" + t.year);
-        // System.out.println("t=" + t);
-        t.set(2000L);
-        // System.out.println("t=" + t);
-        t.set(1000L * 60);
-        // System.out.println("t=" + t);
-        t.set((1000L * 60 * 60 * 24) + 1000L);
-        // System.out.println("t=" + t);
-    }
-
-    @SmallTest
-    public void testSet1() throws Exception {
-        Time t = new Time(Time.TIMEZONE_UTC);
-        t.set(1, 2, 3, 4, 5, 6);
-        // System.out.println("t=" + t);
-    }
-
-    // Timezones that cover the world.  Some GMT offsets occur more than
-    // once in case some cities decide to change their GMT offset.
-    private static final String[] mTimeZones = {
-        "Pacific/Kiritimati",
-        "Pacific/Enderbury",
-        "Pacific/Fiji",
-        "Antarctica/South_Pole",
-        "Pacific/Norfolk",
-        "Pacific/Ponape",
-        "Asia/Magadan",
-        "Australia/Lord_Howe",
-        "Australia/Sydney",
-        "Australia/Adelaide",
-        "Asia/Tokyo",
-        "Asia/Seoul",
-        "Asia/Taipei",
-        "Asia/Singapore",
-        "Asia/Hong_Kong",
-        "Asia/Saigon",
-        "Asia/Bangkok",
-        "Indian/Cocos",
-        "Asia/Rangoon",
-        "Asia/Omsk",
-        "Antarctica/Mawson",
-        "Asia/Colombo",
-        "Asia/Calcutta",
-        "Asia/Oral",
-        "Asia/Kabul",
-        "Asia/Dubai",
-        "Asia/Tehran",
-        "Europe/Moscow",
-        "Asia/Baghdad",
-        "Africa/Mogadishu",
-        "Europe/Athens",
-        "Africa/Cairo",
-        "Europe/Rome",
-        "Europe/Berlin",
-        "Europe/Amsterdam",
-        "Africa/Tunis",
-        "Europe/London",
-        "Europe/Dublin",
-        "Atlantic/St_Helena",
-        "Africa/Monrovia",
-        "Africa/Accra",
-        "Atlantic/Azores",
-        "Atlantic/South_Georgia",
-        "America/Noronha",
-        "America/Sao_Paulo",
-        "America/Cayenne",
-        "America/St_Johns",
-        "America/Puerto_Rico",
-        "America/Aruba",
-        "America/New_York",
-        "America/Chicago",
-        "America/Denver",
-        "America/Los_Angeles",
-        "America/Anchorage",
-        "Pacific/Marquesas",
-        "America/Adak",
-        "Pacific/Honolulu",
-        "Pacific/Midway",
-    };
-
-    @Suppress
-    public void disableTestGetJulianDay() throws Exception {
-        Time time = new Time();
-
-        // For each day of the year, and for each timezone, get the Julian
-        // day for 12am and then check that if we change the time we get the
-        // same Julian day.
-        for (int monthDay = 1; monthDay <= 366; monthDay++) {
-            for (int zoneIndex = 0; zoneIndex < mTimeZones.length; zoneIndex++) {
-                // We leave the "month" as zero because we are changing the
-                // "monthDay" from 1 to 366.  The call to normalize() will
-                // then change the "month" (but we don't really care).
-                time.set(0, 0, 0, monthDay, 0, 2008);
-                time.timezone = mTimeZones[zoneIndex];
-                long millis = time.normalize(true);
-                if (zoneIndex == 0) {
-                    Log.i("TimeTest", time.format("%B %d, %Y"));
-                }
-
-                // This is the Julian day for 12am for this day of the year
-                int julianDay = Time.getJulianDay(millis, time.gmtoff);
-
-                // Change the time during the day and check that we get the same
-                // Julian day.
-                for (int hour = 0; hour < 24; hour++) {
-                    for (int minute = 0; minute < 60; minute += 15) {
-                        time.set(0, minute, hour, monthDay, 0, 2008);
-                        millis = time.normalize(true);
-                        int day = Time.getJulianDay(millis, time.gmtoff);
-                        if (day != julianDay) {
-                            Log.e("TimeTest", "Julian day: " + day + " at time "
-                                    + time.hour + ":" + time.minute
-                                    + " != today's Julian day: " + julianDay
-                                    + " timezone: " + time.timezone);
-                        }
-                        assertEquals(day, julianDay);
-                    }
-                }
-            }
-        }
-    }
-
-    @Suppress
-    public void disableTestSetJulianDay() throws Exception {
-        Time time = new Time();
-
-        // For each day of the year in 2008, and for each timezone,
-        // test that we can set the Julian day correctly.
-        for (int monthDay = 1; monthDay <= 366; monthDay++) {
-            for (int zoneIndex = 0; zoneIndex < mTimeZones.length; zoneIndex++) {
-                // We leave the "month" as zero because we are changing the
-                // "monthDay" from 1 to 366.  The call to normalize() will
-                // then change the "month" (but we don't really care).
-                time.set(0, 0, 0, monthDay, 0, 2008);
-                time.timezone = mTimeZones[zoneIndex];
-                long millis = time.normalize(true);
-                if (zoneIndex == 0) {
-                    Log.i("TimeTest", time.format("%B %d, %Y"));
-                }
-                int julianDay = Time.getJulianDay(millis, time.gmtoff);
-
-                time.setJulianDay(julianDay);
-
-                // Some places change daylight saving time at 12am and so there
-                // is no 12am on some days in some timezones.  In those cases,
-                // the time is set to 1am.
-                // Examples: Africa/Cairo on April 25, 2008
-                //  America/Sao_Paulo on October 12, 2008
-                //  Atlantic/Azores on March 30, 2008
-                assertTrue(time.hour == 0 || time.hour == 1);
-                assertEquals(0, time.minute);
-                assertEquals(0, time.second);
-
-                millis = time.toMillis(false);
-                int day = Time.getJulianDay(millis, time.gmtoff);
-                if (day != julianDay) {
-                    Log.i("TimeTest", "Error: gmtoff " + (time.gmtoff / 3600.0)
-                            + " day " + julianDay
-                            + " millis " + millis
-                            + " " + time.format("%B %d, %Y") + " " + time.timezone);
-                }
-                assertEquals(day, julianDay);
-            }
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/text/src/android/text/util/LinkifyTest.java b/proprietary/frameworks/base/tests/text/src/android/text/util/LinkifyTest.java
deleted file mode 100755
index e5235bcc0a0d58255d86177afaa73d67e512cda8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/text/src/android/text/util/LinkifyTest.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.text.util;
-
-import android.os.SystemProperties;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.text.method.LinkMovementMethod;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.style.URLSpan;
-import android.text.util.Linkify;
-import android.text.util.Linkify.MatchFilter;
-import android.text.util.Linkify.TransformFilter;
-import android.util.Log;
-import android.widget.TextView;
-
-/**
- * LinkifyTest tests {@link Linkify}.
- */
-public class LinkifyTest extends AndroidTestCase {
-
-    private static final String TAG = "LinkifyTest";
-
-    private static final String LINKIFY_CUSTOM_TEST = "linkify.custom.test";
-
-
-    @SmallTest
-    public void testNothing() throws Exception {
-        TextView tv;
-
-        tv = new TextView(getContext());
-        tv.setText("Hey, foo@google.com, call 415-555-1212.");
-
-        assertFalse(tv.getMovementMethod() instanceof LinkMovementMethod);
-        assertTrue(tv.getUrls().length == 0);
-    }
-
-    @SmallTest
-    public void testNormal() throws Exception {
-        TextView tv;
-
-        tv = new TextView(getContext());
-        tv.setAutoLinkMask(Linkify.ALL);
-        tv.setText("Hey, foo@google.com, call 415-555-1212.");
-
-        assertTrue(tv.getMovementMethod() instanceof LinkMovementMethod);
-        assertTrue(tv.getUrls().length == 2);
-    }
-
-    @SmallTest
-    public void testUnclickable() throws Exception {
-        TextView tv;
-
-        tv = new TextView(getContext());
-        tv.setAutoLinkMask(Linkify.ALL);
-        tv.setLinksClickable(false);
-        tv.setText("Hey, foo@google.com, call 415-555-1212.");
-
-        assertFalse(tv.getMovementMethod() instanceof LinkMovementMethod);
-        assertTrue(tv.getUrls().length == 2);
-    }
-
-
-    public void testCustomLink() throws Exception {
-
-        if (SystemProperties.getBoolean(LINKIFY_CUSTOM_TEST, false) == false) {
-            Log.d(TAG, "Custom test is not run. Set prop linkify.custom.test to true to run.");
-            return;
-        }
-
-        String[] testStrings = {
-            //0
-            "中文www.baidu.com中文",
-            "中文www.baidu.com中文www.baidu.com",
-            "中文www.baidu.com中文www.baidu.com中文",
-            "中文www.baidu.com中文WWW.BAIDU.COM",
-            //This case conflicts with Google CTS case
-            //"abchttp://www.baidu.comabc",
-            //5
-            "123中文www.baidu.com",
-            "中文www.baidu.com，登陆",
-            "中文1008611中文www.baidu.com中文test@163.com",
-            "1.中文www.baidu.com",
-            "abc.中文www.baidu.com",
-            //10
-            "全角符号，www.baidu.com。中文www.baidu.com 空格www.baidu.com,半角符号www.baidu.com",
-            "英文符号,www.baidu.com.中文www.baidu.com中文,空格 www.baidu.com",
-            "10010，中文：12.87元，使用全角符号，中文www.baidu.com，中文。",
-            "中文www.baidu.com，全角符号",
-            "http://123.com:3000/mp3鏈結",
-             //15
-            "www.baidu.com。 1555666。",
-            "中国电信www.baidu.com,中国电信",
-            "中国电信Http://www.baidu.COM中国电信",
-            "中国电信HTtp://www.baidu.COM中国电信",
-            "中国电信HTTp://www.baidu.COM中国电信",
-            //20
-            "中国电信192.168.100.11/index.htm",
-            "192.168.100.11/index.htm中国电信",
-            "中国电信http://wh0810.f3.comsz.com/xjy/music/北京欢迎你.mp3中国电信",
-            "中国电信www.baidu.COM,中国电信",
-            "中国电信WWW.baidu.com,中国电信",
-            //25
-            "请到HTTP://wh0810.f3.comsz.com/xjy/music/北京欢迎你.mp3下载",
-            "http://www.tjbjss.com/tjxinxing/zww/zywN/pic/no1_15/报告.html链接",
-            "http://ditu.google.cn/?ll=25.18788,128.887898,",
-            "http://maps.google.com/maps?f=q&q=(32.08831,118.753944),中文",
-            "http://maps.google.com/maps?f=q&q=(32.08831,118.753944)中文",
-
-        };
-
-        String[][] expectedResults = new String[][] {
-            //0
-            {"http://www.baidu.com"},
-            {"http://www.baidu.com", "http://www.baidu.com"},
-            {"http://www.baidu.com", "http://www.baidu.com"},
-            {"http://www.baidu.com", "http://WWW.BAIDU.COM"},
-            //{"http://www.baidu.com"},
-            //5
-            {"http://www.baidu.com"},
-            {"http://www.baidu.com"},
-            {"http://www.baidu.com"},
-            {"http://www.baidu.com"},
-            {"http://www.baidu.com"},
-            //10
-            {"http://www.baidu.com", "http://www.baidu.com", "http://www.baidu.com",
-             "http://www.baidu.com"},
-            {"http://www.baidu.com", "http://www.baidu.com", "http://www.baidu.com"},
-            {"http://www.baidu.com"},
-            {"http://www.baidu.com"},
-            {"http://123.com:3000/mp3"},
-            //15
-            {"http://www.baidu.com"},
-            {"http://www.baidu.com"},
-            {"http://www.baidu.COM"},
-            {"http://www.baidu.COM"},
-            {"http://www.baidu.COM"},
-            //20
-            {"http://192.168.100.11/index.htm"},
-            {"http://192.168.100.11/index.htm"},
-            {"http://wh0810.f3.comsz.com/xjy/music/北京欢迎你.mp3"},
-            {"http://www.baidu.COM"},
-            {"http://WWW.baidu.com"},
-            //25
-            {"http://wh0810.f3.comsz.com/xjy/music/北京欢迎你.mp3"},
-            {"http://www.tjbjss.com/tjxinxing/zww/zywN/pic/no1_15/报告.html"},
-            {"http://ditu.google.cn/?ll=25.18788,128.887898"},
-            {"http://maps.google.com/maps?f=q&q=(32.08831,118.753944)"},
-            {"http://maps.google.com/maps?f=q&q=(32.08831,118.753944)"},
-
-        };
-
-        boolean allPass = true;
-        for (int i = 0; i < testStrings.length; i++) {
-            boolean pass = true;
-            SpannableString spannable = new SpannableString(testStrings[i]);
-
-            Linkify.addLinks(spannable, Linkify.WEB_URLS);
-            URLSpan[] spans = spannable.getSpans(0, spannable.length(), URLSpan.class);
-
-            if (expectedResults[i].length != spans.length) {
-                pass = false;
-                allPass = false;
-            } else {
-                for (int j = 0; j < expectedResults[i].length; j++) {
-                    if (!expectedResults[i][j].equals(spans[j].getURL())) {
-                        pass = false;
-                        allPass = false;
-                    }
-                }
-            }
-
-            if (!pass) {
-                Log.d(TAG, "case " + i + " failed, string = " + testStrings[i]);
-                for (int j = 0; j < spans.length; j++) {
-                    Log.d(TAG, spans[j].getURL());
-                }
-            }
-        }
-        assertTrue(allPass);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/Android.mk b/proprietary/frameworks/base/tests/view/Android.mk
deleted file mode 100755
index b1af40e706aa3defb3e70d55da7d9a78e03cfa0f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-# Include all test java files.
-LOCAL_SRC_FILES := \
-	$(call all-java-files-under, src)
-
-LOCAL_DX_FLAGS := --core-library
-# add "librobotium junit-report" when test zutubi
-LOCAL_STATIC_JAVA_LIBRARIES := android-common frameworks-core-util-lib guava littlemock
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_PACKAGE_NAME := CommonViewTests
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/frameworks/base/tests/view/Android.mk_ b/proprietary/frameworks/base/tests/view/Android.mk_
deleted file mode 100755
index b1af40e706aa3defb3e70d55da7d9a78e03cfa0f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/Android.mk_
+++ /dev/null
@@ -1,20 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-# Include all test java files.
-LOCAL_SRC_FILES := \
-	$(call all-java-files-under, src)
-
-LOCAL_DX_FLAGS := --core-library
-# add "librobotium junit-report" when test zutubi
-LOCAL_STATIC_JAVA_LIBRARIES := android-common frameworks-core-util-lib guava littlemock
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_PACKAGE_NAME := CommonViewTests
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/frameworks/base/tests/view/AndroidManifest.xml b/proprietary/frameworks/base/tests/view/AndroidManifest.xml
deleted file mode 100755
index 6d268e9d42a6d9f36fe32e97778c6ae83113325f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/AndroidManifest.xml
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mediatek.common.view.tests"
-    android:versionCode="1"
-    android:versionName="1.0"
-    android:sharedUserId="com.android.uid.test" >
-
-    <uses-sdk android:minSdkVersion="14" />
-    
-    <uses-permission android:name="android.permission.ACCESS_CACHE_FILESYSTEM" />
-    <uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER" />
-    <uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER_ADVANCED" />
-    <uses-permission android:name="android.permission.DOWNLOAD_CACHE_NON_PURGEABLE" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CLEAR_APP_CACHE" />
-    <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.DOWNLOAD_CACHE_NON_PURGEABLE" />
-    <uses-permission android:name="android.permission.GET_PACKAGE_SIZE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.READ_LOGS"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.READ_SMS"/>
-    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SMS"/>
-    <uses-permission android:name="android.permission.TEST_GRANTED" />
-    <uses-permission android:name="com.google.android.googleapps.permission.ACCESS_GOOGLE_PASSWORD" />
-    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
-    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.ALL_SERVICES" />
-
-    <uses-permission android:name="android.permission.MANAGE_USERS" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
-
-    <uses-permission android:name="android.permission.RECEIVE_SMS"/>
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
-    <uses-permission android:name="android.permission.WRITE_APN_SETTINGS" />
-    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-
-    <!-- location test permissions -->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.HARDWARE_TEST" />
-
-    <!-- package manager test permissions -->
-    <uses-permission android:name="android.permission.INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.DELETE_PACKAGES" />
-    <uses-permission android:name="android.permission.MOVE_PACKAGE" />
-    <uses-permission android:name="android.permission.PACKAGE_VERIFICATION_AGENT" />
-
-    <!--os storage test permissions -->
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
-    <uses-permission android:name="android.permission.ASEC_ACCESS" />
-    <uses-permission android:name="android.permission.ASEC_CREATE" />
-    <uses-permission android:name="android.permission.ASEC_DESTROY" />
-    <uses-permission android:name="android.permission.ASEC_MOUNT_UNMOUNT" />
-    <uses-permission android:name="android.permission.ASEC_RENAME" />
-    <uses-permission android:name="android.permission.SHUTDOWN" />
-
-    <!-- accessibility test permissions -->
-    <uses-permission android:name="android.permission.RETRIEVE_WINDOW_CONTENT" />
-
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.AUTOFOCUS" />
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <application android:theme="@style/Theme">
-        <uses-library android:name="android.test.runner" />
-        
-        <activity android:name="com.mediatek.common.view.tests.ViewAttachTestActivity" android:label="View Attach Test">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        
-        <activity android:name="com.mediatek.common.view.tests.Include" android:label="IncludeTag">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.view.tests.Merge" android:label="MergeTag">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.view.tests.StubbedView" android:label="ViewStub">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.view.tests.RunQueue" android:label="RunQueue">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.view.tests.Visibility" android:label="Visibility">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.view.tests.VisibilityCallback" android:label="VisibilityCallback">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.view.tests.BigCache" android:label="BigCache">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.view.tests.ZeroSized" android:label="ZeroSized">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.view.tests.Disabled" android:label="Disabled">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.view.tests.PopupWindowVisibility" android:label="PopupWindowVisibility">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.view.tests.PreDrawListener" android:label="PreDrawListener">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.view.tests.GlobalFocusChange" android:label="GlobalFocusChange">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        
-        
-        <activity android:name="com.mediatek.common.view.tests.menu.ListContextMenu" android:label="ListContextMenu">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.view.tests.ViewGroupChildren" android:label="ViewGroup Children">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.view.tests.RemoteViewsActivity" android:label="RemoteViewsActicity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.view.tests.BitmapDrawable" android:label="BitmapDrawable">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.view.tests.DrawableBgMinSize" android:label="DrawableBgMinSize">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.view.tests.MutateDrawable" android:label="MutateDrawable">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        
-        
-        <activity android:name="com.mediatek.common.view.tests.Longpress" android:label="Longpress">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        
-        
-        <activity android:name="com.mediatek.common.view.tests.menu.MenuWith1Item" android:label="MenuWith1Item">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.view.tests.menu.MenuLayoutPortrait" android:label="MenuLayoutPortrait"
-                android:screenOrientation="portrait">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.view.tests.menu.MenuLayoutLandscape" android:label="MenuLayoutLandscape"
-                android:screenOrientation="landscape">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.view.tests.animation.BasicAnimatorActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        <activity android:name="com.mediatek.common.view.tests.animation.AnimationTestStubActivity"
-            android:label="AnimationTestStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.view.tests.animation.GridLayoutAnimStubActivity"
-            android:label="GridLayoutAnimStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.view.tests.animation.LayoutAnimStubActivity"
-            android:label="LayoutAnimStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.view.tests.animation.ViewTestStubActivity"
-            android:label="ViewTestStubActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.view.tests.animation.AnimationActivity"
-            android:label="AnimationActivity"/>
-
-        <activity
-           android:name="com.mediatek.common.view.tests.animation.LayoutAnimationActivity" />
-        
-    </application>
-    
-    <instrumentation android:name="com.zutubi.android.junitreport.JUnitReportTestRunner"
-            android:targetPackage="com.mediatek.common.view.tests"
-            android:label="Common View Tests" />
-    
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
-                        android:targetPackage="com.mediatek.common.view.tests"
-            android:label="Common View Tests" />
-
-</manifest>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/view/NOTICE b/proprietary/frameworks/base/tests/view/NOTICE
deleted file mode 100755
index 204ee7136edd4596f7088519b2040c557e586e29..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/NOTICE
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- Copyright (C) 2009 The Android Open Source Project:
-<!-- Copyright (C) 2008 The Android Open Source Project:
-* Copyright (C) 2008 The Android Open Source Project:
-* Copyright (C) 2009 The Android Open Source Project:
-<!-- Copyright (C) 2007 The Android Open Source Project:
-** Copyright 2007, The Android Open Source Project:
-* Copyright (C) 2008 The Android Open Source Project.:
-<!-- Copyright (C) 2012 The Android Open Source Project:
-** Copyright 2006, The Android Open Source Project:
-** Copyright 2008, The Android Open Source Project:
-* Copyright (C) 2007 The Android Open Source Project:
-* Copyright (C) 2006 The Android Open Source Project:
-* Copyright (C) 2010 The Android Open Source Project:
-* Copyright (C) 2011 The Android Open Source Project:
-* Copyright (C) 2012 The Android Open Source Project:
-* Copyright (C) 2013 The Android Open Source Project:
-
-
-
-/*
-* Copyright (C) 2011-2014 MediaTek Inc.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-:
- 
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/view/README b/proprietary/frameworks/base/tests/view/README
deleted file mode 100755
index cf3b243d4a90406f5bfcc967c391d9e6a67a8b81..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/README
+++ /dev/null
@@ -1,27 +0,0 @@
-WHAT IT DOES?
-=============
-This test package is used to test Android view. It's based on Android's
-view test cases with additional test cases developed by MediaTek.
-
-
-HOW IT WAS BUILT?
-==================
-$ mmm vendor/mediatek/proprietary/frameworks/base/tests/view
-
-
-HOW TO USE IT?
-==============
-After installing this test package, run the test cases by using ADB.
-
-To run all of the test cases in this test package, execute:
-
-$ adb shell am instrument -e package com.mediatek.common.view -w com.mediatek.common.view.tests/android.test.InstrumentationTestRunner
-
-To run all of the test cases in the class LongpressTest, execute:
-
-$ adb shell am instrument -e class com.mediatek.common.view.tests.LongpressTest -w com.mediatek.common.view.tests/android.test.InstrumentationTestRunner
-
-For more information about how to run test cases by using ADB, please refer to 
-
-http://developer.android.com/tools/testing/testing_otheride.html#RunTestsCommand
-
diff --git a/proprietary/frameworks/base/tests/view/res/anim/accelerate_alpha.xml b/proprietary/frameworks/base/tests/view/res/anim/accelerate_alpha.xml
deleted file mode 100755
index 594652b4bbf4f303885f11c4e122439b0dee0c27..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/anim/accelerate_alpha.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/accelerate_interpolator"
-    android:fromAlpha="0.1"
-    android:toAlpha="0.9"
-    android:duration="1000" />
diff --git a/proprietary/frameworks/base/tests/view/res/anim/accelerate_decelerate_alpha.xml b/proprietary/frameworks/base/tests/view/res/anim/accelerate_decelerate_alpha.xml
deleted file mode 100755
index 7c892b2190eb48f36e5f413cfd4faf7331361603..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/anim/accelerate_decelerate_alpha.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
-    android:fromAlpha="0.0"
-    android:toAlpha="1.0"
-    android:duration="2000" />
diff --git a/proprietary/frameworks/base/tests/view/res/anim/alpha.xml b/proprietary/frameworks/base/tests/view/res/anim/alpha.xml
deleted file mode 100755
index 8893d6606829ed2fa737e86e23d8da45ce2f4b61..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/anim/alpha.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-       android:fromAlpha="0.0"
-       android:toAlpha="1.0"
-       android:duration="500" />
diff --git a/proprietary/frameworks/base/tests/view/res/anim/anim_alpha.xml b/proprietary/frameworks/base/tests/view/res/anim/anim_alpha.xml
deleted file mode 100755
index b5794c31c926511b935d2504975b5b09b83cc530..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/anim/anim_alpha.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-       android:interpolator="@android:anim/accelerate_interpolator"
-       android:fromAlpha="0.0"
-       android:toAlpha="1.0"
-       android:duration="500" />
-
diff --git a/proprietary/frameworks/base/tests/view/res/anim/anim_gridlayout.xml b/proprietary/frameworks/base/tests/view/res/anim/anim_gridlayout.xml
deleted file mode 100755
index be42d76e474331c70a489e8541a43bf209647cdd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/anim/anim_gridlayout.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<gridLayoutAnimation xmlns:android="http://schemas.android.com/apk/res/android"
-        android:delay="10%"
-        android:rowDelay="50%"
-        android:directionPriority="column"
-        android:animation="@anim/anim_alpha" />
diff --git a/proprietary/frameworks/base/tests/view/res/anim/anim_rotate.xml b/proprietary/frameworks/base/tests/view/res/anim/anim_rotate.xml
deleted file mode 100755
index 4fbadcff6130d3254556b91f13ec5ecf15d0d4be..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/anim/anim_rotate.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/decelerate_interpolator"
-    android:fromDegrees="0"
-    android:toDegrees="-45"
-    android:toYScale="0.0"
-    android:pivotX="50%"
-    android:pivotY="50%"
-    android:duration="700" />
diff --git a/proprietary/frameworks/base/tests/view/res/anim/anim_scale.xml b/proprietary/frameworks/base/tests/view/res/anim/anim_scale.xml
deleted file mode 100755
index 96a3e28e13317d980e7bac1769b858c259135ef8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/anim/anim_scale.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<scale xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
-    android:fromXScale="1.0"
-    android:toXScale="1.4"
-    android:fromYScale="1.0"
-    android:toYScale="0.6"
-    android:pivotX="50%"
-    android:pivotY="50%"
-    android:fillAfter="false"
-    android:duration="600" />
diff --git a/proprietary/frameworks/base/tests/view/res/anim/anim_set.xml b/proprietary/frameworks/base/tests/view/res/anim/anim_set.xml
deleted file mode 100755
index 7d139a8947b0a5988732b8edb057326ce0799abe..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/anim/anim_set.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false">
-
-    <scale
-        android:interpolator="@android:anim/accelerate_decelerate_interpolator"
-        android:fromXScale="1.0"
-        android:toXScale="1.4"
-        android:fromYScale="1.0"
-        android:toYScale="0.6"
-        android:pivotX="50%"
-        android:pivotY="50%"
-        android:fillAfter="false"
-        android:duration="900" />
-
-    <set
-        android:interpolator="@android:anim/accelerate_interpolator"
-                android:startOffset="700">
-
-        <scale
-            android:fromXScale="1.4"
-            android:toXScale="0.0"
-            android:fromYScale="0.6"
-            android:toYScale="0.0"
-            android:pivotX="50%"
-            android:pivotY="50%"
-            android:duration="400" />
-
-        <rotate
-            android:fromDegrees="0"
-            android:toDegrees="-45"
-            android:toYScale="0.0"
-            android:pivotX="50%"
-            android:pivotY="50%"
-            android:duration="400" />
-    </set>
-
-</set>
diff --git a/proprietary/frameworks/base/tests/view/res/anim/anim_translate.xml b/proprietary/frameworks/base/tests/view/res/anim/anim_translate.xml
deleted file mode 100755
index 6659c2bafff5ccefd910edafa7df95dddcfb3ec3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/anim/anim_translate.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/accelerate_interpolator"
-    android:fromXDelta="100%p"
-    android:toXDelta="0"
-    android:fromYDelta="100%p"
-    android:toYDelta="0"
-    android:duration="800" />
diff --git a/proprietary/frameworks/base/tests/view/res/anim/cycle_alpha.xml b/proprietary/frameworks/base/tests/view/res/anim/cycle_alpha.xml
deleted file mode 100755
index 0a3b53c8d88d88d45f65f535e22910607e7a65c1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/anim/cycle_alpha.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-       android:interpolator="@anim/cycle_interpolator"
-       android:fromAlpha="0.0"
-       android:toAlpha="1.0"
-       android:duration="2000" />
diff --git a/proprietary/frameworks/base/tests/view/res/anim/cycle_interpolator.xml b/proprietary/frameworks/base/tests/view/res/anim/cycle_interpolator.xml
deleted file mode 100755
index d1586e5301ad636f7660a4d34652d32a369b3a6e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/anim/cycle_interpolator.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
- <cycleInterpolator xmlns:android="http://schemas.android.com/apk/res/android" android:cycles="1" />
diff --git a/proprietary/frameworks/base/tests/view/res/anim/decelerate_alpha.xml b/proprietary/frameworks/base/tests/view/res/anim/decelerate_alpha.xml
deleted file mode 100755
index 793807ee9831a1f629451c51c57d1273cc59ee00..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/anim/decelerate_alpha.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/decelerate_interpolator"
-    android:fromAlpha="0.0"
-    android:toAlpha="1.0"
-    android:duration="2000" />
diff --git a/proprietary/frameworks/base/tests/view/res/anim/layout_anim_controller_animation.xml b/proprietary/frameworks/base/tests/view/res/anim/layout_anim_controller_animation.xml
deleted file mode 100755
index 1e3608c6fb1dc042e7a15a6dd2080eb091f70149..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/anim/layout_anim_controller_animation.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-       android:interpolator="@android:anim/accelerate_interpolator"
-       android:fillAfter="true"
-       android:fromAlpha="0.0"
-       android:toAlpha="1.0"
-       android:duration="1000" />
diff --git a/proprietary/frameworks/base/tests/view/res/anim/lineartest.xml b/proprietary/frameworks/base/tests/view/res/anim/lineartest.xml
deleted file mode 100755
index 7a4162889ef54ce2c850e58227d3e055336d4fe9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/anim/lineartest.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<screenplay>
-     <paint id="paint" antiAlias="true">
-         <color id="col" color="gray"/>
-     </paint>
-     <event kind="onLoad">
-         <add id="addPaint" use="paint"/>
-         <text y="15" text="hello"/>
-     </event>
-     <event kind="keyPress" code="up">
-         <apply scope="addPaint">
-             <set target="paint" field="linearText" to="true"/>
-             <set target="col" field="color" to="black"/>
-             <animate target="paint" id="grow" field="textSize" from="12" to="15" dur=".25"/>
-         </apply>
-     </event>
-     <event kind="onEnd" target="grow">
-         <apply scope="addPaint">
-             <set target="paint" field="linearText" to="false"/>
-         </apply>
-     </event>
-     <event kind="keyPress" code="down">
-         <apply scope="addPaint">
-             <set target="col" field="color" to="gray"/>
-             <animate target="paint" id="shrink" field="textSize" from="15" to="12" dur=".25"/>
-         </apply>
-     </event>
-     <event kind="onEnd" target="shrink">
-         <apply scope="addPaint">
-             <set target="paint" field="linearText" to="false"/>
-         </apply>
-     </event>
- </screenplay>
diff --git a/proprietary/frameworks/base/tests/view/res/anim/move_ani.xml b/proprietary/frameworks/base/tests/view/res/anim/move_ani.xml
deleted file mode 100755
index b691c0d226c98ec149d80996d3119b7fb8130af8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/anim/move_ani.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-           android:fromXDelta="0"
-           android:toXDelta="4"
-           android:duration="2000"
-           android:interpolator="@anim/move_cycle" />
diff --git a/proprietary/frameworks/base/tests/view/res/anim/move_cycle.xml b/proprietary/frameworks/base/tests/view/res/anim/move_cycle.xml
deleted file mode 100755
index 2e2233a3a7c1bd77b59a90398e6defbd41d7f862..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/anim/move_cycle.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<cycleInterpolator xmlns:android="http://schemas.android.com/apk/res/android" android:cycles="20" />
diff --git a/proprietary/frameworks/base/tests/view/res/anim/movie_test.xml b/proprietary/frameworks/base/tests/view/res/anim/movie_test.xml
deleted file mode 100755
index dcebd16c065ea547ad0f5a54f8cc7a8826bac527..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/anim/movie_test.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<screenplay>
-    <event kind="onLoad">
-        <movie src="lineartest.xml"/>
-    </event>
-</screenplay>
diff --git a/proprietary/frameworks/base/tests/view/res/drawable-hdpi/big_drawable_background.9.png b/proprietary/frameworks/base/tests/view/res/drawable-hdpi/big_drawable_background.9.png
deleted file mode 100755
index 53470b8d0b504ef2f89e1d4cff294fcb60cbf29c..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/view/res/drawable-hdpi/big_drawable_background.9.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/view/res/drawable-hdpi/black_square.png b/proprietary/frameworks/base/tests/view/res/drawable-hdpi/black_square.png
deleted file mode 100755
index 77521031e64242777659f7b3c91515a94668a9c0..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/view/res/drawable-hdpi/black_square.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/view/res/drawable-hdpi/black_square_stretchable.9.png b/proprietary/frameworks/base/tests/view/res/drawable-hdpi/black_square_stretchable.9.png
deleted file mode 100755
index 4988163e5205f0b4bf0133756454a9b659ea9453..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/view/res/drawable-hdpi/black_square_stretchable.9.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/view/res/drawable-hdpi/drawable_background.9.png b/proprietary/frameworks/base/tests/view/res/drawable-hdpi/drawable_background.9.png
deleted file mode 100755
index f692d38ff3386e5b03b7117eeb8c88a63469b408..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/view/res/drawable-hdpi/drawable_background.9.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/view/res/drawable-hdpi/sym_now_playing_pause_1.png b/proprietary/frameworks/base/tests/view/res/drawable-hdpi/sym_now_playing_pause_1.png
deleted file mode 100755
index 9edb064cfd326ae36bfcf01d1df756123911ade1..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/view/res/drawable-hdpi/sym_now_playing_pause_1.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/view/res/drawable-hdpi/sym_now_playing_skip_backward_1.png b/proprietary/frameworks/base/tests/view/res/drawable-hdpi/sym_now_playing_skip_backward_1.png
deleted file mode 100755
index c4b6b92eb69c5a5e2b646f66fad2270d2e4b3b8d..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/view/res/drawable-hdpi/sym_now_playing_skip_backward_1.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/view/res/drawable-hdpi/sym_now_playing_skip_forward_1.png b/proprietary/frameworks/base/tests/view/res/drawable-hdpi/sym_now_playing_skip_forward_1.png
deleted file mode 100755
index 03140f54bbaa019237715d29041d8017b4da900b..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/view/res/drawable-hdpi/sym_now_playing_skip_forward_1.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/view/res/drawable-mdpi/big_drawable_background.9.png b/proprietary/frameworks/base/tests/view/res/drawable-mdpi/big_drawable_background.9.png
deleted file mode 100755
index aded635ca569a79e8b406c34702633ac4902e92b..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/view/res/drawable-mdpi/big_drawable_background.9.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/view/res/drawable-mdpi/black_square.png b/proprietary/frameworks/base/tests/view/res/drawable-mdpi/black_square.png
deleted file mode 100755
index 1bfe0a2501f77602785918445c2e7b8f19e2ecf1..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/view/res/drawable-mdpi/black_square.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/view/res/drawable-mdpi/black_square_stretchable.9.png b/proprietary/frameworks/base/tests/view/res/drawable-mdpi/black_square_stretchable.9.png
deleted file mode 100755
index 1fcbeb1f82d12b0271edcb906b77595d3fb9e41b..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/view/res/drawable-mdpi/black_square_stretchable.9.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/view/res/drawable-mdpi/drawable_background.9.png b/proprietary/frameworks/base/tests/view/res/drawable-mdpi/drawable_background.9.png
deleted file mode 100755
index 1337ba978bb73c5a08cd5d44bee58d4314342fb8..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/view/res/drawable-mdpi/drawable_background.9.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/view/res/drawable-mdpi/sym_now_playing_pause_1.png b/proprietary/frameworks/base/tests/view/res/drawable-mdpi/sym_now_playing_pause_1.png
deleted file mode 100755
index 2f19d082b689dcf092e104cbe6159abdbecce1b5..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/view/res/drawable-mdpi/sym_now_playing_pause_1.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/view/res/drawable-mdpi/sym_now_playing_skip_backward_1.png b/proprietary/frameworks/base/tests/view/res/drawable-mdpi/sym_now_playing_skip_backward_1.png
deleted file mode 100755
index f945a8190c8d368d94a2fef6ecf4569ec9b8b311..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/view/res/drawable-mdpi/sym_now_playing_skip_backward_1.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/view/res/drawable-mdpi/sym_now_playing_skip_forward_1.png b/proprietary/frameworks/base/tests/view/res/drawable-mdpi/sym_now_playing_skip_forward_1.png
deleted file mode 100755
index da9361a34bd5bf660890c4dc42b733c4a0463be3..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/view/res/drawable-mdpi/sym_now_playing_skip_forward_1.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/view/res/drawable/bitmap_drawable.xml b/proprietary/frameworks/base/tests/view/res/drawable/bitmap_drawable.xml
deleted file mode 100755
index 35673ec0ef4a501588ec93a8100b31e2cdfd5da8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/drawable/bitmap_drawable.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/sym_now_playing_pause_1"
-    android:gravity="top|right" />
diff --git a/proprietary/frameworks/base/tests/view/res/drawable/box.xml b/proprietary/frameworks/base/tests/view/res/drawable/box.xml
deleted file mode 100755
index 6849bd34689d5baaafa03d371fd20419278d6539..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/drawable/box.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/res/drawable/box.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#00000000"/>
-    <stroke android:width="1dp" color="#ff000000"/>
-    <padding android:left="1dp" android:top="1dp"
-        android:right="1dp" android:bottom="1dp" />
-</shape>
diff --git a/proprietary/frameworks/base/tests/view/res/drawable/failed.jpg b/proprietary/frameworks/base/tests/view/res/drawable/failed.jpg
deleted file mode 100755
index 1bb9b5280f87d7350d43a24d5b8d7d0b89a8c908..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/view/res/drawable/failed.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/view/res/drawable/pass.jpg b/proprietary/frameworks/base/tests/view/res/drawable/pass.jpg
deleted file mode 100755
index 2f4b083c1890957c3e36a17225201c43eada7e49..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/view/res/drawable/pass.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/view/res/drawable/scenery.jpg b/proprietary/frameworks/base/tests/view/res/drawable/scenery.jpg
deleted file mode 100755
index 7a6145b39348dcdf5481ee58d8640f450742a9c9..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/view/res/drawable/scenery.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/view/res/drawable/size_48x48.jpg b/proprietary/frameworks/base/tests/view/res/drawable/size_48x48.jpg
deleted file mode 100755
index 5c2291e3e580c9b6bfbafccd6f75ea472ecf6141..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/view/res/drawable/size_48x48.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/view/res/drawable/start.jpg b/proprietary/frameworks/base/tests/view/res/drawable/start.jpg
deleted file mode 100755
index 54e05e0d4b238bf9a5a1f4a54161b3331f8c0554..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/view/res/drawable/start.jpg and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/view/res/layout/anim_layout.xml b/proprietary/frameworks/base/tests/view/res/layout/anim_layout.xml
deleted file mode 100755
index b6aa9066f1404628fe7005d40dbf5265cbe86fbb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/anim_layout.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:id="@+id/anim_window_parent">
-
-    <TextView android:id="@+id/anim_window"
-        android:layout_width="100dip"
-        android:layout_height="20dip"
-        android:text="@string/text_view_hello"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/animation_main.xml b/proprietary/frameworks/base/tests/view/res/layout/animation_main.xml
deleted file mode 100755
index c1664f5a4077cc50a36ff30e775d84247d9353fa..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/animation_main.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical" >
-    <FrameLayout android:id="@+id/container" android:layout_width="fill_parent"
-            android:layout_height="fill_parent"/>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/animation_two.xml b/proprietary/frameworks/base/tests/view/res/layout/animation_two.xml
deleted file mode 100755
index 870cc6bd47b3d720bad77ad558d7389ed2cec5dc..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/animation_two.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-    <Button android:id="@+id/button1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/add_button"/>
-    <LinearLayout android:id="@+id/container"
-        android:orientation="vertical"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"/>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/animator_basic.xml b/proprietary/frameworks/base/tests/view/res/layout/animator_basic.xml
deleted file mode 100755
index 7b8ef11df1bd59599f11d8278cb1bcda8c92d37f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/animator_basic.xml
+++ /dev/null
@@ -1,11 +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">
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/animatingButton"/>
-</LinearLayout>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/view/res/layout/attach_view_test.xml b/proprietary/frameworks/base/tests/view/res/layout/attach_view_test.xml
deleted file mode 100755
index a384ac32b22b265289fc43617077c425b37670d4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/attach_view_test.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <com.mediatek.common.view.tests.ViewAttachView
-    android:id="@+id/view_attach_view"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:keepScreenOn="true"/>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/disabled.xml b/proprietary/frameworks/base/tests/view/res/layout/disabled.xml
deleted file mode 100755
index 4b41248633220157007f1bc595d368546ee30029..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/disabled.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<!-- Demonstrates changing view visibility. See corresponding Java code. -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/clickableParent"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Button android:id="@+id/disabledButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/disabled_button"/>
-
-    <Button android:id="@+id/disabledButtonA"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/disabled_button"/>
-        
-    <Button android:id="@+id/disabledButtonB"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/disabled_button"/>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/drawable_background_minimum_size.xml b/proprietary/frameworks/base/tests/view/res/layout/drawable_background_minimum_size.xml
deleted file mode 100755
index ea0cbfa3b39ff0d2c167b27c6fb7a488eee8698e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/drawable_background_minimum_size.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-    
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-        
-        <Button
-            android:id="@+id/change_backgrounds"
-            android:text="@string/change_backgrounds"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <!-- Different views and layouts that should initially be small but still contain
-             some content (hence the minimal text inside each of the layouts).  Each of these
-             will each be tested to make sure they expand to at least the minimum size
-             recommended by different backgrounds -->
-             
-        <TextView
-            android:id="@+id/text_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/minimal_text" />
-                
-        <LinearLayout
-            android:id="@+id/linear_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-            
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/minimal_text" />
-                
-        </LinearLayout>
-    
-        <RelativeLayout
-            android:id="@+id/relative_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-            
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/minimal_text" />
-                
-        </RelativeLayout>
-    
-        <FrameLayout
-            android:id="@+id/frame_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-            
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/minimal_text" />
-                
-        </FrameLayout>
-    
-        <AbsoluteLayout
-            android:id="@+id/absolute_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-            
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/minimal_text" />
-                
-        </AbsoluteLayout>
-    
-    </LinearLayout>
-
-</ScrollView>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/focus_listener.xml b/proprietary/frameworks/base/tests/view/res/layout/focus_listener.xml
deleted file mode 100755
index 6faa21c32013d1d9394258d12416613ef74702d4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/focus_listener.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/samples/SampleCode/res/layout/baseline_1.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <Button android:id="@+id/left"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="3dip"
-        android:text="@string/left_top" />
-
-    <Button android:id="@+id/right"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="3dip"
-        android:text="@string/left_bottom" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/gridlayout_anim_controller_layout.xml b/proprietary/frameworks/base/tests/view/res/layout/gridlayout_anim_controller_layout.xml
deleted file mode 100755
index 0ff2d4661202f76f8b8b74f31b2085e435003a2a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/gridlayout_anim_controller_layout.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<GridView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/gridlayout_anim_gridview"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="10dp"
-    android:verticalSpacing="20dp"
-    android:horizontalSpacing="20dp"
-    android:numColumns="3"
-    android:columnWidth="60dp"
-    android:stretchMode="columnWidth"
-    android:gravity="center"
-/>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/include_button.xml b/proprietary/frameworks/base/tests/view/res/layout/include_button.xml
deleted file mode 100755
index 5857fa3bfd1e50ffad9fb39ce009c8961b5b1136..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/include_button.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/included_button"
-    android:text="@string/include_button"        
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content" />
diff --git a/proprietary/frameworks/base/tests/view/res/layout/include_button_with_size.xml b/proprietary/frameworks/base/tests/view/res/layout/include_button_with_size.xml
deleted file mode 100755
index 0cd8eaaf3f59c7c7d54ab8fc8495345c81e96633..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/include_button_with_size.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/included_button"
-    android:text="@string/include_button"        
-    android:layout_width="23dip"
-    android:layout_height="23dip" />
diff --git a/proprietary/frameworks/base/tests/view/res/layout/include_tag.xml b/proprietary/frameworks/base/tests/view/res/layout/include_tag.xml
deleted file mode 100755
index b2f6ab1cf6326f3ca3e3123be109add31181df75..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/include_tag.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:text="@string/include_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <include
-        layout="@layout/include_button" />
-
-    <include
-        layout="@layout/include_button"
-        android:id="@+id/included_button_overriden"
-        android:layout_width="237dip"
-        android:layout_height="123dip" />
-
-    <include
-        layout="@layout/include_button"
-        android:id="@+id/included_button_visibility"
-        android:visibility="invisible" />
-    
-    <include
-        layout="@layout/include_button_with_size"
-        android:id="@+id/included_button_with_size" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/layout_five.xml b/proprietary/frameworks/base/tests/view/res/layout/layout_five.xml
deleted file mode 100755
index 9923eaf0fdd2ebdfd6415b427d054301a488c110..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/layout_five.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-	<TextView android:id="@+id/text" android:text="@string/layout_five_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" />
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/layout_four.xml b/proprietary/frameworks/base/tests/view/res/layout/layout_four.xml
deleted file mode 100755
index e5a78bcfdcf214e7ba9373d8d2257333388eb286..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/layout_four.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text" android:text="@string/layout_four_text_text"/>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/layout_one.xml b/proprietary/frameworks/base/tests/view/res/layout/layout_one.xml
deleted file mode 100755
index f50704f1f12c5aa8ce05e4756623f6b1685ecd3c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/layout_one.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<view xmlns:android="http://schemas.android.com/apk/res/android" class="com.mediatek.common.view.tests.InflateTest$ViewOne" android:id="@+id/viewOne" android:layout_width="match_parent" android:layout_height="match_parent"/>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/layout_six.xml b/proprietary/frameworks/base/tests/view/res/layout/layout_six.xml
deleted file mode 100755
index b78082d164e88ad76965c87234725892d37e397f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/layout_six.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-	<TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" />
-	<TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" />
-	<TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" />
-	<TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" />
-	<TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" />
-	<TextView android:id="@+id/text" android:text="@string/layout_six_text_text" android:layout_width="match_parent" android:layout_height="wrap_content" />
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/layout_tag.xml b/proprietary/frameworks/base/tests/view/res/layout/layout_tag.xml
deleted file mode 100755
index 226b3d531b8b9ce64a5315d51132704a04166db7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/layout_tag.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<view xmlns:android="http://schemas.android.com/apk/res/android"
-    class="com.mediatek.common.view.tests.InflateTest$ViewOne"
-    android:id="@+id/viewOne" android:tag="MyTag"
-    android:layout_width="match_parent" android:layout_height="match_parent"/>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/layout_three.xml b/proprietary/frameworks/base/tests/view/res/layout/layout_three.xml
deleted file mode 100755
index 0c9cd93620e136c8078c89ed68449909d3c742d0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/layout_three.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-	<view class="com.mediatek.common.view.tests.InflateTest$ViewOne" android:id="@+id/view1" android:layout_width="match_parent" android:layout_height="match_parent"/>
-	<view class="com.mediatek.common.view.tests.InflateTest$ViewOne" android:id="@+id/view2" android:layout_width="match_parent" android:layout_height="match_parent"/>
-	<view class="com.mediatek.common.view.tests.InflateTest$ViewOne" android:id="@+id/view3" android:layout_width="match_parent" android:layout_height="match_parent"/>
-	<view class="com.mediatek.common.view.tests.InflateTest$ViewOne" android:id="@+id/view4" android:layout_width="match_parent" android:layout_height="match_parent"/>
-	<view class="com.mediatek.common.view.tests.InflateTest$ViewOne" android:id="@+id/view5" android:layout_width="match_parent" android:layout_height="match_parent"/>
-	<view class="com.mediatek.common.view.tests.InflateTest$ViewOne" android:id="@+id/view6" android:layout_width="match_parent" android:layout_height="match_parent"/>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/layout_two.xml b/proprietary/frameworks/base/tests/view/res/layout/layout_two.xml
deleted file mode 100755
index bfdad3c0cbd13be90eb6cbcf832b723c4a8faa65..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/layout_two.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent">
-	<view class="com.mediatek.common.view.tests.InflateTest$ViewOne" android:id="@+id/viewOne" android:layout_width="match_parent" android:layout_height="match_parent"/>
-</LinearLayout>
-
diff --git a/proprietary/frameworks/base/tests/view/res/layout/linear_layout_buttons.xml b/proprietary/frameworks/base/tests/view/res/layout/linear_layout_buttons.xml
deleted file mode 100755
index bcb28e7df03a60c15e5a4f17d686a64eb5657013..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/linear_layout_buttons.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/samples/SampleCode/res/layout/baseline_1.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Button
-        android:id="@+id/button1"
-        android:layout_width="match_parent"
-        android:layout_height="0sp"
-        android:layout_weight="1"
-        android:text="@string/keypad_one"/>
-
-    <Button
-        android:id="@+id/button2"
-        android:layout_width="match_parent"
-        android:layout_height="0sp"
-        android:layout_weight="1"
-        android:text="@string/keypad_two"/>
-
-    <Button
-        android:id="@+id/button3"
-        android:layout_width="match_parent"
-        android:layout_height="0sp"
-        android:layout_weight="1"
-        android:text="@string/keypad_three"/>
-
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/longpress.xml b/proprietary/frameworks/base/tests/view/res/layout/longpress.xml
deleted file mode 100755
index 3a69fae4e1fb4676f0648a929617f1aecc9e0ade..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/longpress.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <View android:id="@+id/simple_view"
-        android:background="@drawable/blue"
-        android:layout_width="20dip"
-        android:layout_height="20dip"
-        android:focusable="true" />
-    
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/merge_child.xml b/proprietary/frameworks/base/tests/view/res/layout/merge_child.xml
deleted file mode 100755
index 9972924999cceab56b44ce0338e41bf3d32cc15c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/merge_child.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <TextView
-        android:text="@string/include_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:text="@string/include_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:text="@string/include_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</merge>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/merge_tag.xml b/proprietary/frameworks/base/tests/view/res/layout/merge_tag.xml
deleted file mode 100755
index 9eec493823dc702303831841f50b4d7117d354de..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/merge_tag.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <TextView
-        android:text="@string/include_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:text="@string/include_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:text="@string/include_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:text="@string/include_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <include layout="@layout/merge_child" />
-
-</merge>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/popup_window_visibility.xml b/proprietary/frameworks/base/tests/view/res/layout/popup_window_visibility.xml
deleted file mode 100755
index 3aa714d9f05cef672aa71e35fd787e54102a7797..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/popup_window_visibility.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent" 
-    android:layout_height="match_parent">
-    
-    <FrameLayout android:id="@+id/frame"
-        android:layout_width="match_parent" 
-        android:layout_height="0dip"
-        android:layout_weight="1">
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent" 
-            android:layout_height="match_parent">
-                
-            <Spinner android:id="@+id/spinner"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-        
-            <AutoCompleteTextView android:id="@+id/auto"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
-                
-        </LinearLayout>
-        
-    </FrameLayout>
-    
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent" 
-        android:layout_height="wrap_content">
-        
-        <Button android:id="@+id/hide"
-            android:layout_width="wrap_content" 
-            android:layout_height="wrap_content"
-            android:text="@string/hide" />
-         
-        <Button android:id="@+id/show"
-            android:layout_width="wrap_content" 
-            android:layout_height="wrap_content"
-            android:text="@string/show" /> 
-            
-    </LinearLayout>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/pre_draw_listener.xml b/proprietary/frameworks/base/tests/view/res/layout/pre_draw_listener.xml
deleted file mode 100755
index 7b1b2e619da56806580c2b4128ca173973db8bea..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/pre_draw_listener.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent" 
-    android:layout_height="match_parent">
-    
-
-	<ScrollView 
-		android:orientation="vertical"
-        android:layout_width="match_parent" 
-        android:layout_height="0dip"
-        android:layout_weight="1">
-        
-        <view class="com.mediatek.common.view.tests.PreDrawListener$MyLinearLayout" android:id="@+id/frame"
-            android:orientation="vertical"
-            android:layout_width="match_parent" 
-            android:layout_height="match_parent" />
-
-    </ScrollView>
-        
-    <Button android:id="@+id/go"
-        android:layout_width="wrap_content" 
-        android:layout_height="wrap_content"
-        android:text="@string/go" />
-         
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/remote_view_host.xml b/proprietary/frameworks/base/tests/view/res/layout/remote_view_host.xml
deleted file mode 100755
index 19d0a738deccda76094ca5cd141dbbe00787c760..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/remote_view_host.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/table_layout_cell_span.xml b/proprietary/frameworks/base/tests/view/res/layout/table_layout_cell_span.xml
deleted file mode 100755
index fceef0a4bdfb5105a38ccde1d7992eb270c79d8d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/table_layout_cell_span.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TableRow>
-        <TextView android:id="@+id/a"
-            android:text="@string/table_layout_a"
-            android:background="#FFFF0000"
-            android:padding="3dip" />
-        <TextView android:id="@+id/b"
-            android:text="@string/table_layout_b"
-            android:background="#FF00FF00"
-            android:padding="3dip" />
-        <TextView android:id="@+id/c"
-            android:text="@string/table_layout_c"
-            android:background="#FF0000FF"
-            android:padding="3dip" />
-    </TableRow>
-
-    <TableRow>
-        <TextView  android:id="@+id/spanThenCell"
-            android:text="@string/table_layout_d"
-            android:layout_span="2"
-            android:gravity="center_horizontal"
-            android:background="#FF0000FF"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_e"
-            android:background="#FF00FF00"
-            android:padding="3dip" />
-    </TableRow>
-
-    <TableRow>
-        <TextView
-            android:text="@string/table_layout_f"
-            android:background="#FFFF00FF"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_g"
-            android:background="#FF00FF00"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_h"
-            android:background="#FFFF0000"
-            android:padding="3dip" />
-    </TableRow>
-
-    <TableRow>
-        <TextView
-            android:text="@string/table_layout_a"
-            android:background="#FF00FF00"
-            android:padding="3dip" />
-        <TextView android:id="@+id/cellThenSpan"
-            android:text="@string/table_layout_b"
-            android:layout_span="2"
-            android:gravity="center_horizontal"
-            android:background="#FF0000FF"
-            android:padding="3dip" />
-    </TableRow>
-
-    <TableRow>
-        <TextView android:id="@+id/span"
-            android:text="@string/table_layout_g"
-            android:layout_span="3"
-            android:gravity="center_horizontal"
-            android:background="#FFC0C0C0"
-            android:padding="3dip" />
-    </TableRow>
-</TableLayout>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/viewgroupchildren.xml b/proprietary/frameworks/base/tests/view/res/layout/viewgroupchildren.xml
deleted file mode 100755
index 22595ed0f01c4c1ef31cc25154d20ba0dc191bd9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/viewgroupchildren.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<!-- Demonstrates adding/removing views from ViewGroup. See corresponding Java code. -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/group"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/viewstub.xml b/proprietary/frameworks/base/tests/view/res/layout/viewstub.xml
deleted file mode 100755
index 8b32d8f0073825f6c50f078b8527445cb44c3509..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/viewstub.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Button android:id="@+id/vis"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/visibility_1_vis" />
-
-    <ViewStub android:id="@+id/viewStub"
-        android:layout="@layout/linear_layout_buttons"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <ViewStub android:id="@+id/viewStubWithId"
-        android:inflatedId="@+id/stub_inflated"
-        android:layout="@layout/linear_layout_buttons"
-        android:layout_width="47dip"
-        android:layout_height="127dip" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/visibility.xml b/proprietary/frameworks/base/tests/view/res/layout/visibility.xml
deleted file mode 100755
index 7edfa331ee1627097e2fb628b37c8eb77fd8fc0b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/visibility.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<!-- Demonstrates changing view visibility. See corresponding Java code. -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-      android:orientation="vertical"
-      android:background="@drawable/box"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content">
-
-      <TextView android:id="@+id/refUp"
-          android:background="@drawable/red"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:text="@string/visibility_1_view_1"/>
-
-      <TextView android:id="@+id/victim"
-          android:background="@drawable/green"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:text="@string/visibility_1_view_2"/>
-
-      <TextView android:id="@+id/refDown"
-          android:background="@drawable/blue"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:text="@string/visibility_1_view_3"/>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <Button android:id="@+id/vis"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/visibility_1_vis"/>
-
-        <Button android:id="@+id/invis"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/visibility_1_invis"/>
-
-        <Button android:id="@+id/gone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/visibility_1_gone"/>
-
-    </LinearLayout>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/visibility_callback.xml b/proprietary/frameworks/base/tests/view/res/layout/visibility_callback.xml
deleted file mode 100755
index e85565a577a20bc3dfa9fe1817ebfd6968475206..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/visibility_callback.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<!-- Demonstrates changing view visibility. See corresponding Java code. -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-      android:orientation="vertical"
-      android:background="@drawable/box"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content">
-
-      <TextView android:id="@+id/refUp"
-          android:background="@drawable/red"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:text="@string/visibility_1_view_1"/>
-
-      <FrameLayout android:id="@+id/parent"
-                   android:layout_width="match_parent"
-                   android:layout_height="wrap_content">
-          <view class="com.mediatek.common.view.tests.VisibilityCallback$MonitoredTextView"
-                android:id="@+id/victim"
-                android:background="@drawable/green"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/visibility_1_view_2"/>
-      </FrameLayout>
-
-      <TextView android:id="@+id/refDown"
-          android:background="@drawable/blue"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:text="@string/visibility_1_view_3"/>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <Button android:id="@+id/vis"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/visibility_1_vis"/>
-
-        <Button android:id="@+id/invis"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/visibility_1_invis"/>
-
-        <Button android:id="@+id/gone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/visibility_1_gone"/>
-
-    </LinearLayout>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/with_bitmap_background.xml b/proprietary/frameworks/base/tests/view/res/layout/with_bitmap_background.xml
deleted file mode 100755
index 01605d5628c3615dce56206ea831fc9bbb5048ef..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/with_bitmap_background.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<LinearLayout android:id="@+id/container" xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/bitmap_drawable">
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/view/res/layout/zero_sized.xml b/proprietary/frameworks/base/tests/view/res/layout/zero_sized.xml
deleted file mode 100755
index f1c94f8a6929514c9a098f28ac64c2009069bafa..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/layout/zero_sized.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<!-- Demonstrates changing view visibility. See corresponding Java code. -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <View android:id="@+id/dimension"
-        android:background="#ffff0000"
-        android:layout_width="42dip"
-        android:layout_height="42dip" />
-
-    <View android:id="@+id/noWidth"
-          android:background="#ff00ff00"
-        android:layout_width="0dip"
-        android:layout_height="42dip" />
-
-    <View android:id="@+id/noHeight"
-          android:background="#ff0000ff"
-        android:layout_width="42dip"
-        android:layout_height="0dip" />
-
-    <View android:id="@+id/noDimension"
-        android:background="#ffffffff"
-        android:layout_width="0dip"
-        android:layout_height="0dip" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/view/res/values/colors.xml b/proprietary/frameworks/base/tests/view/res/values/colors.xml
deleted file mode 100755
index f881660249f2570a170829078a5ed37634deeea9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/values/colors.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/samples/SampleCode/res/values/colors.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<resources>
-    <drawable name="red">#ffff0000</drawable>
-    <drawable name="blue">#ff0000ff</drawable>
-    <drawable name="green">#ff00ff00</drawable>
-    <drawable name="yellow">#ffffff00</drawable>
-</resources>
diff --git a/proprietary/frameworks/base/tests/view/res/values/strings.xml b/proprietary/frameworks/base/tests/view/res/values/strings.xml
deleted file mode 100755
index 02068d9408cd3f4e2cefbe282e831e3d44d034fc..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/values/strings.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">FrameworkTestApplication</string>
-
-    <!-- FocusAfterRemoval -->
-    <string name="left_top">parent GONE</string>
-    <string name="left_bottom">parent INVISIBLE</string>
-    <string name="right_top">me GONE</string>
-    <string name="right_bottom">me INVISIBLE</string>
-
-    <!-- Strings for the 12 key dialer -->
-    <string name="keypad_one">1</string>
-    <string name="keypad_two">"2\nabc"</string>
-    <string name="keypad_three">"3\ndef"</string>
-    <string name="keypad_four">"4\nghi"</string>
-    <string name="keypad_five">"5\njkl"</string>
-    <string name="keypad_six">"6\nmno"</string>
-    <string name="keypad_seven">"7\npqrs"</string>
-    <string name="keypad_eight">"8\ntuv"</string>
-    <string name="keypad_nine">"9\nwxyz"</string>
-    <string name="keypad_zero">0</string>
-    <string name="keypad_star">*</string>
-    <string name="keypad_pound">"#"</string>
-    
-
-    <!-- HorizontalGravity -->
-    <string name="table_layout_open">Open\u2026</string>
-    <string name="table_layout_open_shortcut">Ctrl-O</string>
-    <string name="table_layout_save_as">Save As\u2026</string>
-    <string name="table_layout_save_as_shortcut">Ctrl-Shift-S</string>
-    <string name="table_layout_export">Export\u2026</string>
-    <string name="table_layout_export_shortcut">Ctrl-E</string>
-
-    <!-- CellSpan -->
-    <string name="table_layout_a">A</string>
-    <string name="table_layout_b">BB</string>
-    <string name="table_layout_c">CCCC</string>
-    <string name="table_layout_d">D</string>
-    <string name="table_layout_e">E</string>
-    <string name="table_layout_f">F</string>
-    <string name="table_layout_g">G</string>
-    <string name="table_layout_h">H</string>
-    
-    <!-- scroll_to_rectangle -->
-    <string name="scroll_top_button">Click to make "hi!" on screen</string>
-    <string name="scroll_top_button2">Click to make blob on screen</string>
-    <string name="scroll_to_me">hi!</string>
-    <string name="scroll_bottom_button2">Click to make blob on screen</string>
-    <string name="scroll_bottom_button">Click to make "hi!" on screen</string>
-
-    <!-- Visibility -->
-    <string name="visibility_1_view_1">View A</string>
-    <string name="visibility_1_view_2">View B</string>
-    <string name="visibility_1_view_3">View C</string>
-    <string name="visibility_1_vis">Visible</string>
-    <string name="visibility_1_invis">Invisible</string>
-    <string name="visibility_1_gone">Gone</string>
-
-    <string name="submit">submit</string>
-    <string name="cancel">cancel</string>
-    <string name="enter_title">enter title</string>
-    <string name="enter_url">enter url</string>
-
-    <!-- List with button above -->
-    <string name="button_above_list_label">Button above list</string>
-    
-    <!-- List take focus from side -->
-    <string name="side_button_label">X</string>
-    
-    <!-- Linear Layout show/hide & sizing -->
-    <string name="linear_listheight_fixed">Fixed Size</string>
-    <string name="linear_listheight_fill">Fill Screen</string>
-    <string name="linear_listheight_hide">Hide</string>
-
-    <!-- Baseline -->
-    <string name="show">Show</string>
-    <string name="time">00:00:00</string>
-    
-    <!-- Drawable -->
-    <string name="minimal_text">a</string>
-    <string name="change_backgrounds">Change backgrounds</string>
-
-    <!-- List with empty view -->
-    <string name="empty_list">Empty list</string>
-    <string name="menu_add">Add</string>
-    <string name="menu_remove">Remove</string>
-
-    <!-- Misc. -->
-    <string name="add_row_button">Add Row</string>
-    <string name="disabled_button">Disabled</string>
-    <string name="translucent_background">Example of how you can make an
-            activity have a translucent background, compositing over
-            whatever is behind it.</string>
-    <string name="text">Lorem ipsum datum carat casus belli honorare</string>
-    
-	<string name="hide">Hide</string>
-    <string name="go">Go</string>
-
-    <string name="include_label">Included views below:</string>
-    <string name="include_button">I was included!</string>
-
-    <string name="view">View</string>
-
-    <string name="layout_five_text_text">S</string>
-    <string name="layout_four_text_text">S</string>
-    <string name="layout_six_text_text">S</string>
-
-    <string name="menu_test">test</string>
-    <string name="metadata_text">text</string>
-
-    <string name="permlab_testGranted">Test Granted</string>
-    <string name="permdesc_testGranted">Used for running unit tests, for
-        testing operations where we have the permission.</string>
-    <string name="permlab_testDenied">Test Denied</string>
-    <string name="permdesc_testDenied">Used for running unit tests, for
-        testing operations where we do not have the permission.</string>
-
-    <string name="searchable_label">SearchManager Test</string>
-    <string name="searchable_hint">A search hint</string>
-
-    <!-- InterrogationActivity -->
-    <string name="button1">Button1</string>
-    <string name="button2">Button2</string>
-    <string name="button3">Button3</string>
-    <string name="button4">Button4</string>
-    <string name="button5">Button5</string>
-    <string name="button6">Button6</string>
-    <string name="button7">Button7</string>
-    <string name="button8">Button8</string>
-    <string name="button9">Button9</string>
-
-    <string name="textview_hebrew_text">&#x05DD;&#x05DE;ab?!</string>
-
-    <!-- SizeAdaptiveLayout -->
-    <string name="first">Four score and seven years ago our fathers brought forth on this continent, a new nation, conceived in Liberty, and dedicated to the proposition that all men are created equal.</string>
-    <string name="actor">Abe Lincoln</string>
-    <string name="caption">Lincoln adressing the crowd at Gettysburgh</string>
-    
-    <!-- ActionBar -->
-    <string name="btn_add_tab">add tab</string>
-    <string name="btn_remove_tab">remove tab</string>
-    <string name="btn_toggle_tabs">toggle tabs</string>
-    <string name="btn_remove_all_tabs">remove all tabs</string>
-    <string name="display_options_custom_button">custom</string>
-    <string name="display_options_menu_item">option 1</string>
-    <string name="display_options_menu_item2">option 2</string>
-    <string name="display_options_menu_item3">option 3</string>
-    <string name="display_options_menu_item4">option 4</string>
-    <string name="display_options_menu_item5">option 5</string>
-    <string name="display_options_menu_item6">option 6</string>
-    <string name="display_options_menu_item7">option 7</string>
-
-    <string-array name="action_list">
-        <item>Mercury</item>
-        <item>Venus</item>
-        <item>Earth</item>
-    </string-array>
-    
-    <string name="menu_search">Search</string>
-    
-    <string name="shared_app_name">ShareTarget</string>
-    
-    <string name="action1">Action1</string>
-    <string name="action2">Action2</string>
-    <string name="action3">Action3</string>
-    
-    <string name="hello_world">Hello world!</string>
-    <string name="menu_settings">Settings</string>
-    
-    <!-- Animation -->
-    <string name="text_view_hello">Hello! Text view!</string>
-    <string name="add_button">Add Button</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/view/res/values/styles.xml b/proprietary/frameworks/base/tests/view/res/values/styles.xml
deleted file mode 100755
index 7a90197c5b6639eca4058ce0d056f27403133530..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/res/values/styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<resources>
-    <style name="Theme" parent="android:Theme">
-        <item name="android:windowAnimationStyle">@style/Animation</item>
-    </style>
-
-    <style name="Animation">
-        <item name="android:activityOpenEnterAnimation">@null</item>
-        <item name="android:activityOpenExitAnimation">@null</item>
-        <item name="android:activityCloseEnterAnimation">@null</item>
-        <item name="android:activityCloseExitAnimation">@null</item>
-        <item name="android:taskOpenEnterAnimation">@null</item>
-        <item name="android:taskOpenExitAnimation">@null</item>
-        <item name="android:taskCloseEnterAnimation">@null</item>
-        <item name="android:taskCloseExitAnimation">@null</item>
-        <item name="android:taskToFrontEnterAnimation">@null</item>
-        <item name="android:taskToFrontExitAnimation">@null</item>
-        <item name="android:taskToBackEnterAnimation">@null</item>
-        <item name="android:taskToBackExitAnimation">@null</item>
-    </style>
-</resources>
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/BigCache.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/BigCache.java
deleted file mode 100755
index 7bf557d2a03ff461e387383eb77ab76cf3aa72d6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/BigCache.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.os.Bundle;
-import android.app.Activity;
-import android.widget.LinearLayout;
-import android.widget.ScrollView;
-import android.view.ViewGroup;
-import android.view.View;
-import android.view.Display;
-import android.view.ViewConfiguration;
-
-/**
- * This activity contains two Views, one as big as the screen, one much larger. The large one
- * should not be able to activate its drawing cache.
- */
-public class BigCache extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        final LinearLayout testBed = new LinearLayout(this);
-        testBed.setOrientation(LinearLayout.VERTICAL);
-        testBed.setLayoutParams(new ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-
-        final int cacheSize = ViewConfiguration.get(this).getScaledMaximumDrawingCacheSize();
-        final Display display = getWindowManager().getDefaultDisplay();
-        final int screenWidth = display.getWidth();
-        final int screenHeight = display.getHeight();
-
-        final View tiny = new View(this);
-        tiny.setId(R.id.a);
-        tiny.setBackgroundColor(0xFFFF0000);
-        tiny.setLayoutParams(new LinearLayout.LayoutParams(screenWidth, screenHeight));
-
-        final View large = new View(this);
-        large.setId(R.id.b);
-        large.setBackgroundColor(0xFF00FF00);
-        // Compute the height of the view assuming a cache size based on ARGB8888
-        final int height = 2 * (cacheSize / 2) / screenWidth + 1;
-        large.setLayoutParams(new LinearLayout.LayoutParams(screenWidth, height));
-
-        final ScrollView scroller = new ScrollView(this);
-        scroller.setLayoutParams(new ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
-
-        testBed.addView(tiny);
-        testBed.addView(large);
-        scroller.addView(testBed);
-
-        setContentView(scroller);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/BigCacheTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/BigCacheTest.java
deleted file mode 100755
index 16453335b1df771e9affb5ec49c5df528778451d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/BigCacheTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.graphics.Bitmap;
-
-/**
- * Builds the drawing cache of two Views, one smaller than the maximum cache size,
- * one larger than the maximum cache size. The latter should always have a null
- * drawing cache.
- */
-public class BigCacheTest extends ActivityInstrumentationTestCase<BigCache> {
-    private View mTiny;
-    private View mLarge;
-
-    public BigCacheTest() {
-        super("com.mediatek.common.view.tests", BigCache.class);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-
-        final BigCache activity = getActivity();
-        mTiny = activity.findViewById(R.id.a);
-        mLarge = activity.findViewById(R.id.b);
-    }
-
-    @MediumTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mTiny);
-        assertNotNull(mLarge);
-    }
-
-    @MediumTest
-    public void testDrawingCacheBelowMaximumSize() throws Exception {
-        final int max = ViewConfiguration.get(getActivity()).getScaledMaximumDrawingCacheSize();
-        assertTrue(mTiny.getWidth() * mTiny.getHeight() * 2 < max);
-        assertNotNull(createCacheForView(mTiny));
-    }
-
-    // TODO: needs to be adjusted to pass on non-HVGA displays
-    // @MediumTest
-    public void testDrawingCacheAboveMaximumSize() throws Exception {
-        final int max = ViewConfiguration.get(getActivity()).getScaledMaximumDrawingCacheSize();
-        assertTrue(mLarge.getWidth() * mLarge.getHeight() * 2 > max);
-        assertNull(createCacheForView(mLarge));
-    }
-
-    private Bitmap createCacheForView(final View view) {
-        final Bitmap[] cache = new Bitmap[1];
-        getActivity().runOnUiThread(new Runnable() {
-            public void run() {
-                view.setDrawingCacheEnabled(true);
-                view.invalidate();
-                view.buildDrawingCache();
-                cache[0] = view.getDrawingCache();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-        return cache[0];
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/BitmapDrawable.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/BitmapDrawable.java
deleted file mode 100755
index fc1670f4dd0415567d1024ffc184123f2c5ad19b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/BitmapDrawable.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class BitmapDrawable extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        setContentView(R.layout.with_bitmap_background);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/CreateViewTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/CreateViewTest.java
deleted file mode 100755
index 3500d6fdce840514f8001b2d87a08cd737ce5703..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/CreateViewTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.content.Context;
-import android.test.AndroidTestCase;
-import android.test.PerformanceTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.view.View;
-import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-public class CreateViewTest extends AndroidTestCase implements PerformanceTestCase {
-
-    public boolean isPerformanceOnly() {
-        return false;
-    }
-
-    public int startPerformance(PerformanceTestCase.Intermediates intermediates) {
-        return 0;
-    }
-
-    @SmallTest
-    public void testLayout1() throws Exception {
-        new CreateViewTest.ViewOne(mContext);
-    }
-
-    @SmallTest
-    public void testLayout2() throws Exception {
-        LinearLayout vert = new LinearLayout(mContext);
-        vert.addView(new CreateViewTest.ViewOne(mContext),
-                new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 0));
-    }
-
-    @SmallTest
-    public void testLayout3() throws Exception {
-        LinearLayout vert = new LinearLayout(mContext);
-
-        ViewOne one = new ViewOne(mContext);
-        vert.addView(one, new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 0));
-
-        ViewOne two = new ViewOne(mContext);
-        vert.addView(two, new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 0));
-
-        ViewOne three = new ViewOne(mContext);
-        vert.addView(three, new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 0));
-
-        ViewOne four = new ViewOne(mContext);
-        vert.addView(four, new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 0));
-
-        ViewOne five = new ViewOne(mContext);
-        vert.addView(five, new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 0));
-
-        ViewOne six = new ViewOne(mContext);
-        vert.addView(six, new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 0));
-    }
-
-    @SmallTest
-    public void testLayout4() throws Exception {
-        TextView text = new TextView(mContext);
-        text.setText("S");
-    }
-
-    @SmallTest
-    public void testLayout5() throws Exception {
-        TextView text = new TextView(mContext);
-        text.setText("S");
-
-        LinearLayout vert = new LinearLayout(mContext);
-        vert.addView(text, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 0));
-    }
-
-    @SmallTest
-    public void testLayout6() throws Exception {
-        LinearLayout vert = new LinearLayout(mContext);
-
-        TextView one = new TextView(mContext);
-        one.setText("S");
-        vert.addView(one, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 0));
-
-        TextView two = new TextView(mContext);
-        two.setText("M");
-        vert.addView(two, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 0));
-
-        TextView three = new TextView(mContext);
-        three.setText("T");
-        vert.addView(three, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 0));
-
-        TextView four = new TextView(mContext);
-        four.setText("W");
-        vert.addView(four, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 0));
-
-        TextView five = new TextView(mContext);
-        five.setText("H");
-        vert.addView(five, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 0));
-
-        TextView six = new TextView(mContext);
-        six.setText("F");
-        vert.addView(six, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 0));
-    }
-
-    public static class ViewOne extends View {
-        public ViewOne(Context context) {
-            super(context);
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/Disabled.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/Disabled.java
deleted file mode 100755
index a6a0a9446a2ab22182d15d9531fb73d9062bd364..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/Disabled.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.os.Bundle;
-import android.widget.Button;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.app.Activity;
-
-/**
- * Exercise View's disabled state.
- */
-public class Disabled extends Activity implements OnClickListener {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.disabled);
-
-        // Find our buttons
-        Button disabledButton = (Button) findViewById(R.id.disabledButton);
-        disabledButton.setEnabled(false);
-
-        // Find our buttons
-        Button disabledButtonA = (Button) findViewById(R.id.disabledButtonA);
-        disabledButtonA.setOnClickListener(this);
-    }
-
-    public void onClick(View v) {
-        Button disabledButtonB = (Button) findViewById(R.id.disabledButtonB);
-        disabledButtonB.setEnabled(!disabledButtonB.isEnabled());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/DisabledLongpressTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/DisabledLongpressTest.java
deleted file mode 100755
index 47d463fcd21b51bfc87950a5730e9b057759b023..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/DisabledLongpressTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import com.mediatek.common.view.tests.util.KeyUtils;
-import android.test.TouchUtils;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.view.View;
-import android.view.View.OnLongClickListener;
-
-/**
- * Exercises {@link android.view.View}'s longpress plumbing by testing the
- * disabled case.
- */
-public class DisabledLongpressTest extends ActivityInstrumentationTestCase<Longpress> {
-    private View mSimpleView;
-    private boolean mLongClicked;
-
-    public DisabledLongpressTest() {
-        super("com.mediatek.common.view.tests", Longpress.class);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-
-        final Longpress a = getActivity();
-        mSimpleView = a.findViewById(R.id.simple_view);
-        mSimpleView.setOnLongClickListener(new OnLongClickListener() {
-            public boolean onLongClick(View v) {
-                mLongClicked = true;
-                return true;
-            }
-        });
-        // The View#setOnLongClickListener will ensure the View is long
-        // clickable, we reverse that here
-        mSimpleView.setLongClickable(false);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-
-        mLongClicked = false;
-    }
-
-    @MediumTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mSimpleView);
-        assertTrue(mSimpleView.hasFocus());
-        assertFalse(mLongClicked);
-    }
-
-    @LargeTest
-    public void testKeypadLongClick() throws Exception {
-        mSimpleView.requestFocus();
-        getInstrumentation().waitForIdleSync();
-        KeyUtils.longClick(this);
-
-        getInstrumentation().waitForIdleSync();
-        assertFalse(mLongClicked);
-    }
-
-    @LargeTest
-    public void testTouchLongClick() throws Exception {
-        TouchUtils.longClickView(this, mSimpleView);
-        getInstrumentation().waitForIdleSync();
-        assertFalse(mLongClicked);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/DisabledTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/DisabledTest.java
deleted file mode 100755
index 6573561237513133088b8d6367000a3ed82317b2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/DisabledTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.test.TouchUtils;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.suitebuilder.annotation.LargeTest;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.widget.Button;
-import android.view.KeyEvent;
-import android.view.View;
-
-/**
- * Exercises {@link android.view.View}'s disabled property.
- */
-public class DisabledTest extends ActivityInstrumentationTestCase<Disabled> {
-    private Button mDisabled;
-    private View mDisabledParent;
-    private boolean mClicked;
-    private boolean mParentClicked;
-
-    public DisabledTest() {
-        super("com.mediatek.common.view.tests", Disabled.class);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-
-        final Disabled a = getActivity();
-        mDisabled = (Button) a.findViewById(R.id.disabledButton);
-        mDisabled.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                mClicked = true;
-            }
-        });
-
-        mDisabledParent = a.findViewById(R.id.clickableParent);
-        mDisabledParent.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                mParentClicked = true;
-            }
-        });
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-
-        mClicked = false;
-        mParentClicked = false;
-    }
-
-    @MediumTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mDisabled);
-        assertNotNull(mDisabledParent);
-        assertFalse(mDisabled.isEnabled());
-        assertTrue(mDisabledParent.isEnabled());
-        assertTrue(mDisabled.hasFocus());
-    }
-
-    @MediumTest
-    public void testKeypadClick() throws Exception {
-        sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
-        getInstrumentation().waitForIdleSync();
-        assertFalse(mClicked);
-        assertFalse(mParentClicked);
-    }
-
-    @LargeTest
-    public void testTouchClick() throws Exception {
-        TouchUtils.clickView(this, mDisabled);
-        getInstrumentation().waitForIdleSync();
-        assertFalse(mClicked);
-        assertFalse(mParentClicked);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/DrawableBgMinSize.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/DrawableBgMinSize.java
deleted file mode 100755
index 1acd6ab628ab415a8e7f97d20de4bba9a28a3179..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/DrawableBgMinSize.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.app.Activity;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.AbsoluteLayout;
-import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-/**
- * Views should obey their background {@link Drawable}'s minimum size
- * requirements ({@link Drawable#getMinimumHeight()} and
- * {@link Drawable#getMinimumWidth()}) when possible.
- * <p>
- * This Activity exercises a few Views with background {@link Drawable}s.
- */
-public class DrawableBgMinSize extends Activity implements OnClickListener {
-    private boolean mUsingBigBg = false;
-    private Drawable mBackgroundDrawable;
-    private Drawable mBigBackgroundDrawable;
-    private Button mChangeBackgroundsButton;
-
-    private TextView mTextView;
-    private LinearLayout mLinearLayout;
-    private RelativeLayout mRelativeLayout;
-    private FrameLayout mFrameLayout;
-    private AbsoluteLayout mAbsoluteLayout;
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        setContentView(R.layout.drawable_background_minimum_size);
-
-        mBackgroundDrawable = getResources().getDrawable(R.drawable.drawable_background);
-        mBigBackgroundDrawable = getResources().getDrawable(R.drawable.big_drawable_background);
-
-        mChangeBackgroundsButton = (Button) findViewById(R.id.change_backgrounds);
-        mChangeBackgroundsButton.setOnClickListener(this);
-
-        mTextView = (TextView) findViewById(R.id.text_view);
-        mLinearLayout = (LinearLayout) findViewById(R.id.linear_layout);
-        mRelativeLayout = (RelativeLayout) findViewById(R.id.relative_layout);
-        mFrameLayout = (FrameLayout) findViewById(R.id.frame_layout);
-        mAbsoluteLayout = (AbsoluteLayout) findViewById(R.id.absolute_layout);
-
-        changeBackgrounds(mBackgroundDrawable);
-    }
-
-    private void changeBackgrounds(Drawable newBg) {
-        mTextView.setBackgroundDrawable(newBg);
-        mLinearLayout.setBackgroundDrawable(newBg);
-        mRelativeLayout.setBackgroundDrawable(newBg);
-        mFrameLayout.setBackgroundDrawable(newBg);
-        mAbsoluteLayout.setBackgroundDrawable(newBg);
-    }
-
-    public void onClick(View v) {
-        if (mUsingBigBg) {
-            changeBackgrounds(mBackgroundDrawable);
-        } else {
-            changeBackgrounds(mBigBackgroundDrawable);
-        }
-
-        mUsingBigBg = !mUsingBigBg;
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/DrawableBgMinSizeTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/DrawableBgMinSizeTest.java
deleted file mode 100755
index b41187be0b562c191d6d707eeeaffe49e84a6aab..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/DrawableBgMinSizeTest.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.test.TouchUtils;
-import android.test.suitebuilder.annotation.MediumTest;
-
-import android.graphics.drawable.Drawable;
-import android.test.ActivityInstrumentationTestCase;
-import android.view.View;
-import android.widget.AbsoluteLayout;
-import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-/**
- * {@link DrawableBgMinSize} exercises Views to obey their background drawable's
- * minimum sizes.
- */
-public class DrawableBgMinSizeTest extends
-        ActivityInstrumentationTestCase<DrawableBgMinSize> {
-    private Button mChangeBackgroundsButton;
-
-    private Drawable mBackgroundDrawable;
-    private Drawable mBigBackgroundDrawable;
-
-    private TextView mTextView;
-    private LinearLayout mLinearLayout;
-    private RelativeLayout mRelativeLayout;
-    private FrameLayout mFrameLayout;
-    private AbsoluteLayout mAbsoluteLayout;
-
-    public DrawableBgMinSizeTest() {
-        super("com.mediatek.common.view.tests", DrawableBgMinSize.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        final DrawableBgMinSize a = getActivity();
-
-        mChangeBackgroundsButton = (Button) a.findViewById(R.id.change_backgrounds);
-        mBackgroundDrawable = a.getResources().getDrawable(R.drawable.drawable_background);
-        mBigBackgroundDrawable = a.getResources().getDrawable(R.drawable.big_drawable_background);
-        mTextView = (TextView) a.findViewById(R.id.text_view);
-        mLinearLayout = (LinearLayout) a.findViewById(R.id.linear_layout);
-        mRelativeLayout = (RelativeLayout) a.findViewById(R.id.relative_layout);
-        mFrameLayout = (FrameLayout) a.findViewById(R.id.frame_layout);
-        mAbsoluteLayout = (AbsoluteLayout) a.findViewById(R.id.absolute_layout);
-    }
-
-    @MediumTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mChangeBackgroundsButton);
-        assertNotNull(mBackgroundDrawable);
-        assertNotNull(mBigBackgroundDrawable);
-        assertNotNull(mTextView);
-        assertNotNull(mLinearLayout);
-        assertNotNull(mRelativeLayout);
-        assertNotNull(mFrameLayout);
-        assertNotNull(mAbsoluteLayout);
-    }
-
-    public void doMinimumSizeTest(View view) throws Exception {
-        assertTrue(view.getClass().getSimpleName() + " should respect the background Drawable's minimum width",
-                view.getWidth() >= mBackgroundDrawable.getMinimumWidth());
-        assertTrue(view.getClass().getSimpleName() + " should respect the background Drawable's minimum height",
-                view.getHeight() >= mBackgroundDrawable.getMinimumHeight());
-    }
-
-    @MediumTest
-    public void testTextViewMinimumSize() throws Exception {
-        doMinimumSizeTest(mTextView);
-    }
-
-    @MediumTest
-    public void testLinearLayoutMinimumSize() throws Exception {
-        doMinimumSizeTest(mLinearLayout);
-    }
-
-    @MediumTest
-    public void testRelativeLayoutMinimumSize() throws Exception {
-        doMinimumSizeTest(mRelativeLayout);
-    }
-
-    @MediumTest
-    public void testAbsoluteLayoutMinimumSize() throws Exception {
-        doMinimumSizeTest(mAbsoluteLayout);
-    }
-
-    @MediumTest
-    public void testFrameLayoutMinimumSize() throws Exception {
-        doMinimumSizeTest(mFrameLayout);
-    }
-
-    public void doDiffBgMinimumSizeTest(final View view) throws Exception {
-        // Change to the bigger backgrounds
-        TouchUtils.tapView(this, mChangeBackgroundsButton);
-
-        assertTrue(view.getClass().getSimpleName()
-                + " should respect the different bigger background Drawable's minimum width", view
-                .getWidth() >= mBigBackgroundDrawable.getMinimumWidth());
-        assertTrue(view.getClass().getSimpleName()
-                + " should respect the different bigger background Drawable's minimum height", view
-                .getHeight() >= mBigBackgroundDrawable.getMinimumHeight());
-    }
-
-    @MediumTest
-    public void testTextViewDiffBgMinimumSize() throws Exception {
-        doDiffBgMinimumSizeTest(mTextView);
-    }
-
-    @MediumTest
-    public void testLinearLayoutDiffBgMinimumSize() throws Exception {
-        doDiffBgMinimumSizeTest(mLinearLayout);
-    }
-
-    @MediumTest
-    public void testRelativeLayoutDiffBgMinimumSize() throws Exception {
-        doDiffBgMinimumSizeTest(mRelativeLayout);
-    }
-
-    @MediumTest
-    public void testAbsoluteLayoutDiffBgMinimumSize() throws Exception {
-        doDiffBgMinimumSizeTest(mAbsoluteLayout);
-    }
-
-    @MediumTest
-    public void testFrameLayoutDiffBgMinimumSize() throws Exception {
-        doDiffBgMinimumSizeTest(mFrameLayout);
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/FocusFinderTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/FocusFinderTest.java
deleted file mode 100755
index af8c0a6d7afe59d8edd2a30d24ca701bbd7a4354..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/FocusFinderTest.java
+++ /dev/null
@@ -1,578 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.graphics.Rect;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.view.FocusFinder;
-import android.view.FocusFinderHelper;
-import android.view.View;
-
-public class FocusFinderTest extends AndroidTestCase {
-
-    private FocusFinderHelper mFocusFinder;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mFocusFinder = new FocusFinderHelper(FocusFinder.getInstance());
-    }
-
-    @SmallTest
-    public void testPreconditions() {
-        assertNotNull("focus finder instance", mFocusFinder);
-    }
-
-    @SmallTest
-    public void testBelowNotCandidateForDirectionUp() {
-        assertIsNotCandidate(View.FOCUS_UP,
-                new Rect(0, 30, 10, 40),  // src  (left, top, right, bottom)
-                new Rect(0, 50, 10, 60));  // dest (left, top, right, bottom)
-    }
-
-    @SmallTest
-    public void testAboveShareEdgeEdgeOkForDirectionUp() {
-        final Rect src = new Rect(0, 30, 10, 40);
-
-        final Rect dest = new Rect(src);
-        dest.offset(0, -src.height());
-        assertEquals(src.top, dest.bottom);
-
-        assertDirectionIsCandidate(View.FOCUS_UP, src, dest);
-    }
-
-    @SmallTest
-    public void testCompletelyContainedNotCandidate() {
-        assertIsNotCandidate(
-                View.FOCUS_DOWN,
-                //       L  T   R   B
-                new Rect(0, 0,  50, 50),
-                new Rect(0, 1,  50, 49));
-    }
-
-    @SmallTest
-    public void testContinaedWithCommonBottomNotCandidate() {
-        assertIsNotCandidate(
-                View.FOCUS_DOWN,
-                //       L  T   R   B
-                new Rect(0, 0,  50, 50),
-                new Rect(0, 1,  50, 50));
-    }
-
-    @SmallTest
-    public void testOverlappingIsCandidateWhenBothEdgesAreInDirection() {
-        assertDirectionIsCandidate(
-                View.FOCUS_DOWN,
-                //       L  T   R   B
-                new Rect(0, 0,  50, 50),
-                new Rect(0, 1,  50, 51));
-    }
-
-    @SmallTest
-    public void testTopEdgeOfDestAtOrAboveTopOfSrcNotCandidateForDown() {
-        assertIsNotCandidate(
-                View.FOCUS_DOWN,
-                //       L  T   R   B
-                new Rect(0, 0,  50, 50),
-                new Rect(0, 0,  50, 51));
-        assertIsNotCandidate(
-                View.FOCUS_DOWN,
-                //       L  T   R   B
-                new Rect(0, 0,  50, 50),
-                new Rect(0, -1, 50, 51));
-    }
-
-    @SmallTest
-    public void testSameRectBeamsOverlap() {
-        final Rect rect = new Rect(0, 0, 20, 20);
-
-        assertBeamsOverlap(View.FOCUS_LEFT, rect, rect);
-        assertBeamsOverlap(View.FOCUS_RIGHT, rect, rect);
-        assertBeamsOverlap(View.FOCUS_UP, rect, rect);
-        assertBeamsOverlap(View.FOCUS_DOWN, rect, rect);
-    }
-
-    @SmallTest
-    public void testOverlapBeamsRightLeftUpToEdge() {
-        final Rect rect1 = new Rect(0, 0, 20, 20);
-        final Rect rect2 = new Rect(rect1);
-
-        // just below bottom edge
-        rect2.offset(0, rect1.height() - 1);
-        assertBeamsOverlap(View.FOCUS_LEFT, rect1, rect2);
-        assertBeamsOverlap(View.FOCUS_RIGHT, rect1, rect2);
-
-        // at edge
-        rect2.offset(0, 1);
-        assertBeamsOverlap(View.FOCUS_LEFT, rect1, rect2);
-        assertBeamsOverlap(View.FOCUS_RIGHT, rect1, rect2);
-
-        // just beyond
-        rect2.offset(0, 1);
-        assertBeamsDontOverlap(View.FOCUS_LEFT, rect1, rect2);
-        assertBeamsDontOverlap(View.FOCUS_RIGHT, rect1, rect2);
-
-        // just below top edge
-        rect2.set(rect1);
-        rect2.offset(0, -(rect1.height() - 1));
-        assertBeamsOverlap(View.FOCUS_LEFT, rect1, rect2);
-        assertBeamsOverlap(View.FOCUS_RIGHT, rect1, rect2);
-
-        // at top edge
-        rect2.offset(0, -1);
-        assertBeamsOverlap(View.FOCUS_LEFT, rect1, rect2);
-        assertBeamsOverlap(View.FOCUS_RIGHT, rect1, rect2);
-
-        // just beyond top edge
-        rect2.offset(0, -1);
-        assertBeamsDontOverlap(View.FOCUS_LEFT, rect1, rect2);
-        assertBeamsDontOverlap(View.FOCUS_RIGHT, rect1, rect2);
-    }
-
-    @SmallTest
-    public void testOverlapBeamsUpDownUpToEdge() {
-        final Rect rect1 = new Rect(0, 0, 20, 20);
-        final Rect rect2 = new Rect(rect1);
-
-        // just short of right edge
-        rect2.offset(rect1.width() - 1, 0);
-        assertBeamsOverlap(View.FOCUS_UP, rect1, rect2);
-        assertBeamsOverlap(View.FOCUS_DOWN, rect1, rect2);
-
-        // at edge
-        rect2.offset(1, 0);
-        assertBeamsOverlap(View.FOCUS_UP, rect1, rect2);
-        assertBeamsOverlap(View.FOCUS_DOWN, rect1, rect2);
-
-        // just beyond
-        rect2.offset(1, 0);
-        assertBeamsDontOverlap(View.FOCUS_UP, rect1, rect2);
-        assertBeamsDontOverlap(View.FOCUS_DOWN, rect1, rect2);
-
-        // just short of left edge
-        rect2.set(rect1);
-        rect2.offset(-(rect1.width() - 1), 0);
-        assertBeamsOverlap(View.FOCUS_UP, rect1, rect2);
-        assertBeamsOverlap(View.FOCUS_DOWN, rect1, rect2);
-
-        // at edge
-        rect2.offset(-1, 0);
-        assertBeamsOverlap(View.FOCUS_UP, rect1, rect2);
-        assertBeamsOverlap(View.FOCUS_DOWN, rect1, rect2);
-
-        // just beyond edge
-        rect2.offset(-1, 0);
-        assertBeamsDontOverlap(View.FOCUS_UP, rect1, rect2);
-        assertBeamsDontOverlap(View.FOCUS_DOWN, rect1, rect2);
-    }
-
-    @SmallTest
-    public void testDirectlyAboveTrumpsAboveLeft() {
-        Rect src = new Rect(0, 50, 20, 70);  // src (left, top, right, bottom)
-
-        Rect directlyAbove = new Rect(src);
-        directlyAbove.offset(0, -(1 + src.height()));
-
-        Rect aboveLeft = new Rect(src);
-        aboveLeft.offset(-(1 + src.width()), -(1 + src.height()));
-
-        assertBetterCandidate(View.FOCUS_UP, src, directlyAbove, aboveLeft);
-    }
-
-    @SmallTest
-    public void testAboveInBeamTrumpsSlightlyCloserOutOfBeam() {
-        Rect src = new Rect(0, 50, 20, 70);  // src (left, top, right, bottom)
-
-        Rect directlyAbove = new Rect(src);
-        directlyAbove.offset(0, -(1 + src.height()));
-
-        Rect aboveLeft = new Rect(src);
-        aboveLeft.offset(-(1 + src.width()), -(1 + src.height()));
-
-        // offset directly above a little further up
-        directlyAbove.offset(0, -5);
-        assertBetterCandidate(View.FOCUS_UP, src, directlyAbove, aboveLeft);
-    }
-
-    @SmallTest
-    public void testOutOfBeamBeatsInBeamUp() {
-
-        Rect src = new Rect(0, 0, 50, 50); // (left, top, right, bottom)
-
-        Rect aboveLeftOfBeam = new Rect(src);
-        aboveLeftOfBeam.offset(-(src.width() + 1), -src.height());
-        assertBeamsDontOverlap(View.FOCUS_UP, src, aboveLeftOfBeam);
-
-        Rect aboveInBeam = new Rect(src);
-        aboveInBeam.offset(0, -src.height());
-        assertBeamsOverlap(View.FOCUS_UP, src, aboveInBeam);
-
-        // in beam wins
-        assertBetterCandidate(View.FOCUS_UP, src, aboveInBeam, aboveLeftOfBeam);
-
-        // still wins while aboveInBeam's bottom edge is < out of beams' top
-        aboveInBeam.offset(0, -(aboveLeftOfBeam.height() - 1));
-        assertTrue("aboveInBeam.bottom > aboveLeftOfBeam.top", aboveInBeam.bottom > aboveLeftOfBeam.top);
-        assertBetterCandidate(View.FOCUS_UP, src, aboveInBeam, aboveLeftOfBeam);
-
-        // cross the threshold: the out of beam prevails
-        aboveInBeam.offset(0, -1);
-        assertEquals(aboveInBeam.bottom, aboveLeftOfBeam.top);
-        assertBetterCandidate(View.FOCUS_UP, src, aboveLeftOfBeam, aboveInBeam);
-    }
-
-    /**
-     * A non-candidate (even a much closer one) is always a worse choice
-     * than a real candidate.
-     */
-    @SmallTest
-    public void testSomeCandidateBetterThanNonCandidate() {
-        Rect src = new Rect(0, 0, 50, 50); // (left, top, right, bottom)
-
-        Rect nonCandidate = new Rect(src);
-        nonCandidate.offset(src.width() + 1, 0);
-
-        assertIsNotCandidate(View.FOCUS_LEFT, src, nonCandidate);
-
-        Rect candidate = new Rect(src);
-        candidate.offset(-(4 * src.width()), 0);
-        assertDirectionIsCandidate(View.FOCUS_LEFT, src, candidate);
-
-        assertBetterCandidate(View.FOCUS_LEFT, src, candidate, nonCandidate);
-    }
-
-    /**
-     * Grabbed from {@link android.widget.focus.VerticalFocusSearchTest#testSearchFromMidLeft()}
-     */
-    @SmallTest
-    public void testVerticalFocusSearchScenario() {
-        assertBetterCandidate(View.FOCUS_DOWN,
-                //       L    T    R    B
-                new Rect(0,   109, 153, 169),   // src
-                new Rect(166, 169, 319, 229),  // expectedbetter
-                new Rect(0,   229, 320, 289)); // expectedworse
-
-        // failing test 4/10/2008, the values were tweaked somehow in functional
-        // test...
-        assertBetterCandidate(View.FOCUS_DOWN,
-                //       L    T    R    B
-                new Rect(0,   91, 153, 133),   // src
-                new Rect(166, 133, 319, 175),  // expectedbetter
-                new Rect(0,   175, 320, 217)); // expectedworse
-
-    }
-
-    /**
-     * Example: going down from a thin button all the way to the left of a
-     * screen where, just below, is a very wide button, and just below that,
-     * is an equally skinny button all the way to the left.  want to make
-     * sure any minor axis factor doesn't override the fact that the one below
-     * in vertical beam should be next focus
-     */
-    @SmallTest
-    public void testBeamsOverlapMajorAxisCloserMinorAxisFurther() {
-        assertBetterCandidate(View.FOCUS_DOWN,
-                //       L   T    R    B
-                new Rect(0,  0,   100,  100),  // src
-                new Rect(0,  100, 480,  200),  // expectedbetter
-                new Rect(0,  200, 100,  300)); // expectedworse
-    }
-
-    /**
-     * Real scenario grabbed from song playback screen.
-     */
-    @SmallTest
-    public void testMusicPlaybackScenario() {
-        assertBetterCandidate(View.FOCUS_LEFT,
-                //       L    T    R    B
-                new Rect(227, 185, 312, 231),   // src
-                new Rect(195, 386, 266, 438),   // expectedbetter
-                new Rect(124, 386, 195, 438));  // expectedworse
-    }
-
-    /**
-     * more generalized version of {@link #testMusicPlaybackScenario()}
-     */
-    @SmallTest
-    public void testOutOfBeamOverlapBeatsOutOfBeamFurtherOnMajorAxis() {
-        assertBetterCandidate(View.FOCUS_DOWN,
-                //       L    T    R    B
-                new Rect(0,   0,   50,  50),   // src
-                new Rect(60,  40,  110, 90),   // expectedbetter
-                new Rect(60,  70,  110, 120));  // expectedworse
-    }
-
-    /**
-     * Make sure that going down prefers views that are actually
-     * down (and not those next to but still a candidate because
-     * they are overlapping on the major axis)
-     */
-    @SmallTest
-    public void testInBeamTrumpsOutOfBeamOverlapping() {
-        assertBetterCandidate(View.FOCUS_DOWN,
-                //       L    T    R    B
-                new Rect(0,   0,   50,  50),   // src
-                new Rect(0,   60,  50,  110),  // expectedbetter
-                new Rect(51,  1,   101, 51)); // expectedworse
-    }
-
-    @SmallTest
-    public void testOverlappingBeatsNonOverlapping() {
-        assertBetterCandidate(View.FOCUS_DOWN,
-                //       L    T    R    B
-                new Rect(0,   0,   50,  50),   // src
-                new Rect(0,   40,  50,  90),   // expectedbetter
-                new Rect(0,   75,  50,  125)); // expectedworse
-    }
-
-    @SmallTest
-    public void testEditContactScenarioLeftFromDiscardChangesGoesToSaveContactInLandscape() {
-        assertBetterCandidate(View.FOCUS_LEFT,
-                //       L    T    R    B
-                new Rect(357, 258, 478, 318),  // src
-                new Rect(2,   258, 100, 318),  // better
-                new Rect(106, 120, 424, 184)); // worse
-    }
-
-    /**
-     * A dial pad with 9 squares arranged in a grid.  no padding, so
-     * the edges are equal.  see {@link android.widget.focus.LinearLayoutGrid}
-     */
-    @SmallTest
-    public void testGridWithTouchingEdges() {
-        assertBetterCandidate(View.FOCUS_DOWN,
-                //       L    T    R    B
-                new Rect(106, 49,  212, 192),  // src
-                new Rect(106, 192, 212, 335),  // better
-                new Rect(0,   192, 106, 335)); // worse
-
-        assertBetterCandidate(View.FOCUS_DOWN,
-                //       L    T    R    B
-                new Rect(106, 49,  212, 192),  // src
-                new Rect(106, 192, 212, 335),  // better
-                new Rect(212, 192, 318, 335)); // worse
-    }
-
-    @SmallTest
-    public void testSearchFromEmptyRect() {
-        assertBetterCandidate(View.FOCUS_DOWN,
-                //       L   T    R    B
-                new Rect(0,  0,   0,   0),    // src
-                new Rect(0,  0,   320, 45),   // better
-                new Rect(0,  45,  320, 545)); // worse
-    }
-
-    /**
-     * Reproduce bug 1124559, drilling down to actual bug
-     * (majorAxisDistance was wrong for direction left)
-     */
-    @SmallTest
-    public void testGmailReplyButtonsScenario() {
-        assertBetterCandidate(View.FOCUS_LEFT,
-                //       L    T    R    B
-                new Rect(223, 380, 312, 417),  // src
-                new Rect(102, 380, 210, 417),  // better
-                new Rect(111, 443, 206, 480)); // worse
-
-        assertBeamBeats(View.FOCUS_LEFT,
-            //       L    T    R    B
-            new Rect(223, 380, 312, 417),  // src
-            new Rect(102, 380, 210, 417),  // better
-            new Rect(111, 443, 206, 480)); // worse
-
-        assertBeamsOverlap(View.FOCUS_LEFT,
-                //       L    T    R    B
-                new Rect(223, 380, 312, 417),
-                new Rect(102, 380, 210, 417));
-
-        assertBeamsDontOverlap(View.FOCUS_LEFT,
-                //       L    T    R    B
-                new Rect(223, 380, 312, 417),
-                new Rect(111, 443, 206, 480));
-
-        assertTrue(
-                "major axis distance less than major axis distance to "
-                        + "far edge",
-                FocusFinderHelper.majorAxisDistance(View.FOCUS_LEFT,
-                        //       L    T    R    B
-                        new Rect(223, 380, 312, 417),
-                        new Rect(102, 380, 210, 417)) <
-                FocusFinderHelper.majorAxisDistanceToFarEdge(View.FOCUS_LEFT,
-                        //       L    T    R    B
-                        new Rect(223, 380, 312, 417),
-                        new Rect(111, 443, 206, 480)));
-    }
-
-    @SmallTest
-    public void testGmailScenarioBug1203288() {
-        assertBetterCandidate(View.FOCUS_DOWN,
-                //       L    T    R    B
-                new Rect(0,   2,   480, 82),   // src
-                new Rect(344, 87,  475, 124),  // better
-                new Rect(0,   130, 480, 203)); // worse
-    }
-
-    @SmallTest
-    public void testHomeShortcutScenarioBug1295354() {
-        assertBetterCandidate(View.FOCUS_RIGHT,
-                //       L    T    R    B
-                new Rect(3, 338, 77, 413),   // src
-                new Rect(163, 338, 237, 413),  // better
-                new Rect(83, 38, 157, 113)); // worse
-    }
-
-    @SmallTest
-    public void testBeamAlwaysBeatsHoriz() {
-        assertBetterCandidate(View.FOCUS_RIGHT,
-                //       L    T    R    B
-                new Rect(0,   0,   50,  50),   // src
-                new Rect(150, 0,   200, 50),   // better, (way further, but in beam)
-                new Rect(60,  51,  110, 101)); // worse, even though it is closer
-
-        assertBetterCandidate(View.FOCUS_LEFT,
-                //       L    T    R    B
-                new Rect(150, 0,   200,  50),   // src
-                new Rect(0,   50,  50,   50),   // better, (way further, but in beam)
-                new Rect(49,  99,  149,  101)); // worse, even though it is closer
-    }
-
-    @SmallTest
-    public void testIsCandidateOverlappingEdgeFromEmptyRect() {
-        assertDirectionIsCandidate(View.FOCUS_DOWN,
-                //       L   T    R    B
-                new Rect(0,  0,   0,   0),   // src
-                new Rect(0,  0,   20,  1));  // candidate
-
-        assertDirectionIsCandidate(View.FOCUS_UP,
-                //       L   T    R    B
-                new Rect(0,  0,   0,   0),   // src
-                new Rect(0,  -1,  20,  0));  // candidate
-
-        assertDirectionIsCandidate(View.FOCUS_LEFT,
-                //       L   T    R    B
-                new Rect(0,  0,   0,   0),    // src
-                new Rect(-1,  0,  0,   20));  // candidate
-
-        assertDirectionIsCandidate(View.FOCUS_RIGHT,
-                //       L   T    R    B
-                new Rect(0,  0,   0,   0),    // src
-                new Rect(0,  0,   1,   20));  // candidate
-    }
-
-    private void assertBeamsOverlap(int direction, Rect rect1, Rect rect2) {
-        String directionStr = validateAndGetStringFor(direction);
-        String assertMsg = String.format("Expected beams to overlap in direction %s "
-                + "for rectangles %s and %s", directionStr, rect1, rect2);
-        assertTrue(assertMsg, mFocusFinder.beamsOverlap(direction, rect1, rect2));
-    }
-
-    private void assertBeamsDontOverlap(int direction, Rect rect1, Rect rect2) {
-        String directionStr = validateAndGetStringFor(direction);
-        String assertMsg = String.format("Expected beams not to overlap in direction %s "
-                + "for rectangles %s and %s", directionStr, rect1, rect2);
-        assertFalse(assertMsg, mFocusFinder.beamsOverlap(direction, rect1, rect2));
-    }
-
-    /**
-     * Assert that particular rect is a better focus search candidate from a
-     * source rect than another.
-     * @param direction The direction of focus search.
-     * @param srcRect The src rectangle.
-     * @param expectedBetter The candidate that should be better.
-     * @param expectedWorse The candidate that should be worse.
-     */
-    private void assertBetterCandidate(int direction, Rect srcRect,
-            Rect expectedBetter, Rect expectedWorse) {
-
-        String directionStr = validateAndGetStringFor(direction);
-        String assertMsg = String.format(
-                "expected %s to be a better focus search candidate than "
-                        + "%s when searching "
-                        + "from %s in direction %s",
-                expectedBetter, expectedWorse, srcRect, directionStr);
-
-        assertTrue(assertMsg,
-                mFocusFinder.isBetterCandidate(direction, srcRect,
-                        expectedBetter, expectedWorse));
-
-        assertMsg = String.format(
-                "expected %s to not be a better focus search candidate than "
-                        + "%s when searching "
-                        + "from %s in direction %s",
-                expectedWorse, expectedBetter, srcRect, directionStr);
-
-        assertFalse(assertMsg,
-                mFocusFinder.isBetterCandidate(direction, srcRect,
-                        expectedWorse, expectedBetter));
-    }
-
-    private void assertIsNotCandidate(int direction, Rect src, Rect dest) {
-        String directionStr = validateAndGetStringFor(direction);
-
-        final String assertMsg = String.format(
-                "expected going from %s to %s in direction %s to be an invalid "
-                        + "focus search candidate",
-                src, dest, directionStr);
-        assertFalse(assertMsg, mFocusFinder.isCandidate(src, dest, direction));
-    }
-
-    private void assertBeamBeats(int direction, Rect srcRect,
-            Rect rect1, Rect rect2) {
-
-        String directionStr = validateAndGetStringFor(direction);
-        String assertMsg = String.format(
-                "expecting %s to beam beat %s w.r.t %s in direction %s",
-                rect1, rect2, srcRect, directionStr);
-        assertTrue(assertMsg, mFocusFinder.beamBeats(direction, srcRect, rect1, rect2));
-    }
-
-
-    private void assertDirectionIsCandidate(int direction, Rect src, Rect dest) {
-        String directionStr = validateAndGetStringFor(direction);
-
-        final String assertMsg = String.format(
-                "expected going from %s to %s in direction %s to be a valid "
-                        + "focus search candidate",
-                src, dest, directionStr);
-        assertTrue(assertMsg, mFocusFinder.isCandidate(src, dest, direction));
-    }
-
-    private String validateAndGetStringFor(int direction) {
-        String directionStr = "??";
-        switch(direction) {
-            case View.FOCUS_UP:
-                directionStr = "FOCUS_UP";
-                break;
-            case View.FOCUS_DOWN:
-                directionStr = "FOCUS_DOWN";
-                break;
-            case View.FOCUS_LEFT:
-                directionStr = "FOCUS_LEFT";
-                break;
-            case View.FOCUS_RIGHT:
-                directionStr = "FOCUS_RIGHT";
-                break;
-            default:
-                fail("passed in unknown direction, ya blewit!");
-        }
-        return directionStr;
-    }
-
-
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/GlobalFocusChange.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/GlobalFocusChange.java
deleted file mode 100755
index 224254162539d8af6b4a096ddeda6ef47588499a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/GlobalFocusChange.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.ViewTreeObserver;
-import android.view.View;
-
-public class GlobalFocusChange extends Activity implements ViewTreeObserver.OnGlobalFocusChangeListener {
-    public View mOldFocus;
-    public View mNewFocus;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.focus_listener);
-        findViewById(R.id.left).getViewTreeObserver().addOnGlobalFocusChangeListener(this);
-    }
-
-    public void reset() {
-        mOldFocus = mNewFocus = null;
-    }
-
-    public void onGlobalFocusChanged(View oldFocus, View newFocus) {
-        mOldFocus = oldFocus;
-        mNewFocus = newFocus;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/GlobalFocusChangeTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/GlobalFocusChangeTest.java
deleted file mode 100755
index b53709fdb4d916bdfe561c73fad95dd187570fd4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/GlobalFocusChangeTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.FlakyTest;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.TouchUtils;
-import android.view.View;
-import android.view.KeyEvent;
-
-public class GlobalFocusChangeTest extends ActivityInstrumentationTestCase<GlobalFocusChange> {
-    private GlobalFocusChange mActivity;
-    private View mLeft;
-    private View mRight;
-
-    public GlobalFocusChangeTest() {
-        super("com.mediatek.common.view.tests", GlobalFocusChange.class);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        mLeft = mActivity.findViewById(R.id.left);
-        mRight = mActivity.findViewById(R.id.right);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mActivity.reset();
-        super.tearDown();
-    }
-
-    @FlakyTest(tolerance = 4)
-    @LargeTest
-    public void testFocusChange() throws Exception {
-        sendKeys(KeyEvent.KEYCODE_DPAD_RIGHT);
-
-        assertFalse(mLeft.isFocused());
-        assertTrue(mRight.isFocused());
-
-        assertSame(mLeft, mActivity.mOldFocus);
-        assertSame(mRight, mActivity.mNewFocus);
-    }
-
-    @FlakyTest(tolerance = 4)
-    @MediumTest
-    public void testEnterTouchMode() throws Exception {
-        assertTrue(mLeft.isFocused());
-
-        TouchUtils.tapView(this, mLeft);
-
-        assertSame(mLeft, mActivity.mOldFocus);
-        assertSame(null, mActivity.mNewFocus);
-    }
-
-    @FlakyTest(tolerance = 4)
-    @MediumTest
-    public void testLeaveTouchMode() throws Exception {
-        assertTrue(mLeft.isFocused());
-
-        TouchUtils.tapView(this, mLeft);
-        sendKeys(KeyEvent.KEYCODE_DPAD_RIGHT);
-
-        assertTrue(mLeft.isFocused());
-
-        assertSame(null, mActivity.mOldFocus);
-        assertSame(mLeft, mActivity.mNewFocus);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/Include.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/Include.java
deleted file mode 100755
index 29ed141d1fbb372c26657dd55cb5ea695baf4362..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/Include.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.os.Bundle;
-import android.app.Activity;
-
-/**
- * Exercise <include /> tag in XML files.
- */
-public class Include extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.include_tag);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/IncludeTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/IncludeTest.java
deleted file mode 100755
index 614ac1bb006e4b34b4c7a56ca1731faf1aa44512..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/IncludeTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.View;
-
-public class IncludeTest extends ActivityInstrumentationTestCase<Include> {
-    public IncludeTest() {
-        super("com.mediatek.common.view.tests", Include.class);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-    }
-
-    @MediumTest
-    public void testIncluded() throws Exception {
-        final Include activity = getActivity();
-
-        final View button1 = activity.findViewById(R.id.included_button);
-        assertNotNull("The layout include_button was not included", button1);
-
-        final View button2 = activity.findViewById(R.id.included_button_overriden);
-        assertNotNull("The layout include_button was not included with overriden id", button2);
-    }
-
-    @MediumTest
-    public void testIncludedWithLayoutParams() throws Exception {
-        final Include activity = getActivity();
-
-        final View button1 = activity.findViewById(R.id.included_button);
-        final View button2 = activity.findViewById(R.id.included_button_overriden);
-
-        assertTrue("Both buttons should have different width",
-                button1.getLayoutParams().width != button2.getLayoutParams().width);
-        assertTrue("Both buttons should have different height",
-                button1.getLayoutParams().height != button2.getLayoutParams().height);
-    }
-
-    @MediumTest
-    public void testIncludedWithVisibility() throws Exception {
-        final Include activity = getActivity();
-        final View button1 = activity.findViewById(R.id.included_button_visibility);
-
-        assertEquals("Included button should be invisible", View.INVISIBLE, button1.getVisibility());
-    }
-
-    // TODO: needs to be adjusted to pass on non-HVGA displays
-    /* Test Case Fail
-    // @MediumTest
-    public void testIncludedWithSize() throws Exception {
-        final Include activity = getActivity();
-        final View button1 = activity.findViewById(R.id.included_button_with_size);
-
-        final ViewGroup.LayoutParams lp = button1.getLayoutParams();
-        assertEquals("Included button should be 23dip x 23dip", 23, lp.width);
-        assertEquals("Included button should be 23dip x 23dip", 23, lp.height);
-    }
-    */
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/InflateTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/InflateTest.java
deleted file mode 100755
index 20745016314eb18ae8e3e8a25d44cde8a9cfefe5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/InflateTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.test.AndroidTestCase;
-import android.test.PerformanceTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-
-
-public class InflateTest extends AndroidTestCase implements PerformanceTestCase {
-    private LayoutInflater mInflater;
-    private Resources mResources;
-    private View mView;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mInflater = LayoutInflater.from(mContext);
-        mResources = mContext.getResources();
-
-        // to try to make things consistent, before doing timing
-        // do an initial instantiation of the layout and then clear
-        // out the layout cache.
-//            mInflater.inflate(mResId, null, null);
-//            mResources.flushLayoutCache();
-    }
-
-    public int startPerformance(PerformanceTestCase.Intermediates intermediates) {
-        return 0;
-    }
-
-    public boolean isPerformanceOnly() {
-        return false;
-    }
-
-    public void inflateTest(int resourceId) {
-        mView = mInflater.inflate(resourceId, null);
-        mResources.flushLayoutCache();
-    }
-
-    public void inflateCachedTest(int resourceId) {
-        // Make sure this layout is in the cache.
-        mInflater.inflate(resourceId, null);
-
-        mInflater.inflate(resourceId, null);
-    }
-
-    @SmallTest
-    public void testLayout1() throws Exception {
-        inflateTest(R.layout.layout_one);
-    }
-
-    @SmallTest
-    public void testLayout2() throws Exception {
-        inflateTest(R.layout.layout_two);
-    }
-
-    @SmallTest
-    public void testLayout3() throws Exception {
-        inflateTest(R.layout.layout_three);
-    }
-
-    @SmallTest
-    public void testLayout4() throws Exception {
-        inflateTest(R.layout.layout_four);
-    }
-
-    @SmallTest
-    public void testLayout5() throws Exception {
-        inflateTest(R.layout.layout_five);
-    }
-
-    @SmallTest
-    public void testLayout6() throws Exception {
-        inflateTest(R.layout.layout_six);
-    }
-
-    @SmallTest
-    public void testCachedLayout1() throws Exception {
-        inflateCachedTest(R.layout.layout_one);
-    }
-
-    @SmallTest
-    public void testCachedLayout2() throws Exception {
-        inflateCachedTest(R.layout.layout_two);
-    }
-
-    @SmallTest
-    public void testCachedLayout3() throws Exception {
-        inflateCachedTest(R.layout.layout_three);
-    }
-
-    @SmallTest
-    public void testCachedLayout4() throws Exception {
-        inflateCachedTest(R.layout.layout_four);
-    }
-
-    @SmallTest
-    public void testCachedLayout5() throws Exception {
-        inflateCachedTest(R.layout.layout_five);
-    }
-
-    @SmallTest
-    public void testCachedLayout6() throws Exception {
-        inflateCachedTest(R.layout.layout_six);
-    }
-
-//    public void testLayoutTag() throws Exception {
-//        public void setUp
-//        (Context
-//        context){
-//        setUp(context, R.layout.layout_tag);
-//    }
-//        public void run
-//        ()
-//        {
-//            super.run();
-//            if (!"MyTag".equals(mView.getTag())) {
-//                throw new RuntimeException("Incorrect tag: " + mView.getTag());
-//            }
-//        }
-//    }
-
-    public static class ViewOne extends View {
-        public ViewOne(Context context) {
-            super(context);
-        }
-
-        public ViewOne(Context context, AttributeSet attrs) {
-            super(context, attrs);
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ListContextMenu.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ListContextMenu.java
deleted file mode 100755
index 4d6528587fd59936e2a6b155bcd3cea97b011278..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ListContextMenu.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.app.ListActivity;
-import android.content.Context;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.ContextMenu;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.SubMenu;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.LayoutInflater;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-/**
- * Exercises context menus in lists
- */
-public class ListContextMenu extends ListActivity implements View.OnCreateContextMenuListener
-{
-    static final String TAG = "ListContextMenu";
-
-    ThrashListAdapter mAdapter;
-
-    private class ThrashListAdapter extends BaseAdapter {
-        private LayoutInflater mInflater;
-
-        private String[] mTitles = new String[100];
-
-        public ThrashListAdapter(Context context) {
-            mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            mTitles = new String[100];
-
-            int i;
-            for (i = 0; i < 100; i++) {
-                mTitles[i] = "[" + i + "]";
-            }
-        }
-
-        public int getCount() {
-            return mTitles.length;
-        }
-
-        public Object getItem(int position) {
-            return position;
-        }
-
-        public long getItemId(int position) {
-            return position;
-        }
-
-        public View getView(int position, View convertView, ViewGroup parent) {
-            TextView view;
-
-            if (convertView == null) {
-                view = (TextView) mInflater.inflate(android.R.layout.simple_list_item_1, null);
-            } else {
-                view = (TextView) convertView;
-            }
-            view.setText("List item " + mTitles[position]);
-            return view;
-        }
-
-    }
-
-    @Override
-    public void onCreate(Bundle icicle)
-    {
-        super.onCreate(icicle);
-
-        mAdapter = new ThrashListAdapter(this);
-        getListView().setOnCreateContextMenuListener(this);
-        setListAdapter(mAdapter);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuItem item = menu.add(0, 0, 0, "Really long menu item name");
-        item.setTitleCondensed("Long name");
-        item.setIcon(R.drawable.black_square);
-
-        SubMenu sm = menu.addSubMenu(0, 0, 0, "The 2nd item, a sub menu").setIcon(R.drawable.black_square_stretchable);
-        item = sm.getItem();
-        item.setTitleCondensed("Sub menu");
-        sm.add(1, 0, 0, "Subitem 1");
-        sm.add(1, 0, 0, "Subitem 2");
-        sm.add(1, 0, 0, "Subitem 3");
-        sm.setGroupCheckable(1, true, true);
-        menu.add(0, 0, 0, "Item 3");
-        menu.add(0, 0, 0, "Item 4");
-        menu.add(0, 0, 0, "Item 5");
-        menu.add(0, 0, 0, "Item 6");
-        menu.add(0, 0, 0, "Item 7");
-        menu.add(0, 0, 0, "Item 8");
-        menu.add(0, 0, 0, "Item 9");
-        sm = menu.addSubMenu(0, 0, 0, "Item 10 SM");
-        sm.add(0, 0, 0, "Subitem 1");
-        sm.add(0, 0, 0, "Subitem 2");
-        sm.add(0, 0, 0, "Subitem 3");
-        sm.add(0, 0, 0, "Subitem 4");
-        sm.add(0, 0, 0, "Subitem 5");
-        sm.add(0, 0, 0, "Subitem 6");
-        sm.add(0, 0, 0, "Subitem 7");
-        sm.add(0, 0, 0, "Subitem 8");
-
-        return true;
-    }
-
-    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-
-        AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuInfo;
-
-        String text = ((TextView) info.targetView).getText().toString();
-        if (text.contains("[0]")) {
-            menu.setHeaderTitle("This is a test of the title and the icon").setHeaderIcon(
-                    android.R.drawable.sym_def_app_icon);
-        } else if (text.contains("[1]")) {
-            menu.setHeaderTitle("This is a test of just the title");
-        } else {
-            TextView textView = new TextView(this);
-            textView.setText("This is a test of a custom View");
-            menu.setHeaderView(textView);
-        }
-
-        menu.add(0, 0, 0, "Test 1");
-        SubMenu sm = menu.addSubMenu(0, 0, 0, "Test 1.5 SM");
-        sm.add(0, 0, 0, "CM Subitem 1");
-        sm.add(0, 0, 0, "CM Subitem 2");
-        sm.add(0, 0, 0, "CM Subitem 3");
-        menu.add(0, 0, 0, "Test 2");
-        menu.add(0, 0, 0, "Test 3");
-        menu.add(0, 0, 0, "Test 4");
-        menu.add(0, 0, 0, "Test 5");
-        menu.add(0, 0, 0, "Test 6");
-        menu.add(0, 0, 0, "Test 7");
-        menu.add(0, 0, 0, "Test 8");
-        menu.add(0, 0, 0, "Test 9");
-        menu.add(0, 0, 0, "Test 10");
-        menu.add(0, 0, 0, "Test 11");
-        menu.add(0, 0, 0, "Test 12");
-        menu.add(0, 0, 0, "Test 13");
-        menu.add(0, 0, 0, "Test 14");
-        menu.add(0, 0, 0, "Test 15");
-        menu.add(0, 0, 0, "Test 16");
-        menu.add(0, 0, 0, "Test 17");
-        menu.add(0, 0, 0, "Test 18");
-        menu.add(0, 0, 0, "Test 19");
-        menu.add(0, 0, 0, "Test 20");
-        menu.add(0, 0, 0, "Test 21");
-        menu.add(0, 0, 0, "Test 22");
-        menu.add(0, 0, 0, "Test 23");
-        menu.add(0, 0, 0, "Test 24");
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        Log.i(TAG, "Options item " + item.toString() + " selected.");
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public void onOptionsMenuClosed(Menu menu) {
-        Log.i(TAG, "Options menu closed");
-    }
-
-    @Override
-    public boolean onContextItemSelected(MenuItem item) {
-        Log.i(TAG, "Context item " + item.toString() + " selected.");
-
-        return super.onContextItemSelected(item);
-    }
-
-    @Override
-    public void onContextMenuClosed(Menu menu) {
-        Log.i(TAG, "Context menu closed");
-    }
-
-
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/Longpress.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/Longpress.java
deleted file mode 100755
index 626726997c3f44c383d9bd461ce7ba282d34b246..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/Longpress.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class Longpress extends Activity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.longpress);
-    }
-}
-
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/LongpressTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/LongpressTest.java
deleted file mode 100755
index 7c114309c523b46d3e6f2088c12cc219d52f2eb5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/LongpressTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import com.mediatek.common.view.tests.util.KeyUtils;
-import android.test.TouchUtils;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.view.View;
-import android.view.View.OnLongClickListener;
-
-/**
- * Exercises {@link android.view.View}'s longpress plumbing.
- */
-public class LongpressTest extends ActivityInstrumentationTestCase<Longpress> {
-    private View mSimpleView;
-    private boolean mLongClicked;
-
-    public LongpressTest() {
-        super("com.mediatek.common.view.tests", Longpress.class);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-
-        final Longpress a = getActivity();
-        mSimpleView = a.findViewById(R.id.simple_view);
-        mSimpleView.setOnLongClickListener(new OnLongClickListener() {
-            public boolean onLongClick(View v) {
-                mLongClicked = true;
-                return true;
-            }
-        });
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-
-        mLongClicked = false;
-    }
-
-    @MediumTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mSimpleView);
-        assertTrue(mSimpleView.hasFocus());
-        assertFalse(mLongClicked);
-    }
-
-    @LargeTest
-    public void testKeypadLongClick() throws Exception {
-        mSimpleView.requestFocus();
-        getInstrumentation().waitForIdleSync();
-        KeyUtils.longClick(this);
-
-        getInstrumentation().waitForIdleSync();
-        assertTrue(mLongClicked);
-    }
-
-    @LargeTest
-    public void testTouchLongClick() throws Exception {
-        TouchUtils.longClickView(this, mSimpleView);
-        getInstrumentation().waitForIdleSync();
-        assertTrue(mLongClicked);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/MenuTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/MenuTest.java
deleted file mode 100755
index 03aaefbf15507981ca710bb85525f82aa5e2593c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/MenuTest.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import com.android.internal.view.menu.MenuBuilder;
-
-import junit.framework.Assert;
-
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.SubMenu;
-
-public class MenuTest extends AndroidTestCase {
-
-    private MenuBuilder mMenu;
-
-    public void setUp() throws Exception {
-        super.setUp();
-        mMenu = new MenuBuilder(super.getContext());
-    }
-
-    @SmallTest
-    public void testItemId() {
-        final int id = 512;
-        final MenuItem item = mMenu.add(0, id, 0, "test");
-
-        Assert.assertEquals(id, item.getItemId());
-        Assert.assertEquals(item, mMenu.findItem(id));
-        Assert.assertEquals(0, mMenu.findItemIndex(id));
-    }
-
-    @SmallTest
-    public void testGroupId() {
-        final int groupId = 541;
-        final int item1Index = 1;
-        final int item2Index = 3;
-
-        mMenu.add(0, 0, item1Index - 1, "ignore");
-        final MenuItem item = mMenu.add(groupId, 0, item1Index, "test");
-        mMenu.add(0, 0, item2Index - 1, "ignore");
-        final MenuItem item2 = mMenu.add(groupId, 0, item2Index, "test2");
-
-        Assert.assertEquals(groupId, item.getGroupId());
-        Assert.assertEquals(groupId, item2.getGroupId());
-        Assert.assertEquals(item1Index, mMenu.findGroupIndex(groupId));
-        Assert.assertEquals(item2Index, mMenu.findGroupIndex(groupId, item1Index + 1));
-    }
-
-    @SmallTest
-    public void testGroup() {
-        // This test does the following
-        //  1. Create a grouped item in the menu
-        //  2. Check that findGroupIndex() finds the grouped item.
-        //  3. Check that findGroupIndex() doesn't find a non-existent group.
-
-        final int GROUP_ONE = Menu.FIRST;
-        final int GROUP_TWO = Menu.FIRST + 1;
-
-        mMenu.add(GROUP_ONE, 0, 0, "Menu text");
-        Assert.assertEquals(mMenu.findGroupIndex(GROUP_ONE), 0);
-        Assert.assertEquals(mMenu.findGroupIndex(GROUP_TWO), -1);
-        //TODO: expand this test case to do multiple groups,
-        //adding and removing, hiding and showing, etc.
-    }
-
-    @SmallTest
-    public void testIsShortcutWithAlpha() throws Exception {
-        mMenu.setQwertyMode(true);
-        mMenu.add(0, 0, 0, "test").setShortcut('2', 'a');
-        Assert.assertTrue(mMenu.isShortcutKey(KeyEvent.KEYCODE_A,
-                                              makeKeyEvent(KeyEvent.KEYCODE_A,  0)));
-        Assert.assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_B,
-                                               makeKeyEvent(KeyEvent.KEYCODE_B,  0)));
-    }
-
-    @SmallTest
-    public void testIsShortcutWithNumeric() throws Exception {
-        mMenu.setQwertyMode(false);
-        mMenu.add(0, 0, 0, "test").setShortcut('2', 'a');
-        Assert.assertTrue(mMenu.isShortcutKey(KeyEvent.KEYCODE_2,
-                                              makeKeyEvent(KeyEvent.KEYCODE_2,  0)));
-        Assert.assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_A,
-                                               makeKeyEvent(KeyEvent.KEYCODE_A,  0)));
-    }
-
-    @SmallTest
-    public void testIsShortcutWithAlt() throws Exception {
-        mMenu.setQwertyMode(true);
-        mMenu.add(0, 0, 0, "test").setShortcut('2', 'a');
-        Assert.assertTrue(mMenu.isShortcutKey(KeyEvent.KEYCODE_A,
-                                              makeKeyEvent(KeyEvent.KEYCODE_A,
-                                                           KeyEvent.META_ALT_ON)));
-        Assert.assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_A,
-                                              makeKeyEvent(KeyEvent.KEYCODE_A,
-                                                           KeyEvent.META_SYM_ON)));
-    }
-
-    @SmallTest
-    public void testIsNotShortcutWithShift() throws Exception {
-        mMenu.setQwertyMode(true);
-        mMenu.add(0, 0, 0, "test").setShortcut('2', 'a');
-        Assert.assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_A,
-                                              makeKeyEvent(KeyEvent.KEYCODE_A,
-                                                           KeyEvent.META_SHIFT_ON)));
-    }
-
-    @SmallTest
-    public void testIsNotShortcutWithSym() throws Exception {
-        mMenu.setQwertyMode(true);
-        mMenu.add(0, 0, 0, "test").setShortcut('2', 'a');
-        Assert.assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_A,
-                                              makeKeyEvent(KeyEvent.KEYCODE_A,
-                                                           KeyEvent.META_SYM_ON)));
-    }
-
-    @SmallTest
-    public void testIsShortcutWithUpperCaseAlpha() throws Exception {
-        mMenu.setQwertyMode(true);
-        mMenu.add(0, 0, 0, "test").setShortcut('2', 'A');
-        Assert.assertTrue(mMenu.isShortcutKey(KeyEvent.KEYCODE_A,
-                                              makeKeyEvent(KeyEvent.KEYCODE_A,  0)));
-    }
-
-    @SmallTest
-    public void testIsShortcutWithBackspace() throws Exception {
-        mMenu.setQwertyMode(true);
-        mMenu.add(0, 0, 0, "test").setShortcut('2', '\b');
-        Assert.assertTrue(mMenu.isShortcutKey(KeyEvent.KEYCODE_DEL,
-                                              makeKeyEvent(KeyEvent.KEYCODE_DEL,  0)));
-    }
-
-    @SmallTest
-    public void testIsShortcutWithNewline() throws Exception {
-        mMenu.setQwertyMode(true);
-        mMenu.add(0, 0, 0, "test").setShortcut('2', '\n');
-        Assert.assertTrue(mMenu.isShortcutKey(KeyEvent.KEYCODE_ENTER,
-                                              makeKeyEvent(KeyEvent.KEYCODE_ENTER,  0)));
-    }
-
-    @SmallTest
-    public void testOrder() {
-        final String a = "a", b = "b", c = "c";
-        final int firstOrder = 7, midOrder = 8, lastOrder = 9;
-
-        mMenu.add(0, 0, lastOrder, c);
-        mMenu.add(0, 0, firstOrder, a);
-        mMenu.add(0, 0, midOrder, b);
-
-        Assert.assertEquals(firstOrder, mMenu.getItem(0).getOrder());
-        Assert.assertEquals(a, mMenu.getItem(0).getTitle());
-        Assert.assertEquals(midOrder, mMenu.getItem(1).getOrder());
-        Assert.assertEquals(b, mMenu.getItem(1).getTitle());
-        Assert.assertEquals(lastOrder, mMenu.getItem(2).getOrder());
-        Assert.assertEquals(c, mMenu.getItem(2).getTitle());
-    }
-
-    @SmallTest
-    public void testTitle() {
-        final String title = "test";
-        final MenuItem stringItem = mMenu.add(title);
-        final MenuItem resItem = mMenu.add(R.string.menu_test);
-
-        Assert.assertEquals(title, stringItem.getTitle());
-        Assert.assertEquals(getContext().getResources().getString(R.string.menu_test), resItem
-                .getTitle());
-    }
-
-    @SmallTest
-    public void testCheckable() {
-        final int groupId = 1;
-        final MenuItem item1 = mMenu.add(groupId, 1, 0, "item1");
-        final MenuItem item2 = mMenu.add(groupId, 2, 0, "item2");
-
-        // Set to exclusive
-        mMenu.setGroupCheckable(groupId, true, true);
-        Assert.assertTrue("Item was not set to checkable", item1.isCheckable());
-        item1.setChecked(true);
-        Assert.assertTrue("Item did not get checked", item1.isChecked());
-        Assert.assertFalse("Item was not unchecked due to exclusive checkable", item2.isChecked());
-        mMenu.findItem(2).setChecked(true);
-        Assert.assertTrue("Item did not get checked", item2.isChecked());
-        Assert.assertFalse("Item was not unchecked due to exclusive checkable", item1.isChecked());
-
-        // Multiple non-exlusive checkable items
-        mMenu.setGroupCheckable(groupId, true, false);
-        Assert.assertTrue("Item was not set to checkable", item1.isCheckable());
-        item1.setChecked(false);
-        Assert.assertFalse("Item did not get unchecked", item1.isChecked());
-        item1.setChecked(true);
-        Assert.assertTrue("Item did not get checked", item1.isChecked());
-        mMenu.findItem(2).setChecked(true);
-        Assert.assertTrue("Item did not get checked", item2.isChecked());
-        Assert.assertTrue("Item was unchecked when it shouldnt have been", item1.isChecked());
-    }
-
-    @SmallTest
-    public void testVisibility() {
-        final MenuItem item1 = mMenu.add(0, 1, 0, "item1");
-        final MenuItem item2 = mMenu.add(0, 2, 0, "item2");
-
-        // Should start as visible
-        Assert.assertTrue("Item did not start as visible", item1.isVisible());
-        Assert.assertTrue("Item did not start as visible", item2.isVisible());
-
-        // Hide
-        item1.setVisible(false);
-        Assert.assertFalse("Item did not become invisible", item1.isVisible());
-        mMenu.findItem(2).setVisible(false);
-        Assert.assertFalse("Item did not become invisible", item2.isVisible());
-    }
-
-    @SmallTest
-    public void testSubMenu() {
-        final SubMenu subMenu = mMenu.addSubMenu(0, 0, 0, "submenu");
-        final MenuItem subMenuItem = subMenu.getItem();
-        final MenuItem item1 = subMenu.add(0, 1, 0, "item1");
-        final MenuItem item2 = subMenu.add(0, 2, 0, "item2");
-
-        // findItem should recurse into submenus
-        Assert.assertEquals(item1, mMenu.findItem(1));
-        Assert.assertEquals(item2, mMenu.findItem(2));
-    }
-
-    @SmallTest
-    public void testRemove() {
-        final int groupId = 1;
-        final MenuItem item1 = mMenu.add(groupId, 1, 0, "item1");
-        final MenuItem item2 = mMenu.add(groupId, 2, 0, "item2");
-        final MenuItem item3 = mMenu.add(groupId, 3, 0, "item3");
-        final MenuItem item4 = mMenu.add(groupId, 4, 0, "item4");
-        final MenuItem item5 = mMenu.add(groupId, 5, 0, "item5");
-        final MenuItem item6 = mMenu.add(0, 6, 0, "item6");
-
-        Assert.assertEquals(item1, mMenu.findItem(1));
-        mMenu.removeItemAt(0);
-        Assert.assertNull(mMenu.findItem(1));
-
-        Assert.assertEquals(item2, mMenu.findItem(2));
-        mMenu.removeItem(2);
-        Assert.assertNull(mMenu.findItem(2));
-
-        Assert.assertEquals(item3, mMenu.findItem(3));
-        Assert.assertEquals(item4, mMenu.findItem(4));
-        Assert.assertEquals(item5, mMenu.findItem(5));
-        mMenu.removeGroup(groupId);
-        Assert.assertNull(mMenu.findItem(3));
-        Assert.assertNull(mMenu.findItem(4));
-        Assert.assertNull(mMenu.findItem(5));
-
-        Assert.assertEquals(item6, mMenu.findItem(6));
-        mMenu.clear();
-        Assert.assertNull(mMenu.findItem(6));
-    }
-
-    private KeyEvent makeKeyEvent(int keyCode, int metaState) {
-        return new KeyEvent(0L, 0L, KeyEvent.ACTION_DOWN, keyCode, 0, metaState);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/Merge.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/Merge.java
deleted file mode 100755
index fc3bf4142ab6ffaedc17e14412869ebca559cfd7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/Merge.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.os.Bundle;
-import android.app.Activity;
-import android.widget.LinearLayout;
-import android.view.ViewGroup;
-import android.view.LayoutInflater;
-
-/**
- * Exercise <merge /> tag in XML files.
- */
-public class Merge extends Activity {
-    private LinearLayout mLayout;
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        mLayout = new LinearLayout(this);
-        mLayout.setOrientation(LinearLayout.VERTICAL);
-        LayoutInflater.from(this).inflate(R.layout.merge_tag, mLayout);
-
-        setContentView(mLayout);
-    }
-
-    public ViewGroup getLayout() {
-        return mLayout;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/MergeTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/MergeTest.java
deleted file mode 100755
index 8170a054806576bb205e62515b922e80be95ce82..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/MergeTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.ViewGroup;
-
-public class MergeTest extends ActivityInstrumentationTestCase<Merge> {
-    public MergeTest() {
-        super("com.mediatek.common.view.tests", Merge.class);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-    }
-
-    @MediumTest
-    public void testMerged() throws Exception {
-        final Merge activity = getActivity();
-        final ViewGroup layout = activity.getLayout();
-
-        assertEquals("The layout wasn't merged", 7, layout.getChildCount());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/MutateDrawable.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/MutateDrawable.java
deleted file mode 100755
index b6f9e663b8b4a55725d21e1f83c8f25144f26b36..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/MutateDrawable.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.LinearLayout;
-import android.widget.Button;
-
-public class MutateDrawable extends Activity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        LinearLayout layout = new LinearLayout(this);
-
-        Button ok = new Button(this);
-        ok.setId(R.id.a);
-        ok.setBackgroundDrawable(getResources().getDrawable(
-                R.drawable.sym_now_playing_skip_forward_1));
-
-        Button cancel = new Button(this);
-        cancel.setId(R.id.b);
-        cancel.setBackgroundDrawable(getResources().getDrawable(
-                R.drawable.sym_now_playing_skip_forward_1));
-
-        layout.addView(ok);
-        layout.addView(cancel);
-
-        ok.getBackground().mutate().setAlpha(127);
-
-        setContentView(layout);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/MutateDrawableTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/MutateDrawableTest.java
deleted file mode 100755
index bceb3790d93aa289839ad995d19b824d1f2b3543..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/MutateDrawableTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.View;
-
-public class MutateDrawableTest extends ActivityInstrumentationTestCase2<MutateDrawable> {
-    private View mFirstButton;
-    private View mSecondButton;
-
-    public MutateDrawableTest() {
-        super("com.mediatek.common.view.tests", MutateDrawable.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mFirstButton = getActivity().findViewById(com.mediatek.common.view.tests.R.id.a);
-        mSecondButton = getActivity().findViewById(com.mediatek.common.view.tests.R.id.b);
-    }
-
-    @MediumTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mFirstButton);
-        assertNotNull(mSecondButton);
-        assertNotSame(mFirstButton.getBackground(), mSecondButton.getBackground());
-    }
-
-    @MediumTest
-    public void testDrawableCanMutate() throws Exception {
-        assertNotSame(mFirstButton.getBackground().getConstantState(),
-                mSecondButton.getBackground().getConstantState());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/PopupWindowVisibility.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/PopupWindowVisibility.java
deleted file mode 100755
index 0b512e3f65ad75665b449ff7f508f4e1f458e6e4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/PopupWindowVisibility.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.AutoCompleteTextView;
-import android.widget.Button;
-import android.widget.Spinner;
-
-/**
- * Tests views with popupWindows becoming invisible
- */
-public class PopupWindowVisibility extends Activity implements OnClickListener {
-
-    private View mFrame;
-    private Button mHide;
-    private Button mShow;
-
-
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.popup_window_visibility);
-
-        mFrame = findViewById(R.id.frame);
-
-        mHide = (Button) findViewById(R.id.hide);
-        mHide.setOnClickListener(this);
-
-        mShow = (Button) findViewById(R.id.show);
-        mShow.setOnClickListener(this);
-
-        Spinner spinner = (Spinner) findViewById(R.id.spinner);
-        ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<String>(this,
-                android.R.layout.simple_spinner_item, mStrings);
-        spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        spinner.setAdapter(spinnerAdapter);
-
-        ArrayAdapter<String> autoAdapter = new ArrayAdapter<String>(this,
-                android.R.layout.simple_dropdown_item_1line, COUNTRIES);
-        AutoCompleteTextView textView = (AutoCompleteTextView) findViewById(R.id.auto);
-        textView.setAdapter(autoAdapter);
-    }
-
-
-    public void onClick(View v) {
-        mFrame.setVisibility(v == mHide ? View.INVISIBLE : View.VISIBLE);
-    }
-    private static final String[] mStrings = {
-        "Mercury", "Venus", "Earth", "Mars", "Jupiter", "Saturn", "Uranus", "Neptune"
-        };
-
-    static final String[] COUNTRIES = new String[] {
-        "Afghanistan", "Albania", "Algeria", "American Samoa", "Andorra",
-        "Angola", "Anguilla", "Antarctica", "Antigua and Barbuda", "Argentina",
-        "Armenia", "Aruba", "Australia", "Austria", "Azerbaijan",
-        "Bahrain", "Bangladesh", "Barbados", "Belarus", "Belgium",
-        "Belize", "Benin", "Bermuda", "Bhutan", "Bolivia",
-        "Bosnia and Herzegovina", "Botswana", "Bouvet Island", "Brazil", "British Indian Ocean Territory",
-        "British Virgin Islands", "Brunei", "Bulgaria", "Burkina Faso", "Burundi",
-        "Cote d'Ivoire", "Cambodia", "Cameroon", "Canada", "Cape Verde",
-        "Cayman Islands", "Central African Republic", "Chad", "Chile", "China",
-        "Christmas Island", "Cocos (Keeling) Islands", "Colombia", "Comoros", "Congo",
-        "Cook Islands", "Costa Rica", "Croatia", "Cuba", "Cyprus", "Czech Republic",
-        "Democratic Republic of the Congo", "Denmark", "Djibouti", "Dominica", "Dominican Republic",
-        "East Timor", "Ecuador", "Egypt", "El Salvador", "Equatorial Guinea", "Eritrea",
-        "Estonia", "Ethiopia", "Faeroe Islands", "Falkland Islands", "Fiji", "Finland",
-        "Former Yugoslav Republic of Macedonia", "France", "French Guiana", "French Polynesia",
-        "French Southern Territories", "Gabon", "Georgia", "Germany", "Ghana", "Gibraltar",
-        "Greece", "Greenland", "Grenada", "Guadeloupe", "Guam", "Guatemala", "Guinea", "Guinea-Bissau",
-        "Guyana", "Haiti", "Heard Island and McDonald Islands", "Honduras", "Hong Kong", "Hungary",
-        "Iceland", "India", "Indonesia", "Iran", "Iraq", "Ireland", "Israel", "Italy", "Jamaica",
-        "Japan", "Jordan", "Kazakhstan", "Kenya", "Kiribati", "Kuwait", "Kyrgyzstan", "Laos",
-        "Latvia", "Lebanon", "Lesotho", "Liberia", "Libya", "Liechtenstein", "Lithuania", "Luxembourg",
-        "Macau", "Madagascar", "Malawi", "Malaysia", "Maldives", "Mali", "Malta", "Marshall Islands",
-        "Martinique", "Mauritania", "Mauritius", "Mayotte", "Mexico", "Micronesia", "Moldova",
-        "Monaco", "Mongolia", "Montserrat", "Morocco", "Mozambique", "Myanmar", "Namibia",
-        "Nauru", "Nepal", "Netherlands", "Netherlands Antilles", "New Caledonia", "New Zealand",
-        "Nicaragua", "Niger", "Nigeria", "Niue", "Norfolk Island", "North Korea", "Northern Marianas",
-        "Norway", "Oman", "Pakistan", "Palau", "Panama", "Papua New Guinea", "Paraguay", "Peru",
-        "Philippines", "Pitcairn Islands", "Poland", "Portugal", "Puerto Rico", "Qatar",
-        "Reunion", "Romania", "Russia", "Rwanda", "Sqo Tome and Principe", "Saint Helena",
-        "Saint Kitts and Nevis", "Saint Lucia", "Saint Pierre and Miquelon",
-        "Saint Vincent and the Grenadines", "Samoa", "San Marino", "Saudi Arabia", "Senegal",
-        "Seychelles", "Sierra Leone", "Singapore", "Slovakia", "Slovenia", "Solomon Islands",
-        "Somalia", "South Africa", "South Georgia and the South Sandwich Islands", "South Korea",
-        "Spain", "Sri Lanka", "Sudan", "Suriname", "Svalbard and Jan Mayen", "Swaziland", "Sweden",
-        "Switzerland", "Syria", "Taiwan", "Tajikistan", "Tanzania", "Thailand", "The Bahamas",
-        "The Gambia", "Togo", "Tokelau", "Tonga", "Trinidad and Tobago", "Tunisia", "Turkey",
-        "Turkmenistan", "Turks and Caicos Islands", "Tuvalu", "Virgin Islands", "Uganda",
-        "Ukraine", "United Arab Emirates", "United Kingdom",
-        "United States", "United States Minor Outlying Islands", "Uruguay", "Uzbekistan",
-        "Vanuatu", "Vatican City", "Venezuela", "Vietnam", "Wallis and Futuna", "Western Sahara",
-        "Yemen", "Yugoslavia", "Zambia", "Zimbabwe"
-        };
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/PreDrawListener.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/PreDrawListener.java
deleted file mode 100755
index 84b3fa9a39167072ee932e118e04ad846d33558e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/PreDrawListener.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.Bundle;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewTreeObserver;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.LinearLayout;
-
-
-/**
- * Tests views with popupWindows becoming invisible
- */
-public class PreDrawListener extends Activity implements OnClickListener {
-
-    private MyLinearLayout mFrame;
-
-
-    static public class MyLinearLayout extends LinearLayout implements
-            ViewTreeObserver.OnPreDrawListener {
-
-        public boolean mCancelNextDraw;
-
-        public MyLinearLayout(Context context, AttributeSet attrs) {
-            super(context, attrs);
-        }
-
-        public MyLinearLayout(Context context) {
-            super(context);
-        }
-
-        @Override
-        protected void onAttachedToWindow() {
-            super.onAttachedToWindow();
-            getViewTreeObserver().addOnPreDrawListener(this);
-        }
-
-        public boolean onPreDraw() {
-            if (mCancelNextDraw) {
-                Button b = new Button(this.getContext());
-                b.setText("Hello");
-                addView(b, new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT,
-                        LayoutParams.WRAP_CONTENT));
-                mCancelNextDraw = false;
-                return false;
-            }
-            return true;
-        }
-
-    }
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.pre_draw_listener);
-
-        mFrame = (MyLinearLayout) findViewById(R.id.frame);
-
-        Button mGoButton = (Button) findViewById(R.id.go);
-        mGoButton.setOnClickListener(this);
-    }
-
-
-    public void onClick(View v) {
-        mFrame.mCancelNextDraw = true;
-        mFrame.invalidate();
-    }
-
-
-
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/RemoteViewsActivity.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/RemoteViewsActivity.java
deleted file mode 100755
index ec50aa5e22b26051ba14958d6bbb672c43407997..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/RemoteViewsActivity.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-/**
- * Exercise RemoteViews -- especially filtering
- */
-public class RemoteViewsActivity extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.remote_view_host);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/RunQueue.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/RunQueue.java
deleted file mode 100755
index 611127494b928760569b500ba5a82bd9bf0ef01c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/RunQueue.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.TextView;
-import android.view.View;
-import android.view.ViewTreeObserver;
-
-/**
- * Tests views using post*() and getViewTreeObserver() before onAttachedToWindow().
- */
-public class RunQueue extends Activity implements ViewTreeObserver.OnGlobalLayoutListener {
-    public boolean runnableRan = false;
-    public boolean runnableCancelled = true;
-    public boolean globalLayout = false;
-    public ViewTreeObserver viewTreeObserver;
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        TextView textView = new TextView(this);
-        textView.setText("RunQueue");
-        textView.setId(R.id.simple_view);
-
-        setContentView(textView);
-        final View view = findViewById(R.id.simple_view);
-
-        view.post(new Runnable() {
-            public void run() {
-                runnableRan = true;
-            }
-        });
-
-        final Runnable runnable = new Runnable() {
-            public void run() {
-                runnableCancelled = false;
-            }
-        };
-        view.post(runnable);
-        view.post(runnable);
-        view.post(runnable);
-        view.post(runnable);
-        view.removeCallbacks(runnable);
-
-        viewTreeObserver = view.getViewTreeObserver();
-        viewTreeObserver.addOnGlobalLayoutListener(this);
-    }
-
-    public void onGlobalLayout() {
-        globalLayout = true;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/RunQueueTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/RunQueueTest.java
deleted file mode 100755
index e73bdcb71a406002e0743bdcf250cad55d609667..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/RunQueueTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-
-public class RunQueueTest extends ActivityInstrumentationTestCase<RunQueue> {
-    public RunQueueTest() {
-        super("com.mediatek.common.view.tests", RunQueue.class);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-    }
-
-    @MediumTest
-    public void testRunnableRan() throws Exception {
-        final RunQueue activity = getActivity();
-        getInstrumentation().waitForIdleSync();
-        assertTrue("The runnable did not run", activity.runnableRan);
-    }
-
-    @MediumTest
-    public void testRunnableCancelled() throws Exception {
-        final RunQueue activity = getActivity();
-        getInstrumentation().waitForIdleSync();
-        assertTrue("The runnable was not cancelled", activity.runnableCancelled);
-    }
-
-    @MediumTest
-    public void testListenerFired() throws Exception {
-        final RunQueue activity = getActivity();
-        getInstrumentation().waitForIdleSync();
-        assertTrue("The global layout listener did not fire", activity.globalLayout);
-    }
-
-    @MediumTest
-    public void testTreeObserverKilled() throws Exception {
-        final RunQueue activity = getActivity();
-        getInstrumentation().waitForIdleSync();
-        assertFalse("The view tree observer is still alive", activity.viewTreeObserver.isAlive());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/SetTagsTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/SetTagsTest.java
deleted file mode 100755
index 88aaecbbbe88b05953ea6268e4d18133bbca113e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/SetTagsTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.test.suitebuilder.annotation.MediumTest;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.widget.Button;
-
-/**
- * Exercises {@link android.view.View}'s tags property.
- */
-public class SetTagsTest extends ActivityInstrumentationTestCase2<Disabled> {
-    private Button mView;
-
-    public SetTagsTest() {
-        super("com.mediatek.common.view.tests", Disabled.class);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-
-        mView = (Button) getActivity().findViewById(R.id.disabledButton);
-    }
-
-    @MediumTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mView);
-    }
-
-    @MediumTest
-    public void testSetTag() throws Exception {
-        mView.setTag("1");
-    }
-
-    @MediumTest
-    public void testGetTag() throws Exception {
-        Object o = new Object();
-        mView.setTag(o);
-
-        final Object stored = mView.getTag();
-        assertNotNull(stored);
-        assertSame("The stored tag is inccorect", o, stored);
-    }
-
-    @MediumTest
-    public void testSetTagWithKey() throws Exception {
-        mView.setTag(R.id.a, "2");
-    }
-
-    @MediumTest
-    public void testGetTagWithKey() throws Exception {
-        Object o = new Object();
-        mView.setTag(R.id.a, o);
-
-        final Object stored = mView.getTag(R.id.a);
-        assertNotNull(stored);
-        assertSame("The stored tag is inccorect", o, stored);
-    }
-
-    @MediumTest
-    public void testSetTagWithFrameworkId() throws Exception {
-        boolean result = false;
-        try {
-            mView.setTag(android.R.id.list, "2");
-        } catch (IllegalArgumentException e) {
-            result = true;
-        }
-        assertTrue("Setting a tag with a framework id did not throw an exception", result);
-    }
-
-    @MediumTest
-    public void testSetTagWithNoPackageId() throws Exception {
-        boolean result = false;
-        try {
-            mView.setTag(0x000000AA, "2");
-        } catch (IllegalArgumentException e) {
-            result = true;
-        }
-        assertTrue("Setting a tag with an id with no package did not throw an exception", result);
-    }
-
-    @MediumTest
-    public void testSetTagInternalWithFrameworkId() throws Exception {
-        mView.setTagInternal(android.R.id.list, "2");
-    }
-
-    @MediumTest
-    public void testSetTagInternalWithApplicationId() throws Exception {
-        boolean result = false;
-        try {
-            mView.setTagInternal(R.id.a, "2");
-        } catch (IllegalArgumentException e) {
-            result = true;
-        }
-        assertTrue("Setting a tag with an id with app package did not throw an exception", result);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/StubbedView.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/StubbedView.java
deleted file mode 100755
index 58aa20cd9ffe7eb467874f6614ac98fbe87f7df4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/StubbedView.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.os.Bundle;
-import android.app.Activity;
-import android.view.View;
-
-/**
- * Exercise <ViewStub /> tag in XML files.
- */
-public class StubbedView extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.viewstub);
-
-        findViewById(R.id.vis).setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                final View view = findViewById(R.id.viewStub);
-                if (view != null) {
-                    view.setVisibility(View.VISIBLE);
-                }
-            }
-        });
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/VelocityTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/VelocityTest.java
deleted file mode 100755
index 5b9d408c31696f8dad8986a1e8c748680290c661..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/VelocityTest.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import junit.framework.Assert;
-
-import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.MotionEvent;
-import android.view.VelocityTracker;
-import android.view.animation.AccelerateInterpolator;
-import android.view.animation.DecelerateInterpolator;
-import android.view.animation.Interpolator;
-import android.view.animation.LinearInterpolator;
-
-/**
- * Exercises {@link android.view.VelocityTracker} to compute correct velocity.<br>
- * To launch this test, use :<br>
- * <code>./development/testrunner/runtest.py framework -c com.android.frameworktest.view.VelocityTest</code>
- */
-public class VelocityTest extends InstrumentationTestCase {
-
-    @MediumTest
-    public void testInitialCondiditions() {
-        VelocityTracker vt = VelocityTracker.obtain();
-        assertNotNull(vt);
-        vt.recycle();
-    }
-
-    /**
-     * Test that {@link android.view.VelocityTracker}.clear() clears
-     * the previous values after a call to computeCurrentVelocity()
-     */
-    @MediumTest
-    public void testClear() {
-        long t = System.currentTimeMillis();
-        VelocityTracker vt = VelocityTracker.obtain();
-        drag(vt, 100, 200, 100, 200, 10, t, 300);
-        vt.computeCurrentVelocity(1);
-        assertFalse("Velocity should not be null", vt.getXVelocity() == 0.0f);
-        assertFalse("Velocity should not be null", vt.getYVelocity() == 0.0f);
-        vt.clear();
-        vt.computeCurrentVelocity(1);
-        assertEquals(0.0f, vt.getXVelocity());
-        assertEquals(0.0f, vt.getYVelocity());
-        vt.recycle();
-    }
-
-    @MediumTest
-    public void testDragAcceleration() {
-        long t = System.currentTimeMillis();
-        VelocityTracker vt = VelocityTracker.obtain();
-        drag(vt, 100, 200, 100, 200, 15, t, 400, new AccelerateInterpolator());
-        vt.computeCurrentVelocity(1000);
-        assertGreater(250.0f, vt.getXVelocity());
-        assertGreater(250.0f, vt.getYVelocity());
-        vt.recycle();
-    }
-
-    @MediumTest
-    public void testDragDeceleration() {
-        long t = System.currentTimeMillis();
-        VelocityTracker vt = VelocityTracker.obtain();
-        drag(vt, 100, 200, 100, 200, 15, t, 400, new DecelerateInterpolator());
-        vt.computeCurrentVelocity(1000);
-        assertLower(250.0f, vt.getXVelocity());
-        assertLower(250.0f, vt.getYVelocity());
-        vt.recycle();
-    }
-    /*  Test case Fail
-    @MediumTest
-    public void testDragLinearHorizontal() {
-        long t = System.currentTimeMillis();
-        VelocityTracker vt = VelocityTracker.obtain();
-        // 100px in 400ms => 250px/s
-        drag(vt, 100, 200, 200, 200, 15, t, 400);
-        vt.computeCurrentVelocity(1000);
-        assertEquals(0.0f, vt.getYVelocity());
-        assertEqualFuzzy(250.0f, vt.getXVelocity(), 4f);
-        vt.recycle();
-    }
-    */
-    /*  Test case Fail
-    @MediumTest
-    public void testDragLinearVertical() {
-        long t = System.currentTimeMillis();
-        VelocityTracker vt = VelocityTracker.obtain();
-        // 100px in 400ms => 250px/s
-        drag(vt, 200, 200, 100, 200, 15, t, 400);
-        vt.computeCurrentVelocity(1000);
-        assertEquals(0.0f, vt.getXVelocity());
-        assertEqualFuzzy(250.0f, vt.getYVelocity(), 4f);
-        vt.recycle();
-    }
-    */
-
-    /**
-     * Test dragging with two points only
-     * (velocity must be an exact value)
-     */
-     /*  Test case Fail
-    @MediumTest
-    public void testDragWith2Points () {
-        long t = System.currentTimeMillis();
-        VelocityTracker vt = VelocityTracker.obtain();
-        // 100px, 2 steps, 100ms => 1000px/s
-        drag(vt, 100, 200, 100, 200, 2, t, 100);
-        vt.computeCurrentVelocity(1000);
-        assertEquals(1000.0f, vt.getXVelocity());
-        assertEquals(1000.0f, vt.getYVelocity());
-        vt.recycle();
-    }
-    */
-
-    /**
-     * Velocity is independent of the number of points used during
-     * the same interval
-     */
-     /*  Test case Fail
-    @MediumTest
-    public void testStabilityInNbPoints () {
-        long t = System.currentTimeMillis();
-        VelocityTracker vt = VelocityTracker.obtain();
-        drag(vt, 100, 200, 100, 200, 10, t, 400); // 10 steps over 400ms
-        vt.computeCurrentVelocity(1);
-        float firstX = vt.getXVelocity();
-        float firstY = vt.getYVelocity();
-        vt.clear();
-        drag(vt, 100, 200, 100, 200, 20, t, 400); // 20 steps over 400ms
-        vt.computeCurrentVelocity(1);
-        float secondX = vt.getXVelocity();
-        float secondY = vt.getYVelocity();
-        assertEqualFuzzy(firstX, secondX, 0.1f);
-        assertEqualFuzzy(firstY, secondY, 0.1f);
-        vt.recycle();
-    }
-    */
-
-    /**
-     * Velocity is independent of the time when the events occurs,
-     * it only depends on delays between the events.
-     */
-    @MediumTest
-    public void testStabilityInTime() {
-        long t = System.currentTimeMillis();
-        VelocityTracker vt = VelocityTracker.obtain();
-        drag(vt, 100, 200, 100, 200, 10, t, 400);
-        vt.computeCurrentVelocity(1);
-        float firstX = vt.getXVelocity();
-        float firstY = vt.getYVelocity();
-        vt.clear();
-        drag(vt, 100, 200, 100, 200, 10, t + 3600 * 1000, 400); // on hour later
-        vt.computeCurrentVelocity(1);
-        float secondX = vt.getXVelocity();
-        float secondY = vt.getYVelocity();
-        assertEqualFuzzy(firstX, secondX, 0.1f);
-        assertEqualFuzzy(firstY, secondY, 0.1f);
-        vt.recycle();
-    }
-
-    /**
-     * Velocity is independent of the position of the events,
-     * it only depends on their relative distance.
-     */
-    @MediumTest
-    public void testStabilityInSpace() {
-        long t = System.currentTimeMillis();
-        VelocityTracker vt = VelocityTracker.obtain();
-        drag(vt, 100, 200, 100, 200, 10, t, 400);
-        vt.computeCurrentVelocity(1);
-        float firstX = vt.getXVelocity();
-        float firstY = vt.getYVelocity();
-        vt.clear();
-        drag(vt, 200, 300, 200, 300, 10, t, 400); // 100px further
-        vt.computeCurrentVelocity(1);
-        float secondX = vt.getXVelocity();
-        float secondY = vt.getYVelocity();
-        assertEqualFuzzy(firstX, secondX, 0.1f);
-        assertEqualFuzzy(firstY, secondY, 0.1f);
-        vt.recycle();
-    }
-
-    /**
-     * Test that calls to {@link android.view.VelocityTracker}.computeCurrentVelocity()
-     * will output same values when using the same data.
-     */
-    @MediumTest
-    public void testStabilityOfComputation() {
-        long t = System.currentTimeMillis();
-        VelocityTracker vt = VelocityTracker.obtain();
-        drag(vt, 100, 200, 100, 200, 10, t, 300);
-        vt.computeCurrentVelocity(1);
-        float firstX = vt.getXVelocity();
-        float firstY = vt.getYVelocity();
-        vt.computeCurrentVelocity(1);
-        float secondX = vt.getXVelocity();
-        float secondY = vt.getYVelocity();
-        assertEquals(firstX, secondX);
-        assertEquals(firstY, secondY);
-        vt.recycle();
-    }
-
-    /**
-     * Test the units parameter of {@link android.view.VelocityTracker}.computeCurrentVelocity()
-     */
-    @MediumTest
-    public void testStabilityOfUnits() {
-        long t = System.currentTimeMillis();
-        VelocityTracker vt = VelocityTracker.obtain();
-        drag(vt, 100, 200, 100, 200, 10, t, 300);
-        vt.computeCurrentVelocity(1);
-        float firstX = vt.getXVelocity();
-        float firstY = vt.getYVelocity();
-        vt.computeCurrentVelocity(1000);
-        float secondX = vt.getXVelocity();
-        float secondY = vt.getYVelocity();
-        assertEqualFuzzy(firstX, secondX / 1000.0f, 0.1f);
-        assertEqualFuzzy(firstY, secondY / 1000.0f, 0.1f);
-        vt.recycle();
-    }
-
-    /**
-     * Simulate a drag by giving directly MotionEvents to
-     * the VelocityTracker using a linear interpolator
-     */
-    private void drag(VelocityTracker vt, int startX, int endX, int startY, int endY, int steps,
-            long startime, int duration) {
-        drag(vt, startX, endX, startY, endY, steps, startime, duration, new LinearInterpolator());
-    }
-
-    /**
-     * Simulate a drag by giving directly MotionEvents to
-     * the VelocityTracker using a given interpolator
-     */
-    private void drag(VelocityTracker vt, int startX, int endX, int startY, int endY, int steps,
-            long startime, int duration, Interpolator interpolator) {
-        addMotionEvent(vt, startX, startY, startime, MotionEvent.ACTION_DOWN);
-        float dt = duration / (float) steps;
-        int distX = endX - startX;
-        int distY = endY - startY;
-        for (int i = 1; i < steps - 1; i++) {
-            float ii = interpolator.getInterpolation(i / (float) steps);
-            int x = (int) (startX + distX * ii);
-            int y = (int) (startY + distY * ii);
-            long time = startime + (int) (i * dt);
-            addMotionEvent(vt, x, y, time, MotionEvent.ACTION_MOVE);
-        }
-        addMotionEvent(vt, endX, endY, startime + duration, MotionEvent.ACTION_UP);
-    }
-
-    private void addMotionEvent(VelocityTracker vt, int x, int y, long time, int action) {
-        MotionEvent me = MotionEvent.obtain(time, time, action, x, y, 0);
-        vt.addMovement(me);
-        me.recycle();
-    }
-
-    /**
-     * Float imprecision of the average computations and filtering
-     * (removing last MotionEvent for N > 3) implies that tests
-     *  accepts some approximated values.
-     */
-    private void assertEqualFuzzy(float expected, float actual, float threshold) {
-        boolean fuzzyEqual = actual >= expected - threshold && actual <= expected + threshold;
-        Assert.assertTrue("Expected: <" + expected + "> but was: <" + actual +
-                "> while accepting a variation of: <" + threshold + ">", fuzzyEqual);
-    }
-
-    private void assertGreater(float minExpected, float actual) {
-        Assert.assertTrue("Expected: minimum <" + minExpected + "> but was: <" + actual + ">",
-                actual > minExpected);
-    }
-
-    private void assertLower(float maxExpected, float actual) {
-        Assert.assertTrue("Expected: maximum <" + maxExpected + "> but was: <" + actual + ">",
-                actual < maxExpected);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ViewAttachTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ViewAttachTest.java
deleted file mode 100755
index 32728aa407c81ec22c770cee800f3d44ce758a68..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ViewAttachTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.content.pm.ActivityInfo;
-import android.os.SystemClock;
-import android.test.ActivityInstrumentationTestCase2;
-
-public class ViewAttachTest extends
-        ActivityInstrumentationTestCase2<ViewAttachTestActivity> {
-
-    public ViewAttachTest() {
-        super(ViewAttachTestActivity.class);
-    }
-
-    /**
-     * Make sure that onAttachedToWindow and onDetachedToWindow is called in the
-     * correct order. The ViewAttachTestActivity contains a view that will throw
-     * a RuntimeException if onDetachedToWindow and onAttachedToWindow are
-     * called in the wrong order.
-     *
-     * 1. Initiate the activity 2. Perform a series of orientation changes to
-     * the activity (this will force the View hierarchy to be rebuilt,
-     * generating onAttachedToWindow and onDetachedToWindow)
-     *
-     * Expected result: No RuntimeException is thrown from the TestView in
-     * ViewFlipperTestActivity.
-     *
-     * @throws Throwable
-     */
-    public void testAttached() throws Throwable {
-        final ViewAttachTestActivity activity = getActivity();
-        for (int i = 0; i < 20; i++) {
-            activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-            SystemClock.sleep(250);
-            activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-            SystemClock.sleep(250);
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ViewAttachTestActivity.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ViewAttachTestActivity.java
deleted file mode 100755
index 90869b31fcebe4dbe2bf4c0d31f57bb1f28eb297..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ViewAttachTestActivity.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class ViewAttachTestActivity extends Activity {
-    public static final String TAG = "OnAttachedTest";
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.attach_view_test);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ViewAttachView.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ViewAttachView.java
deleted file mode 100755
index 2cdb1da42069ec014be730b79fca127eb534fafd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ViewAttachView.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.os.SystemClock;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.View;
-
-/**
- * A View that will throw a RuntimeException if onAttachedToWindow and
- * onDetachedFromWindow is called in the wrong order for ViewAttachTest
- */
-public class ViewAttachView extends View {
-    public static final String TAG = "OnAttachedTest";
-    private boolean attached;
-
-    public ViewAttachView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        init(attrs, defStyle);
-    }
-
-    public ViewAttachView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init(attrs, 0);
-    }
-
-    public ViewAttachView(Context context) {
-        super(context);
-        init(null, 0);
-    }
-
-    private void init(AttributeSet attrs, int defStyle) {
-        SystemClock.sleep(2000);
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        Log.d(TAG, "onAttachedToWindow");
-        super.onAttachedToWindow();
-        if (attached) {
-            throw new RuntimeException("OnAttachedToWindow called more than once in a row");
-        }
-        attached = true;
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        Log.d(TAG, "onDetachedFromWindow");
-        super.onDetachedFromWindow();
-        if (!attached) {
-            throw new RuntimeException(
-                    "onDetachedFromWindowcalled without prior call to OnAttachedToWindow");
-        }
-        attached = false;
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-        canvas.drawColor(Color.BLUE);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ViewGroupAttributesTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ViewGroupAttributesTest.java
deleted file mode 100755
index 33f716e7ed5560904bb9e65c3cd50eb15938c2cb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ViewGroupAttributesTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.content.Context;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.view.ViewGroup;
-
-public class ViewGroupAttributesTest extends AndroidTestCase {
-
-    private MyViewGroup mViewGroup;
-
-    private static final class MyViewGroup extends ViewGroup {
-
-        public MyViewGroup(Context context) {
-            super(context);
-        }
-
-        @Override
-        protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        }
-
-        @Override
-        public boolean isChildrenDrawnWithCacheEnabled() {
-            return super.isChildrenDrawnWithCacheEnabled();
-        }
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mViewGroup = new MyViewGroup(getContext());
-    }
-
-    @SmallTest
-    public void testDescendantFocusabilityEnum() {
-        assertEquals("expected ViewGroup.FOCUS_BEFORE_DESCENDANTS to be default",
-                ViewGroup.FOCUS_BEFORE_DESCENDANTS, mViewGroup.getDescendantFocusability());
-
-        // remember some state before we muck with flags
-        final boolean isAnimationCachEnabled = mViewGroup.isAnimationCacheEnabled();
-        final boolean isAlwaysDrawnWithCacheEnabled = mViewGroup.isAlwaysDrawnWithCacheEnabled();
-        final boolean isChildrenDrawnWithCacheEnabled = mViewGroup.isChildrenDrawnWithCacheEnabled();
-
-        mViewGroup.setDescendantFocusability(ViewGroup.FOCUS_AFTER_DESCENDANTS);
-        assertEquals(ViewGroup.FOCUS_AFTER_DESCENDANTS, mViewGroup.getDescendantFocusability());
-
-        mViewGroup.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
-        assertEquals(ViewGroup.FOCUS_BLOCK_DESCENDANTS, mViewGroup.getDescendantFocusability());
-
-        mViewGroup.setDescendantFocusability(ViewGroup.FOCUS_BEFORE_DESCENDANTS);
-        assertEquals(ViewGroup.FOCUS_BEFORE_DESCENDANTS, mViewGroup.getDescendantFocusability());
-
-        // verify we didn't change something unrelated
-        final String msg = "setDescendantFocusability messed with an unrelated flag";
-        assertEquals(msg, isAnimationCachEnabled, mViewGroup.isAnimationCacheEnabled());
-        assertEquals(msg, isAlwaysDrawnWithCacheEnabled, mViewGroup.isAlwaysDrawnWithCacheEnabled());
-        assertEquals(msg, isChildrenDrawnWithCacheEnabled, mViewGroup.isChildrenDrawnWithCacheEnabled());
-    }
-
-    @SmallTest
-    public void testWrongIntSetForDescendantFocusabilityEnum() {
-        try {
-            mViewGroup.setDescendantFocusability(0);
-            fail("expected setting wrong flag to throw an exception");
-        } catch (IllegalArgumentException expected) {
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ViewGroupChildren.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ViewGroupChildren.java
deleted file mode 100755
index 186c2ed631a0c399ca4a1759506ea150fdfe8673..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ViewGroupChildren.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.os.Bundle;
-import android.app.Activity;
-
-/**
- * Exercise ViewGroup's ability to add and remove children.
- */
-public class ViewGroupChildren extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.viewgroupchildren);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ViewGroupChildrenTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ViewGroupChildrenTest.java
deleted file mode 100755
index 8274151aaeb9ae5a6ef36f02bfde58399686f659..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ViewGroupChildrenTest.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.ViewAsserts;
-import android.test.UiThreadTest;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-/**
- * Exercises {@link android.view.ViewGroup}'s ability to add/remove children.
- */
-public class ViewGroupChildrenTest extends ActivityInstrumentationTestCase<ViewGroupChildren> {
-    private ViewGroup mGroup;
-
-    public ViewGroupChildrenTest() {
-        super("com.mediatek.common.view.tests", ViewGroupChildren.class);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-
-        final ViewGroupChildren a = getActivity();
-        mGroup = (ViewGroup) a.findViewById(R.id.group);
-    }
-
-    @MediumTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mGroup);
-    }
-
-    @MediumTest
-    public void testStartsEmpty() throws Exception {
-        assertEquals("A ViewGroup should have no child by default", 0, mGroup.getChildCount());
-    }
-
-    @UiThreadTest
-    @MediumTest
-    public void testAddChild() throws Exception {
-        View view = createView("1");
-        mGroup.addView(view);
-
-        assertEquals(1, mGroup.getChildCount());
-        ViewAsserts.assertGroupIntegrity(mGroup);
-        ViewAsserts.assertGroupContains(mGroup, view);
-    }
-
-    @UiThreadTest
-    @MediumTest
-    public void testAddChildAtFront() throws Exception {
-        // 24 should be greater than ViewGroup.ARRAY_CAPACITY_INCREMENT
-        for (int i = 0; i < 24; i++) {
-            View view = createView(String.valueOf(i + 1));
-            mGroup.addView(view);
-        }
-
-        View view = createView("X");
-        mGroup.addView(view, 0);
-
-        assertEquals(25, mGroup.getChildCount());
-        ViewAsserts.assertGroupIntegrity(mGroup);
-        ViewAsserts.assertGroupContains(mGroup, view);
-        assertSame(view, mGroup.getChildAt(0));
-    }
-
-    @UiThreadTest
-    @MediumTest
-    public void testAddChildInMiddle() throws Exception {
-        // 24 should be greater than ViewGroup.ARRAY_CAPACITY_INCREMENT
-        for (int i = 0; i < 24; i++) {
-            View view = createView(String.valueOf(i + 1));
-            mGroup.addView(view);
-        }
-
-        View view = createView("X");
-        mGroup.addView(view, 12);
-
-        assertEquals(25, mGroup.getChildCount());
-        ViewAsserts.assertGroupIntegrity(mGroup);
-        ViewAsserts.assertGroupContains(mGroup, view);
-        assertSame(view, mGroup.getChildAt(12));
-    }
-
-    @UiThreadTest
-    @MediumTest
-    public void testAddChildren() throws Exception {
-        // 24 should be greater than ViewGroup.ARRAY_CAPACITY_INCREMENT
-        for (int i = 0; i < 24; i++) {
-            View view = createView(String.valueOf(i + 1));
-            mGroup.addView(view);
-
-            ViewAsserts.assertGroupContains(mGroup, view);
-        }
-        assertEquals(24, mGroup.getChildCount());
-    }
-
-    @UiThreadTest
-    @MediumTest
-    public void testRemoveChild() throws Exception {
-        View view = createView("1");
-        mGroup.addView(view);
-
-        ViewAsserts.assertGroupIntegrity(mGroup);
-
-        mGroup.removeView(view);
-
-        ViewAsserts.assertGroupIntegrity(mGroup);
-        ViewAsserts.assertGroupNotContains(mGroup, view);
-
-        assertEquals(0, mGroup.getChildCount());
-        assertNull(view.getParent());
-    }
-
-    @UiThreadTest
-    @MediumTest
-    public void testRemoveChildren() throws Exception {
-        // 24 should be greater than ViewGroup.ARRAY_CAPACITY_INCREMENT
-        final View[] views = new View[24];
-
-        for (int i = 0; i < views.length; i++) {
-            views[i] = createView(String.valueOf(i + 1));
-            mGroup.addView(views[i]);
-        }
-
-        for (int i = views.length - 1; i >= 0; i--) {
-            mGroup.removeViewAt(i);
-            ViewAsserts.assertGroupIntegrity(mGroup);
-            ViewAsserts.assertGroupNotContains(mGroup, views[i]);
-            assertNull(views[i].getParent());
-        }
-
-        assertEquals(0, mGroup.getChildCount());
-    }
-
-    @UiThreadTest
-    @MediumTest
-    public void testRemoveChildrenBulk() throws Exception {
-        // 24 should be greater than ViewGroup.ARRAY_CAPACITY_INCREMENT
-        final View[] views = new View[24];
-
-        for (int i = 0; i < views.length; i++) {
-            views[i] = createView(String.valueOf(i + 1));
-            mGroup.addView(views[i]);
-        }
-
-        mGroup.removeViews(6, 7);
-        ViewAsserts.assertGroupIntegrity(mGroup);
-        for (int i = 6; i < 13; i++) {
-            ViewAsserts.assertGroupNotContains(mGroup, views[i]);
-            assertNull(views[i].getParent());
-        }
-
-        assertEquals(17, mGroup.getChildCount());
-    }
-
-    @UiThreadTest
-    @MediumTest
-    public void testRemoveChildrenBulkAtFront() throws Exception {
-        // 24 should be greater than ViewGroup.ARRAY_CAPACITY_INCREMENT
-        final View[] views = new View[24];
-
-        for (int i = 0; i < views.length; i++) {
-            views[i] = createView(String.valueOf(i + 1));
-            mGroup.addView(views[i]);
-        }
-
-        mGroup.removeViews(0, 7);
-        ViewAsserts.assertGroupIntegrity(mGroup);
-        for (int i = 0; i < 7; i++) {
-            ViewAsserts.assertGroupNotContains(mGroup, views[i]);
-            assertNull(views[i].getParent());
-        }
-
-        assertEquals("8", ((TextView) mGroup.getChildAt(0)).getText());
-        assertEquals(17, mGroup.getChildCount());
-    }
-
-    @UiThreadTest
-    @MediumTest
-    public void testRemoveChildrenBulkAtEnd() throws Exception {
-        // 24 should be greater than ViewGroup.ARRAY_CAPACITY_INCREMENT
-        final View[] views = new View[24];
-
-        for (int i = 0; i < views.length; i++) {
-            views[i] = createView(String.valueOf(i + 1));
-            mGroup.addView(views[i]);
-        }
-
-        mGroup.removeViews(17, 7);
-        ViewAsserts.assertGroupIntegrity(mGroup);
-        for (int i = 17; i < 24; i++) {
-            ViewAsserts.assertGroupNotContains(mGroup, views[i]);
-            assertNull(views[i].getParent());
-        }
-        assertEquals("17", ((TextView) mGroup.getChildAt(mGroup.getChildCount() - 1)).getText());
-        assertEquals(17, mGroup.getChildCount());
-    }
-
-    @UiThreadTest
-    @MediumTest
-    public void testRemoveChildAtFront() throws Exception {
-        // 24 should be greater than ViewGroup.ARRAY_CAPACITY_INCREMENT
-        final View[] views = new View[24];
-
-        for (int i = 0; i < views.length; i++) {
-            views[i] = createView(String.valueOf(i + 1));
-            mGroup.addView(views[i]);
-        }
-
-        mGroup.removeViewAt(0);
-        ViewAsserts.assertGroupIntegrity(mGroup);
-        ViewAsserts.assertGroupNotContains(mGroup, views[0]);
-        assertNull(views[0].getParent());
-
-        assertEquals(views.length - 1, mGroup.getChildCount());
-    }
-
-    @UiThreadTest
-    @MediumTest
-    public void testRemoveChildInMiddle() throws Exception {
-        // 24 should be greater than ViewGroup.ARRAY_CAPACITY_INCREMENT
-        final View[] views = new View[24];
-
-        for (int i = 0; i < views.length; i++) {
-            views[i] = createView(String.valueOf(i + 1));
-            mGroup.addView(views[i]);
-        }
-
-        mGroup.removeViewAt(12);
-        ViewAsserts.assertGroupIntegrity(mGroup);
-        ViewAsserts.assertGroupNotContains(mGroup, views[12]);
-        assertNull(views[12].getParent());
-
-        assertEquals(views.length - 1, mGroup.getChildCount());
-    }
-
-    private TextView createView(String text) {
-        TextView view = new TextView(getActivity());
-        view.setText(text);
-        view.setLayoutParams(new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.MATCH_PARENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT
-        ));
-        return view;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ViewStubTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ViewStubTest.java
deleted file mode 100755
index 3e7794f3cd77ecb9703de1c8af020107b9add789..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ViewStubTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.UiThreadTest;
-import android.view.View;
-import android.view.ViewStub;
-
-public class ViewStubTest extends ActivityInstrumentationTestCase<StubbedView> {
-    public ViewStubTest() {
-        super("com.mediatek.common.view.tests", StubbedView.class);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-    }
-
-    @MediumTest
-    public void testStubbed() throws Exception {
-        final StubbedView activity = getActivity();
-
-        final View stub = activity.findViewById(R.id.viewStub);
-        assertNotNull("The ViewStub does not exist", stub);
-    }
-
-    @UiThreadTest
-    @MediumTest
-    public void testInflated() throws Exception {
-        final StubbedView activity = getActivity();
-
-        final ViewStub stub = (ViewStub) activity.findViewById(R.id.viewStub);
-        final View swapped = stub.inflate();
-
-        assertNotNull("The inflated view is null", swapped);
-    }
-
-    @UiThreadTest
-    @MediumTest
-    public void testInflatedId() throws Exception {
-        final StubbedView activity = getActivity();
-
-        final ViewStub stub = (ViewStub) activity.findViewById(R.id.viewStubWithId);
-        final View swapped = stub.inflate();
-
-        assertNotNull("The inflated view is null", swapped);
-        assertTrue("The inflated view has no id", swapped.getId() != View.NO_ID);
-        assertTrue("The inflated view has the wrong id", swapped.getId() == R.id.stub_inflated);
-    }
-
-    @UiThreadTest
-    @MediumTest
-    public void testInflatedLayoutParams() throws Exception {
-        final StubbedView activity = getActivity();
-
-        final ViewStub stub = (ViewStub) activity.findViewById(R.id.viewStubWithId);
-        final View swapped = stub.inflate();
-
-        assertNotNull("The inflated view is null", swapped);
-
-        assertEquals("Both stub and inflated should same width",
-                stub.getLayoutParams().width, swapped.getLayoutParams().width);
-        assertEquals("Both stub and inflated should same height",
-                stub.getLayoutParams().height, swapped.getLayoutParams().height);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/Visibility.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/Visibility.java
deleted file mode 100755
index c90ac18c5991f6582f96f192f224c9d30688aec2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/Visibility.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.os.Bundle;
-import android.widget.Button;
-import android.view.View;
-import android.app.Activity;
-
-/**
- * Exercise View's ability to change their visibility: GONE, INVISIBLE and
- * VISIBLE.
- */
-public class Visibility extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.visibility);
-
-        // Find the view whose visibility will change
-        mVictim = findViewById(R.id.victim);
-
-        // Find our buttons
-        Button visibleButton = (Button) findViewById(R.id.vis);
-        Button invisibleButton = (Button) findViewById(R.id.invis);
-        Button goneButton = (Button) findViewById(R.id.gone);
-
-        // Wire each button to a click listener
-        visibleButton.setOnClickListener(mVisibleListener);
-        invisibleButton.setOnClickListener(mInvisibleListener);
-        goneButton.setOnClickListener(mGoneListener);
-    }
-
-
-    View.OnClickListener mVisibleListener = new View.OnClickListener() {
-        public void onClick(View v) {
-            mVictim.setVisibility(View.VISIBLE);
-        }
-    };
-
-    View.OnClickListener mInvisibleListener = new View.OnClickListener() {
-        public void onClick(View v) {
-            mVictim.setVisibility(View.INVISIBLE);
-        }
-    };
-
-    View.OnClickListener mGoneListener = new View.OnClickListener() {
-        public void onClick(View v) {
-            mVictim.setVisibility(View.GONE);
-        }
-    };
-
-    private View mVictim;
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/VisibilityCallback.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/VisibilityCallback.java
deleted file mode 100755
index e8066d6e777d944aa003e2a5198ee41857c88f3f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/VisibilityCallback.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.widget.TextView;
-
-import android.os.Bundle;
-import android.widget.Button;
-import android.view.View;
-import android.app.Activity;
-
-/**
- * Exercise View's ability to change their visibility: GONE, INVISIBLE and
- * VISIBLE.
- */
-public class VisibilityCallback extends Activity {
-    private static final boolean DEBUG = false;
-
-    private MonitoredTextView mVictim;
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.visibility_callback);
-
-        // Find the view whose visibility will change
-        mVictim = (MonitoredTextView) findViewById(R.id.victim);
-
-        // Find our buttons
-        Button visibleButton = (Button) findViewById(R.id.vis);
-        Button invisibleButton = (Button) findViewById(R.id.invis);
-        Button goneButton = (Button) findViewById(R.id.gone);
-
-        // Wire each button to a click listener
-        visibleButton.setOnClickListener(mVisibleListener);
-        invisibleButton.setOnClickListener(mInvisibleListener);
-        goneButton.setOnClickListener(mGoneListener);
-    }
-
-
-    View.OnClickListener mVisibleListener = new View.OnClickListener() {
-        public void onClick(View v) {
-            mVictim.setVisibility(View.VISIBLE);
-        }
-    };
-
-    View.OnClickListener mInvisibleListener = new View.OnClickListener() {
-        public void onClick(View v) {
-            mVictim.setVisibility(View.INVISIBLE);
-        }
-    };
-
-    View.OnClickListener mGoneListener = new View.OnClickListener() {
-        public void onClick(View v) {
-            mVictim.setVisibility(View.GONE);
-        }
-    };
-
-    public static class MonitoredTextView extends TextView {
-        private View mLastVisChangedView;
-        private int mLastChangedVisibility;
-
-        public MonitoredTextView(Context context) {
-            super(context);
-        }
-
-        public MonitoredTextView(Context context, AttributeSet attrs) {
-            super(context, attrs);
-        }
-
-        public MonitoredTextView(Context context, AttributeSet attrs, int defStyle) {
-            super(context, attrs, defStyle);
-        }
-
-        public View getLastVisChangedView() {
-            return mLastVisChangedView;
-        }
-
-        public int getLastChangedVisibility() {
-            return mLastChangedVisibility;
-        }
-
-        @Override
-        protected void onVisibilityChanged(View changedView, int visibility) {
-            mLastVisChangedView = changedView;
-            mLastChangedVisibility = visibility;
-
-            if (DEBUG) {
-                Log.d("viewVis", "visibility: " + visibility);
-            }
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/VisibilityCallbackTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/VisibilityCallbackTest.java
deleted file mode 100755
index 2a0948a5253bc731a7f38ceaa31af0e7a651664e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/VisibilityCallbackTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-
-/**
- * Exercises {@link android.view.View}'s ability to change visibility between
- * GONE, VISIBLE and INVISIBLE.
- */
-public class VisibilityCallbackTest extends ActivityInstrumentationTestCase2<VisibilityCallback> {
-    private TextView mRefUp;
-    private TextView mRefDown;
-    private VisibilityCallback.MonitoredTextView mVictim;
-    private ViewGroup mParent;
-    private Button mVisible;
-    private Button mInvisible;
-    private Button mGone;
-
-    public VisibilityCallbackTest() {
-        super("com.mediatek.common.view.tests", VisibilityCallback.class);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-
-        final VisibilityCallback a = getActivity();
-        mRefUp = (TextView) a.findViewById(R.id.refUp);
-        mRefDown = (TextView) a.findViewById(R.id.refDown);
-        mVictim = (VisibilityCallback.MonitoredTextView) a.findViewById(R.id.victim);
-        mParent = (ViewGroup) a.findViewById(R.id.parent);
-        mVisible = (Button) a.findViewById(R.id.vis);
-        mInvisible = (Button) a.findViewById(R.id.invis);
-        mGone = (Button) a.findViewById(R.id.gone);
-
-        mVictim.post(new Runnable() {
-            public void run() {
-                mVictim.setVisibility(View.INVISIBLE);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-     }
-
-    @MediumTest
-    @UiThreadTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mRefUp);
-        assertNotNull(mRefDown);
-        assertNotNull(mVictim);
-        assertNotNull(mVisible);
-        assertNotNull(mInvisible);
-        assertNotNull(mGone);
-
-        assertTrue(mVisible.hasFocus());
-        assertEquals(View.INVISIBLE, mVictim.getVisibility());
-        assertEquals(View.VISIBLE, mParent.getVisibility());
-    }
-
-    @MediumTest
-    @UiThreadTest
-    public void testDirect() throws Exception {
-        mVictim.setVisibility(View.VISIBLE);
-        assertEquals(View.VISIBLE, mVictim.getLastChangedVisibility());
-        assertEquals(mVictim, mVictim.getLastVisChangedView());
-
-        mVictim.setVisibility(View.INVISIBLE);
-        assertEquals(View.INVISIBLE, mVictim.getLastChangedVisibility());
-        assertEquals(mVictim, mVictim.getLastVisChangedView());
-
-        mVictim.setVisibility(View.GONE);
-        assertEquals(View.GONE, mVictim.getLastChangedVisibility());
-        assertEquals(mVictim, mVictim.getLastVisChangedView());
-    }
-
-    @MediumTest
-    @UiThreadTest
-    public void testChild() throws Exception {
-        mParent.setVisibility(View.INVISIBLE);
-        assertEquals(View.INVISIBLE, mVictim.getLastChangedVisibility());
-        assertEquals(mParent, mVictim.getLastVisChangedView());
-
-        mParent.setVisibility(View.GONE);
-        assertEquals(View.GONE, mVictim.getLastChangedVisibility());
-        assertEquals(mParent, mVictim.getLastVisChangedView());
-
-        mParent.setVisibility(View.VISIBLE);
-        assertEquals(View.VISIBLE, mVictim.getLastChangedVisibility());
-        assertEquals(mParent, mVictim.getLastVisChangedView());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/VisibilityTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/VisibilityTest.java
deleted file mode 100755
index e2fa8b79de5e5edba077e9203d0eb19d6d59fa41..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/VisibilityTest.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.Button;
-import android.widget.TextView;
-import android.view.View;
-import static android.view.KeyEvent.*;
-
-/**
- * Exercises {@link android.view.View}'s ability to change visibility between
- * GONE, VISIBLE and INVISIBLE.
- */
-public class VisibilityTest extends ActivityInstrumentationTestCase<Visibility> {
-    private TextView mRefUp;
-    private TextView mRefDown;
-    private TextView mVictim;
-    private Button mVisible;
-    private Button mInvisible;
-    private Button mGone;
-
-    public VisibilityTest() {
-        super("com.mediatek.common.view.tests", Visibility.class);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-
-        final Visibility a = getActivity();
-        mRefUp = (TextView) a.findViewById(R.id.refUp);
-        mRefDown = (TextView) a.findViewById(R.id.refDown);
-        mVictim = (TextView) a.findViewById(R.id.victim);
-        mVisible = (Button) a.findViewById(R.id.vis);
-        mInvisible = (Button) a.findViewById(R.id.invis);
-        mGone = (Button) a.findViewById(R.id.gone);
-    }
-
-    @MediumTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mRefUp);
-        assertNotNull(mRefDown);
-        assertNotNull(mVictim);
-        assertNotNull(mVisible);
-        assertNotNull(mInvisible);
-        assertNotNull(mGone);
-
-        assertTrue(mVisible.hasFocus());
-    }
-
-    @MediumTest
-    public void testVisibleToInvisible() throws Exception {
-        sendKeys("DPAD_RIGHT");
-        assertTrue(mInvisible.hasFocus());
-
-        int oldTop = mVictim.getTop();
-
-        sendKeys("DPAD_CENTER");
-        assertEquals(View.INVISIBLE, mVictim.getVisibility());
-
-        int newTop = mVictim.getTop();
-        assertEquals(oldTop, newTop);
-    }
-
-    @MediumTest
-    public void testVisibleToGone() throws Exception {
-        //sendKeys("2*DPAD_RIGHT");
-        sendRepeatedKeys(2, KEYCODE_DPAD_RIGHT);
-        assertTrue(mGone.hasFocus());
-
-        int oldTop = mVictim.getTop();
-
-        sendKeys("DPAD_CENTER");
-        assertEquals(View.GONE, mVictim.getVisibility());
-
-        int refDownTop = mRefDown.getTop();
-        assertEquals(oldTop, refDownTop);
-    }
-
-    @LargeTest
-    public void testGoneToVisible() throws Exception {
-        sendKeys("2*DPAD_RIGHT");
-        assertTrue(mGone.hasFocus());
-
-        int oldTop = mVictim.getTop();
-
-        sendKeys("DPAD_CENTER");
-        assertEquals(View.GONE, mVictim.getVisibility());
-
-        int refDownTop = mRefDown.getTop();
-        assertEquals(oldTop, refDownTop);
-
-        sendKeys("2*DPAD_LEFT DPAD_CENTER");
-        assertEquals(View.VISIBLE, mVictim.getVisibility());
-
-        int newTop = mVictim.getTop();
-        assertEquals(oldTop, newTop);
-    }
-
-    @MediumTest
-    public void testGoneToInvisible() throws Exception {
-        sendKeys("2*DPAD_RIGHT");
-        assertTrue(mGone.hasFocus());
-
-        int oldTop = mVictim.getTop();
-
-        sendKeys("DPAD_CENTER");
-        assertEquals(View.GONE, mVictim.getVisibility());
-
-        int refDownTop = mRefDown.getTop();
-        assertEquals(oldTop, refDownTop);
-
-        sendKeys(KEYCODE_DPAD_LEFT, KEYCODE_DPAD_CENTER);
-        assertEquals(View.INVISIBLE, mVictim.getVisibility());
-
-        int newTop = mVictim.getTop();
-        assertEquals(oldTop, newTop);
-    }
-
-    @MediumTest
-    public void testInvisibleToVisible() throws Exception {
-        sendKeys("DPAD_RIGHT");
-        assertTrue(mInvisible.hasFocus());
-
-        int oldTop = mVictim.getTop();
-
-        sendKeys("DPAD_CENTER");
-        assertEquals(View.INVISIBLE, mVictim.getVisibility());
-
-        int newTop = mVictim.getTop();
-        assertEquals(oldTop, newTop);
-
-        sendKeys("DPAD_LEFT DPAD_CENTER");
-        assertEquals(View.VISIBLE, mVictim.getVisibility());
-
-        newTop = mVictim.getTop();
-        assertEquals(oldTop, newTop);
-    }
-
-    @MediumTest
-    public void testInvisibleToGone() throws Exception {
-        sendKeys("DPAD_RIGHT");
-        assertTrue(mInvisible.hasFocus());
-
-        int oldTop = mVictim.getTop();
-
-        sendKeys("DPAD_CENTER");
-        assertEquals(View.INVISIBLE, mVictim.getVisibility());
-
-        int newTop = mVictim.getTop();
-        assertEquals(oldTop, newTop);
-
-        sendKeys("DPAD_RIGHT DPAD_CENTER");
-        assertEquals(View.GONE, mVictim.getVisibility());
-
-        int refDownTop = mRefDown.getTop();
-        assertEquals(oldTop, refDownTop);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ZeroSized.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ZeroSized.java
deleted file mode 100755
index 0f0e091421d4e3b6f9e79ddc2adfb10dd7bb1054..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ZeroSized.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-import android.os.Bundle;
-import android.app.Activity;
-
-/**
- * This activity contains Views with various widths and heights. The goal is to exercise the
- * drawing cache when width is null, height is null or both.
- */
-public class ZeroSized extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.zero_sized);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ZeroSizedTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ZeroSizedTest.java
deleted file mode 100755
index 997d92e90686b1985ee488f0332331b9f5706921..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/ZeroSizedTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests;
-
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.View;
-import android.graphics.Bitmap;
-
-/**
- * Builds the drawing cache of Views of various dimension. The assumption is that
- * a View with a 0-sized dimension (width or height) will always have a null
- * drawing cache.
- */
-public class ZeroSizedTest extends ActivityInstrumentationTestCase<ZeroSized> {
-    private View mWithDimension;
-    private View mWithNoWdith;
-    private View mWithNoHeight;
-    private View mWithNoDimension;
-
-    public ZeroSizedTest() {
-        super("com.mediatek.common.view.tests", ZeroSized.class);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-
-        final ZeroSized activity = getActivity();
-        mWithDimension = activity.findViewById(R.id.dimension);
-        mWithNoWdith = activity.findViewById(R.id.noWidth);
-        mWithNoHeight = activity.findViewById(R.id.noHeight);
-        mWithNoDimension = activity.findViewById(R.id.noDimension);
-    }
-
-    @MediumTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mWithDimension);
-        assertNotNull(mWithNoWdith);
-        assertNotNull(mWithNoHeight);
-        assertNotNull(mWithNoDimension);
-    }
-
-    @MediumTest
-    public void testDrawingCacheWithDimension() throws Exception {
-        assertTrue(mWithDimension.getWidth() > 0);
-        assertTrue(mWithDimension.getHeight() > 0);
-        assertNotNull(createCacheForView(mWithDimension));
-    }
-
-    @MediumTest
-    public void testDrawingCacheWithNoWidth() throws Exception {
-        assertTrue(mWithNoWdith.getWidth() == 0);
-        assertTrue(mWithNoWdith.getHeight() > 0);
-        assertNull(createCacheForView(mWithNoWdith));
-    }
-
-    @MediumTest
-    public void testDrawingCacheWithNoHeight() throws Exception {
-        assertTrue(mWithNoHeight.getWidth() > 0);
-        assertTrue(mWithNoHeight.getHeight() == 0);
-        assertNull(createCacheForView(mWithNoHeight));
-    }
-
-    @MediumTest
-    public void testDrawingCacheWithNoDimension() throws Exception {
-        assertTrue(mWithNoDimension.getWidth() == 0);
-        assertTrue(mWithNoDimension.getHeight() == 0);
-        assertNull(createCacheForView(mWithNoDimension));
-    }
-
-    private Bitmap createCacheForView(final View view) {
-        final Bitmap[] cache = new Bitmap[1];
-        getActivity().runOnUiThread(new Runnable() {
-            public void run() {
-                view.setDrawingCacheEnabled(true);
-                view.invalidate();
-                view.buildDrawingCache();
-                cache[0] = view.getDrawingCache();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-        return cache[0];
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/accessibility/RecycleAccessibilityEventTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/accessibility/RecycleAccessibilityEventTest.java
deleted file mode 100755
index 08098d52d0e78c02821083305181fdc209f133f6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/accessibility/RecycleAccessibilityEventTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.accessibility;
-
-import android.test.suitebuilder.annotation.SmallTest;
-
-import junit.framework.TestCase;
-
-import android.view.accessibility.AccessibilityEvent;
-
-/**
- * This class exercises the caching and recycling of {@link AccessibilityEvent}s.
- */
-public class RecycleAccessibilityEventTest extends TestCase {
-
-    private static final String CLASS_NAME = "foo.bar.baz.Test";
-    private static final String PACKAGE_NAME = "foo.bar.baz";
-    private static final String TEXT = "Some stuff";
-
-    private static final String CONTENT_DESCRIPTION = "Content description";
-    private static final int ITEM_COUNT = 10;
-    private static final int CURRENT_ITEM_INDEX = 1;
-
-    private static final int FROM_INDEX = 1;
-    private static final int ADDED_COUNT = 2;
-    private static final int REMOVED_COUNT = 1;
-
-    /**
-     * If an {@link AccessibilityEvent} is marshaled/unmarshaled correctly
-     */
-    @SmallTest
-    public void testAccessibilityEventViewTextChangedType() {
-        AccessibilityEvent first =
-            AccessibilityEvent.obtain(AccessibilityEvent.TYPE_VIEW_TEXT_CHANGED);
-        assertNotNull(first);
-
-        first.setClassName(CLASS_NAME);
-        first.setPackageName(PACKAGE_NAME);
-        first.getText().add(TEXT);
-        first.setFromIndex(FROM_INDEX);
-        first.setAddedCount(ADDED_COUNT);
-        first.setRemovedCount(REMOVED_COUNT);
-        first.setChecked(true);
-        first.setContentDescription(CONTENT_DESCRIPTION);
-        first.setItemCount(ITEM_COUNT);
-        first.setCurrentItemIndex(CURRENT_ITEM_INDEX);
-        first.setEnabled(true);
-        first.setPassword(true);
-
-        first.recycle();
-
-        assertNotNull(first);
-        assertNull(first.getClassName());
-        assertNull(first.getPackageName());
-        assertEquals(0, first.getText().size());
-        assertFalse(first.isChecked());
-        assertNull(first.getContentDescription());
-        assertEquals(-1, first.getItemCount());
-        assertEquals(AccessibilityEvent.INVALID_POSITION, first.getCurrentItemIndex());
-        assertFalse(first.isEnabled());
-        assertFalse(first.isPassword());
-        assertEquals(-1, first.getFromIndex());
-        assertEquals(-1, first.getAddedCount());
-        assertEquals(-1, first.getRemovedCount());
-
-        // get another event from the pool (this must be the recycled first)
-        AccessibilityEvent second = AccessibilityEvent.obtain();
-        assertEquals(first, second);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AccelerateDecelerateInterpolatorTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AccelerateDecelerateInterpolatorTest.java
deleted file mode 100755
index 3b0f1b9327c939ae435da048a9292171a710bd76..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AccelerateDecelerateInterpolatorTest.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import com.mediatek.common.view.tests.R;
-
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-
-import android.app.Activity;
-import android.content.res.XmlResourceParser;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.AttributeSet;
-import android.util.Xml;
-import android.view.View;
-import android.view.animation.AccelerateDecelerateInterpolator;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.view.animation.Interpolator;
-import android.view.animation.Transformation;
-
-@TestTargetClass(AccelerateDecelerateInterpolator.class)
-public class AccelerateDecelerateInterpolatorTest
-        extends ActivityInstrumentationTestCase2<AnimationTestStubActivity> {
-
-    private Activity mActivity;
-    private static final float ALPHA_DELTA = 0.001f;
-    /** It is defined in R.anim.accelarate_decelerate_alpha */
-    private static final long ALPHA_DURATION = 2000;
-
-    public AccelerateDecelerateInterpolatorTest() {
-        super("com.android.cts.stub", AnimationTestStubActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "AccelerateDecelerateInterpolator",
-            args = { }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "AccelerateDecelerateInterpolator",
-            args = {android.content.Context.class, android.util.AttributeSet.class }
-        )
-    })
-    public void testConstructor() {
-        new AccelerateDecelerateInterpolator();
-
-        XmlResourceParser parser = mActivity.getResources().getAnimation(
-                R.anim.accelerate_decelerate_alpha);
-        AttributeSet attrs = Xml.asAttributeSet(parser);
-        new AccelerateDecelerateInterpolator(mActivity, attrs);
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        notes = "Test case will accelerate then decelerate AlphaAnimation. It will change"
-              + " alpha from 0.0 to 1.0, the rate of changing alpha starts out slowly, then"
-              + " accelerates to the middle, and then decelerates to the end",
-        method = "getInterpolation",
-        args = {float.class }
-    )
-    public void testAccelerateDecelerateInterpolator() {
-        final View animWindow = mActivity.findViewById(R.id.anim_window);
-
-        // XML file of R.anim.accelerate_decelerate_alpha
-        // <alpha xmlns:android="http://schemas.android.com/apk/res/android"
-        //      android:interpolator="@android:anim/accelerate_decelerate_interpolator"
-        //      android:fromAlpha="0.0"
-        //      android:toAlpha="1.0"
-        //      android:duration="2000" />
-        final Animation anim = AnimationUtils.loadAnimation(mActivity,
-                R.anim.accelerate_decelerate_alpha);
-        assertEquals(ALPHA_DURATION, anim.getDuration());
-        assertTrue(anim instanceof AlphaAnimation);
-        assertFalse(anim.hasStarted());
-
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, anim);
-
-        Transformation transformation = new Transformation();
-        long startTime = anim.getStartTime();
-        anim.getTransformation(startTime, transformation);
-        float alpha1 = transformation.getAlpha();
-        assertEquals(0.0f, alpha1, ALPHA_DELTA);
-
-        anim.getTransformation(startTime + 500, transformation);
-        float alpha2 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + 1000, transformation);
-        float alpha3 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + 1500, transformation);
-        float alpha4 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + ALPHA_DURATION, transformation);
-        float alpha5 = transformation.getAlpha();
-        assertEquals(1.0f, alpha5, ALPHA_DELTA);
-
-        // check accelerating and decelerating delta alpha
-        // starts and ends slowly, accelerates through middle
-        float delta1 = alpha2 - alpha1;
-        float delta2 = alpha3 - alpha2;
-        float delta3 = alpha4 - alpha3;
-        float delta4 = alpha5 - alpha4;
-        assertTrue(delta1 < delta2);
-        assertTrue(delta3 > delta4);
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        notes = "Test getInterpolation(float), call it directly.",
-        method = "getInterpolation",
-        args = {float.class }
-    )
-    public void testGetInterpolation() {
-        Interpolator interpolator = new AccelerateDecelerateInterpolator();
-
-        float alpha1 = interpolator.getInterpolation(0f);
-        float alpha2 = interpolator.getInterpolation(0.25f);
-        float alpha3 = interpolator.getInterpolation(0.5f);
-        float alpha4 = interpolator.getInterpolation(0.75f);
-        float alpha5 = interpolator.getInterpolation(1f);
-        // check accelerating and decelerating delta alpha
-        // starts and ends slowly, accelerates through middle
-        float delta1 = alpha2 - alpha1;
-        float delta2 = alpha3 - alpha2;
-        float delta3 = alpha4 - alpha3;
-        float delta4 = alpha5 - alpha4;
-        assertTrue(delta1 < delta2);
-        assertTrue(delta3 > delta4);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AccelerateInterpolatorTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AccelerateInterpolatorTest.java
deleted file mode 100755
index 68ded4b02191e58570609b55bb2be75bf65eeb17..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AccelerateInterpolatorTest.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import com.mediatek.common.view.tests.R;
-
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-
-import android.app.Activity;
-import android.content.res.XmlResourceParser;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.AttributeSet;
-import android.util.Xml;
-import android.view.View;
-import android.view.animation.AccelerateInterpolator;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.view.animation.Interpolator;
-import android.view.animation.Transformation;
-
-@TestTargetClass(AccelerateInterpolator.class)
-public class AccelerateInterpolatorTest
-        extends ActivityInstrumentationTestCase2<AnimationTestStubActivity> {
-
-    public AccelerateInterpolatorTest() {
-        super("com.android.cts.stub", AnimationTestStubActivity.class);
-    }
-
-    private Activity mActivity;
-    private static final float ALPHA_DELTA = 0.001f;
-
-    /** It is defined in R.anim.accelerate_alpha */
-    private static final long ACCELERATE_ALPHA_DURATION = 1000;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "AccelerateInterpolator",
-            args = { }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "AccelerateInterpolator",
-            args = {float.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "AccelerateInterpolator",
-            args = {android.content.Context.class, android.util.AttributeSet.class }
-        )
-    })
-    public void testConstructor() {
-        new AccelerateInterpolator();
-
-        new AccelerateInterpolator(1.0f);
-
-        XmlResourceParser parser = mActivity.getResources().getAnimation(R.anim.accelerate_alpha);
-        AttributeSet attrs = Xml.asAttributeSet(parser);
-        new AccelerateInterpolator(mActivity, attrs);
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        notes = "Test case will accelerate AlphaAnimation. It will change alpha from 0.1 to"
-              + " 0.9, the rate of change alpha starts out slowly and then accelerates.",
-        method = "getInterpolation",
-        args = {float.class }
-    )
-    public void testAccelerateInterpolator() {
-        final View animWindow = mActivity.findViewById(R.id.anim_window);
-
-        // XML file of R.anim.accelerate_alpha
-        // <alpha xmlns:android="http://schemas.android.com/apk/res/android"
-        //      android:interpolator="@android:anim/accelerate_interpolator"
-        //      android:fromAlpha="0.1"
-        //      android:toAlpha="0.9"
-        //      android:duration="1000" />
-        final Animation anim = AnimationUtils.loadAnimation(mActivity, R.anim.accelerate_alpha);
-
-        assertEquals(ACCELERATE_ALPHA_DURATION, anim.getDuration());
-        assertTrue(anim instanceof AlphaAnimation);
-
-        // factor is 1.0f
-        Interpolator interpolator = new AccelerateInterpolator(1.0f);
-        anim.setInterpolator(interpolator);
-        assertFalse(anim.hasStarted());
-
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, anim);
-
-        Transformation transformation = new Transformation();
-        long startTime = anim.getStartTime();
-        anim.getTransformation(startTime, transformation);
-        float alpha1 = transformation.getAlpha();
-        assertEquals(0.1f, alpha1, ALPHA_DELTA);
-
-        anim.getTransformation(startTime + 250, transformation);
-        float alpha2 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + 500, transformation);
-        float alpha3 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + 750, transformation);
-        float alpha4 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + ACCELERATE_ALPHA_DURATION, transformation);
-        float alpha5 = transformation.getAlpha();
-        assertEquals(0.9f, alpha5, ALPHA_DELTA);
-
-        // check accelerating delta alpha
-        float delta1 = alpha2 - alpha1;
-        float delta2 = alpha3 - alpha2;
-        float delta3 = alpha4 - alpha3;
-        float delta4 = alpha5 - alpha4;
-        assertTrue(delta1 < delta2);
-        assertTrue(delta2 < delta3);
-        assertTrue(delta3 < delta4);
-
-        // factor is 1.5f, it starts even slower and ends even faster than 1.0f
-        interpolator = new AccelerateInterpolator(1.5f);
-        anim.setInterpolator(interpolator);
-
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, anim);
-
-        transformation = new Transformation();
-        startTime = anim.getStartTime();
-        anim.getTransformation(startTime, transformation);
-        float alpha6 = transformation.getAlpha();
-        assertEquals(0.1f, alpha1, ALPHA_DELTA);
-
-        anim.getTransformation(startTime + 250, transformation);
-        float alpha7 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + 500, transformation);
-        float alpha8 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + 750, transformation);
-        float alpha9 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + ACCELERATE_ALPHA_DURATION, transformation);
-        float alpha10 = transformation.getAlpha();
-        assertEquals(0.9f, alpha5, ALPHA_DELTA);
-
-        // check accelerating delta alpha
-        float delta5 = alpha7 - alpha6;
-        float delta6 = alpha8 - alpha7;
-        float delta7 = alpha9 - alpha8;
-        float delta8 = alpha10 - alpha9;
-        assertTrue(delta5 < delta6);
-        assertTrue(delta6 < delta7);
-        assertTrue(delta7 < delta8);
-
-        // check whether it starts even slower
-        assertTrue(delta5 < delta1);
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        notes = "Test getInterpolation(float), call it directly",
-        method = "getInterpolation",
-        args = {float.class }
-    )
-    public void testGetInterpolation() {
-        final float input = 0.25f;
-        Interpolator interpolator1 = new AccelerateInterpolator(1.0f);
-        // factor is 2.0f, it starts even slower and ends even faster than 1.0f
-        Interpolator interpolator2 = new AccelerateInterpolator(2.0f);
-
-        float delta1 = interpolator1.getInterpolation(input);
-        float delta2 = interpolator2.getInterpolation(input);
-
-        // check whether it starts even slower
-        assertTrue(delta2 < delta1);
-
-        // call directly
-        Interpolator interpolator = new AccelerateInterpolator();
-
-        float alpha1 = interpolator.getInterpolation(0f);
-        float alpha2 = interpolator.getInterpolation(0.25f);
-        float alpha3 = interpolator.getInterpolation(0.5f);
-        float alpha4 = interpolator.getInterpolation(0.75f);
-        float alpha5 = interpolator.getInterpolation(1f);
-        // check accelerating and decelerating delta alpha
-        // starts and ends slowly, accelerates through middle
-        float delta3 = alpha2 - alpha1;
-        float delta4 = alpha3 - alpha2;
-        float delta5 = alpha4 - alpha3;
-        float delta6 = alpha5 - alpha4;
-        assertTrue(delta3 < delta4);
-        assertTrue(delta4 < delta5);
-        assertTrue(delta5 < delta6);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AlphaAnimationTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AlphaAnimationTest.java
deleted file mode 100755
index 09b145dc5975c1abcab2746f5fe476f7935771cb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AlphaAnimationTest.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import android.content.res.XmlResourceParser;
-import android.test.AndroidTestCase;
-import android.util.AttributeSet;
-import android.util.Xml;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Transformation;
-import dalvik.annotation.TestTargets;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-
-import com.mediatek.common.view.tests.R;
-
-
-/**
- * Test {@link AlphaAnimation}.
- */
-@TestTargetClass(AlphaAnimation.class)
-public class AlphaAnimationTest extends AndroidTestCase {
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            notes = "Test constructor(s) of {@link AlphaAnimation}",
-            method = "AlphaAnimation",
-            args = {float.class, float.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            notes = "Test constructor(s) of {@link AlphaAnimation}",
-            method = "AlphaAnimation",
-            args = {android.content.Context.class, android.util.AttributeSet.class }
-        )
-    })
-    public void testConstructor() {
-        XmlResourceParser parser = mContext.getResources().getAnimation(R.anim.alpha);
-        AttributeSet attrs = Xml.asAttributeSet(parser);
-        new AlphaAnimation(mContext, attrs);
-
-        new AlphaAnimation(0.0f, 1.0f);
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            notes = "Test {@link AlphaAnimation#willChangeBounds()}. This method always" +
-                    " returns false, a alpha animation will not affect the bounds",
-            method = "willChangeBounds",
-            args = { }
-        )
-    })
-    public void testWillChangeBounds() {
-        AlphaAnimation animation = new AlphaAnimation(mContext, null);
-        assertFalse(animation.willChangeBounds());
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        notes = "test {@link AlphaAnimation#willChangeTransformationMatrix()}. This method" +
-                " always returns false, a alpha animation will not affect the matrix",
-        method = "willChangeTransformationMatrix",
-        args = { }
-    )
-    public void testWillChangeTransformationMatrix() {
-        AlphaAnimation animation = new AlphaAnimation(0.0f, 0.5f);
-        assertFalse(animation.willChangeTransformationMatrix());
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        notes = "Test {@link AlphaAnimation#applyTransformation(float, Transformation)}",
-        method = "applyTransformation",
-        args = {float.class, android.view.animation.Transformation.class }
-    )
-    public void testApplyTransformation() {
-        MyAlphaAnimation animation = new MyAlphaAnimation(0.0f, 1.0f);
-        Transformation transformation = new Transformation();
-        assertEquals(1.0f, transformation.getAlpha(), 0.0001f);
-
-        animation.applyTransformation(0.0f, transformation);
-        assertEquals(0.0f, transformation.getAlpha(), 0.0001f);
-
-        animation.applyTransformation(0.5f, transformation);
-        assertEquals(0.5f, transformation.getAlpha(), 0.0001f);
-
-        animation.applyTransformation(1.0f, transformation);
-        assertEquals(1.0f, transformation.getAlpha(), 0.0001f);
-
-        animation = new MyAlphaAnimation(0.2f, 0.9f);
-        transformation = new Transformation();
-        assertEquals(1.0f, transformation.getAlpha(), 0.0001f);
-
-        animation.applyTransformation(0.0f, transformation);
-        assertEquals(0.2f, transformation.getAlpha(), 0.0001f);
-
-        animation.applyTransformation(0.5f, transformation);
-        assertEquals(0.55f, transformation.getAlpha(), 0.0001f);
-
-        animation.applyTransformation(1.0f, transformation);
-        assertEquals(0.9f, transformation.getAlpha(), 0.0001f);
-    }
-
-    private final class MyAlphaAnimation extends AlphaAnimation {
-        public MyAlphaAnimation(float fromAlpha, float toAlpha) {
-            super(fromAlpha, toAlpha);
-        }
-
-        @Override
-        protected void applyTransformation(float interpolatedTime, Transformation t) {
-            super.applyTransformation(interpolatedTime, t);
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimationActivity.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimationActivity.java
deleted file mode 100755
index 77e8a7664f13ae643ce9088f0b4e3adab2fbb7c1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimationActivity.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import com.mediatek.common.view.tests.R;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.animation.ArgbEvaluator;
-import android.animation.ObjectAnimator;
-import android.animation.TimeInterpolator;
-import android.animation.ValueAnimator;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.RadialGradient;
-import android.graphics.Shader;
-import android.graphics.drawable.ShapeDrawable;
-import android.graphics.drawable.shapes.OvalShape;
-import android.os.Bundle;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.animation.AccelerateInterpolator;
-import java.util.ArrayList;
-
-public class AnimationActivity extends Activity {
-    private static final String BALL_HEIGHT = "ballwidth";
-    private static final String BALL_WIDTH = "ballheight";
-    private static final String STARTX = "startx";
-    private static final String STARTY = "starty";
-    private static final String DELTAX = "deltax";
-    private static final String DELTAY = "deltay";
-    private static final String DURATION = "duration";
-
-    float mBallHeight = 50f;
-    float mBallWidth = 50f;
-    float mStartX = 200f;
-    float mStartY = 200f;
-    float mDeltaX = 200f;
-    float mDeltaY = 200f;
-    long mDuration = 1000;
-    public AnimationView view = null;
-
-    @Override
-    public void onCreate(Bundle bundle) {
-        super.onCreate(bundle);
-        Intent intent = this.getIntent();
-        Bundle extras = intent.getExtras();
-        if (extras != null) {
-            mBallHeight = extras.getFloat(BALL_HEIGHT);
-            mBallWidth = extras.getFloat(BALL_WIDTH);
-            mStartX = extras.getFloat(STARTX);
-            mStartY = extras.getFloat(STARTY);
-            mDeltaX = extras.getFloat(DELTAX);
-            mDeltaY = extras.getFloat(DELTAY);
-            mDuration = extras.getInt(DURATION);
-        }
-        setContentView(R.layout.animation_main);
-        view = new AnimationView(this);
-        ViewGroup viewGroup = (ViewGroup) findViewById(R.id.container);
-        viewGroup.addView(view);
-    }
-
-    public ValueAnimator createAnimator(Object object, String propertyName, long duration,
-            int repeatCount, int repeatMode,
-            TimeInterpolator timeInterpolator, float start, float end) {
-        ValueAnimator valueAnimator = ObjectAnimator.ofFloat(object, propertyName, start, end);
-        valueAnimator.setDuration(duration);
-        valueAnimator.setRepeatCount(repeatCount);
-        valueAnimator.setInterpolator(timeInterpolator);
-        valueAnimator.setRepeatMode(repeatMode);
-        return valueAnimator;
-    }
-
-    public ValueAnimator createAnimatorWithRepeatMode(int repeatMode) {
-        return createAnimator(view.newBall, "y", 1000, ValueAnimator.INFINITE, repeatMode,
-                new AccelerateInterpolator(), mStartY, mStartY + mDeltaY);
-    }
-
-    public ValueAnimator createAnimatorWithRepeatCount(int repeatCount) {
-        return createAnimator(view.newBall, "y", 1000, repeatCount, ValueAnimator.REVERSE,
-                new AccelerateInterpolator(), mStartY, mStartY + mDeltaY);
-    }
-
-    public ValueAnimator createAnimatorWithDuration(long duration) {
-        return createAnimator(view.newBall, "y", duration , ValueAnimator.INFINITE,
-                ValueAnimator.REVERSE, new AccelerateInterpolator(), mStartY, mStartY + mDeltaY);
-    }
-
-    public ValueAnimator createAnimatorWithInterpolator(TimeInterpolator interpolator) {
-        return createAnimator(view.newBall, "y", 1000, ValueAnimator.INFINITE,
-                ValueAnimator.REVERSE, interpolator, mStartY, mStartY + mDeltaY);
-    }
-
-    public ValueAnimator createObjectAnimatorForInt(Object object, String propertyName,
-            long duration, int repeatCount, int repeatMode, TimeInterpolator timeInterpolator,
-            int start, int end) {
-        ObjectAnimator objAnimator = ObjectAnimator.ofInt(object, propertyName, start, end);
-        objAnimator.setDuration(duration);
-
-        objAnimator.setRepeatCount(repeatCount);
-        objAnimator.setInterpolator(timeInterpolator);
-        objAnimator.setRepeatMode(repeatMode);
-        return objAnimator;
-    }
-
-    public ValueAnimator createObjectAnimatorForInt() {
-        ObjectAnimator objAnimator = ObjectAnimator.ofInt(view.newBall, "y", (int) mStartY,
-            (int) (mStartY + mDeltaY));
-        objAnimator.setDuration(mDuration);
-
-        objAnimator.setRepeatCount(ValueAnimator.INFINITE);
-        objAnimator.setInterpolator(new AccelerateInterpolator());
-        objAnimator.setRepeatMode(ValueAnimator.REVERSE);
-        return objAnimator;
-    }
-
-    public void startAnimation(long duration) {
-        ValueAnimator bounceAnimator = ObjectAnimator.ofFloat(view.newBall, "y", mStartY,
-            mStartY + mDeltaY);
-        bounceAnimator.setDuration(duration);
-        bounceAnimator.setRepeatCount(ValueAnimator.INFINITE);
-        bounceAnimator.setInterpolator(new AccelerateInterpolator());
-        bounceAnimator.setRepeatMode(ValueAnimator.REVERSE);
-        view.bounceYAnimator = bounceAnimator;
-        view.startColorAnimator();
-        view.animateBall();
-    }
-
-    public void startAnimation(ValueAnimator valueAnimator) {
-        view.bounceYAnimator = valueAnimator;
-        view.startColorAnimator();
-        view.animateBall();
-    }
-
-    public void startAnimation(Animator animator) {
-        view.bounceYAnimator = (ValueAnimator) animator;
-        view.startColorAnimator();
-        view.animateBall();
-    }
-
-    public void startAnimation(ObjectAnimator bounceAnimator) {
-        view.bounceYAnimator = bounceAnimator;
-        view.startColorAnimator();
-        view.animateBall();
-    }
-
-    public void startAnimation(ObjectAnimator bounceAnimator, ObjectAnimator colorAnimator) {
-        view.bounceYAnimator = bounceAnimator;
-        view.startColorAnimator(colorAnimator);
-        view.animateBall();
-    }
-
-    public void startAnimatorSet(AnimatorSet set) {
-        view.startColorAnimator();
-        view.animateBall(set);
-    }
-
-    public void startColorAnimation(ValueAnimator colorAnimator) {
-        view.startColorAnimator(colorAnimator);
-    }
-
-    public class AnimationView extends View {
-        public static final int RED = 0xffFF8080;
-        public static final int BLUE = 0xff8080FF;
-        public ShapeHolder newBall = null;
-        public final ArrayList<ShapeHolder> balls = new ArrayList<ShapeHolder>();
-        AnimatorSet animation = null;
-        public ValueAnimator bounceYAnimator;
-        public ValueAnimator bounceXAnimator;
-        public ValueAnimator colorAnimator;
-
-        public AnimationView(Context context) {
-            super(context);
-            newBall = addBall(mBallHeight, mBallWidth);
-        }
-
-        public void startColorAnimator() {
-            colorAnimator = ObjectAnimator.ofInt(this, "backgroundColor", RED, BLUE);
-            colorAnimator.setDuration(1000);
-            colorAnimator.setEvaluator(new ArgbEvaluator());
-            colorAnimator.setRepeatCount(ValueAnimator.INFINITE);
-            colorAnimator.setRepeatMode(ValueAnimator.REVERSE);
-            colorAnimator.start();
-        }
-
-        public void startColorAnimator(ValueAnimator animator) {
-            this.colorAnimator = animator;
-            colorAnimator.start();
-        }
-
-        @Override
-        public boolean onTouchEvent(MotionEvent event) {
-            return true;
-        }
-
-        public void animateBall() {
-            AnimatorSet bouncer = new AnimatorSet();
-            bouncer.play(bounceYAnimator);
-            // Fading animation - remove the ball when the animation is done
-            ValueAnimator fadeAnim = ObjectAnimator.ofFloat(newBall, "alpha", 1f, 0f);
-            fadeAnim.setDuration(250);
-            fadeAnim.addListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(Animator animation) {
-                    balls.remove(((ObjectAnimator) animation).getTarget());
-                }
-            });
-
-            // Sequence the two animations to play one after the other
-            AnimatorSet animatorSet = new AnimatorSet();
-            animatorSet.play(bouncer).before(fadeAnim);
-            animatorSet.start();
-        }
-
-        public void animateBall(AnimatorSet set) {
-            set.start();
-        }
-
-        private ShapeHolder addBall(float x, float y) {
-            OvalShape circle = new OvalShape();
-            circle.resize(x, y);
-            ShapeDrawable drawable = new ShapeDrawable(circle);
-            ShapeHolder shapeHolder = new ShapeHolder(drawable);
-            shapeHolder.setX(x - 25f);
-            shapeHolder.setY(y - 25f);
-            Paint paint = drawable.getPaint();
-            shapeHolder.setPaint(paint);
-            int red = (int) (Math.random() * 255);
-            int green = (int) (Math.random() * 255);
-            int blue = (int) (Math.random() * 255);
-            int color = 0xff000000 | red << 16 | green << 8 | blue;
-            int darkColor = 0xff000000 | red / 4 << 16 | green / 4 << 8 | blue / 4;
-            RadialGradient gradient = new RadialGradient(37.5f, 12.5f,
-                    50f, color, darkColor, Shader.TileMode.CLAMP);
-            paint.setShader(gradient);
-            balls.add(shapeHolder);
-            return shapeHolder;
-        }
-
-        @Override
-        protected void onDraw(Canvas canvas) {
-            for (int i = 0; i < balls.size(); ++i) {
-                ShapeHolder shapeHolder = balls.get(i);
-                canvas.save();
-                canvas.translate(shapeHolder.getX(), shapeHolder.getY());
-                shapeHolder.getShape().draw(canvas);
-                canvas.restore();
-            }
-        }
-    }
-}
-
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimationSetTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimationSetTest.java
deleted file mode 100755
index 78fc17e97cc94d50c635d3145ce09feb703a332f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimationSetTest.java
+++ /dev/null
@@ -1,586 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import java.util.List;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.res.XmlResourceParser;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.AttributeSet;
-import android.util.Xml;
-import android.view.View;
-import android.view.animation.AccelerateInterpolator;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
-import android.view.animation.AnimationSet;
-import android.view.animation.ScaleAnimation;
-import android.view.animation.Transformation;
-import android.view.animation.TranslateAnimation;
-
-import com.mediatek.common.view.tests.R;
-
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-import dalvik.annotation.ToBeFixed;
-
-@TestTargetClass(AnimationSet.class)
-public class AnimationSetTest
-        extends ActivityInstrumentationTestCase2<AnimationTestStubActivity> {
-
-    private static final float DELTA = 0.001f;
-    private static final long SHORT_CHILD_DURATION = 400;
-    private static final long MEDIUM_CHILD_DURATION = 800;
-    private static final long LONG_CHILD_DURATION = 1200;
-    /**
-     * initial size for initialize(int width, int height, int parentWidth, int parentHeight)
-     */
-    private static final int INITIAL_SIZE = 100;
-    private static final long ANIMATIONSET_DURATION = 1000;
-    private Activity mActivity;
-
-    public AnimationSetTest() {
-        super("com.android.cts.stub", AnimationTestStubActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "AnimationSet",
-            args = {boolean.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "AnimationSet",
-            args = {Context.class, AttributeSet.class }
-        )
-    })
-    public void testConstructor() {
-        new AnimationSet(true);
-
-        final XmlResourceParser parser = mActivity.getResources().getAnimation(
-                R.anim.anim_set);
-        final AttributeSet attr = Xml.asAttributeSet(parser);
-        assertNotNull(attr);
-        // Test with real AttributeSet
-        new AnimationSet(mActivity, attr);
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "initialize",
-        args = {int.class, int.class, int.class, int.class }
-    )
-    @ToBeFixed(bug = "1695243", explanation = "Android API javadocs are incomplete."
-            + "It does not only initialize this animation with the dimensions.")
-    public void testInitialize() {
-        final AnimationSet animationSet = createAnimationSet();
-        animationSet.setDuration(ANIMATIONSET_DURATION);
-        // Before initialize, the durations are original.
-        List<Animation> children = animationSet.getAnimations();
-        assertEquals(SHORT_CHILD_DURATION, children.get(0).getDuration());
-        assertEquals(MEDIUM_CHILD_DURATION, children.get(1).getDuration());
-        assertEquals(LONG_CHILD_DURATION, children.get(2).getDuration());
-
-        // After initialize, AnimationSet override the child values.
-        assertFalse(animationSet.isInitialized());
-        animationSet.initialize(INITIAL_SIZE, INITIAL_SIZE, INITIAL_SIZE, INITIAL_SIZE);
-        assertTrue(animationSet.isInitialized());
-        children = animationSet.getAnimations();
-        assertEquals(ANIMATIONSET_DURATION, children.get(0).getDuration());
-        assertEquals(ANIMATIONSET_DURATION, children.get(1).getDuration());
-        assertEquals(ANIMATIONSET_DURATION, children.get(2).getDuration());
-    }
-
-    private AnimationSet createAnimationSet() {
-        AnimationSet animationSet = new AnimationSet(true);
-
-        Animation animation1 = new AlphaAnimation(0.0f, 1.0f);
-        animation1.setDuration(SHORT_CHILD_DURATION);
-        animationSet.addAnimation(animation1);
-
-        Animation animation2 = new ScaleAnimation(1.0f, 2.0f, 1.0f, 3.0f);
-        animation2.setDuration(MEDIUM_CHILD_DURATION);
-        animationSet.addAnimation(animation2);
-
-        Animation animation3 = new TranslateAnimation(0.0f, 50.0f, 0.0f, 5.0f);
-        animation3.setDuration(LONG_CHILD_DURATION);
-        animationSet.addAnimation(animation3);
-
-        return animationSet;
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "setFillAfter",
-        args = {boolean.class }
-    )
-    public void testSetFillAfter() {
-        final AnimationSet animationSet = createAnimationSet();
-        assertFalse(animationSet.getFillAfter());
-
-        List<Animation> children = animationSet.getAnimations();
-        children.get(0).setFillAfter(true);
-        children.get(1).setFillAfter(false);
-
-        animationSet.setFillAfter(true);
-        animationSet.initialize(INITIAL_SIZE, INITIAL_SIZE, INITIAL_SIZE, INITIAL_SIZE);
-        assertTrue(animationSet.getFillAfter());
-        children = animationSet.getAnimations();
-        for (int i = 0; i < children.size(); i++) {
-            assertTrue(children.get(i).getFillAfter());
-        }
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "setFillBefore",
-        args = {boolean.class }
-    )
-    public void testSetFillBefore() {
-        final AnimationSet animationSet = createAnimationSet();
-        assertTrue(animationSet.getFillBefore());
-
-        List<Animation> children = animationSet.getAnimations();
-        children.get(0).setFillBefore(true);
-        children.get(1).setFillBefore(false);
-
-        animationSet.setFillBefore(false);
-        animationSet.initialize(INITIAL_SIZE, INITIAL_SIZE, INITIAL_SIZE, INITIAL_SIZE);
-        assertFalse(animationSet.getFillBefore());
-        children = animationSet.getAnimations();
-        for (int i = 0; i < children.size(); i++) {
-            assertFalse(children.get(i).getFillBefore());
-        }
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "setDuration",
-            args = {long.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "getDuration",
-            args = { }
-        )
-    })
-    public void testAccessDuration() {
-        final AnimationSet animationSet = createAnimationSet();
-        assertEquals(LONG_CHILD_DURATION, animationSet.getDuration());
-
-        assertTrue(animationSet.getDuration() > ANIMATIONSET_DURATION);
-        animationSet.setDuration(ANIMATIONSET_DURATION);
-        animationSet.initialize(INITIAL_SIZE, INITIAL_SIZE, INITIAL_SIZE, INITIAL_SIZE);
-        assertEquals(ANIMATIONSET_DURATION, animationSet.getDuration());
-        final List<Animation> children = animationSet.getAnimations();
-        for (int i = 0; i < children.size(); i++) {
-            assertEquals(ANIMATIONSET_DURATION, children.get(i).getDuration());
-        }
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "restrictDuration",
-        args = {long.class }
-    )
-    public void testRestrictDuration() {
-        final AnimationSet animationSet = new AnimationSet(false);
-        Animation child = null;
-        final long[] originChildDuration = { 1000, 1000, 500 };
-        final long[] originChildStartOffset = { 2000, 1000, 0 };
-        final int[] originChildRepeatCount = { 0, 0, 4 };
-        final long[] originChildDurationHint = new long[3];
-        for (int i = 0; i < 3; i++) {
-            child = new AlphaAnimation(0.0f, 1.0f);
-            child.setDuration(originChildDuration[i]);
-            child.setStartOffset(originChildStartOffset[i]);
-            child.setRepeatCount(originChildRepeatCount[i]);
-            originChildDurationHint[i] = child.computeDurationHint();
-            animationSet.addAnimation(child);
-        }
-        final long restrictDuration = 1500;
-        animationSet.restrictDuration(restrictDuration);
-        final List<Animation> children = animationSet.getAnimations();
-
-        assertTrue(originChildStartOffset[0] > restrictDuration);
-        assertEquals(0, children.get(0).getDuration());
-        assertEquals(restrictDuration, children.get(0).getStartOffset());
-
-        assertTrue(originChildStartOffset[1] < restrictDuration);
-        assertTrue(originChildDurationHint[1] > restrictDuration);
-        assertTrue(children.get(1).computeDurationHint() <= restrictDuration);
-
-        assertTrue(originChildDurationHint[2] > restrictDuration);
-        assertTrue(children.get(2).computeDurationHint() <= restrictDuration);
-        assertTrue(originChildRepeatCount[2] > children.get(2).getRepeatCount());
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "computeDurationHint",
-        args = { }
-    )
-    public void testComputeDurationHint() {
-        final AnimationSet animationSet = createAnimationSet();
-        final List<Animation> children = animationSet.getAnimations();
-        long expectedDuration = 0;
-        for (int i = 0; i < children.size(); i++) {
-            expectedDuration = Math.max(expectedDuration, children.get(i).computeDurationHint());
-        }
-        assertEquals(expectedDuration, animationSet.computeDurationHint());
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "scaleCurrentDuration",
-        args = {float.class }
-    )
-    public void testScaleCurrentDuration() {
-        final AnimationSet animationSet = createAnimationSet();
-        List<Animation> children = animationSet.getAnimations();
-        final long[] originDurations = new long[children.size()];
-        for (int i = 0; i < children.size(); i++) {
-            originDurations[i] = children.get(i).getDuration();
-        }
-
-        final float scaleFactor = 2.0f;
-        animationSet.scaleCurrentDuration(scaleFactor);
-        children = animationSet.getAnimations();
-        for (int i = 0; i < children.size(); i++) {
-            assertEquals((long) (originDurations[i] * scaleFactor), children.get(i).getDuration());
-        }
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "setRepeatMode",
-            args = {int.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "getRepeatMode",
-            args = { }
-        )
-    })
-    public void testAccessRepeatMode() {
-        final AnimationSet animationSet = createAnimationSet();
-        animationSet.setRepeatMode(Animation.RESTART);
-        animationSet.initialize(INITIAL_SIZE, INITIAL_SIZE, INITIAL_SIZE, INITIAL_SIZE);
-        assertEquals(Animation.RESTART, animationSet.getRepeatMode());
-        List<Animation> children = animationSet.getAnimations();
-        for (int i = 0; i < children.size(); i++) {
-            assertEquals(Animation.RESTART, children.get(i).getRepeatMode());
-        }
-
-        animationSet.setRepeatMode(Animation.REVERSE);
-        animationSet.initialize(INITIAL_SIZE, INITIAL_SIZE, INITIAL_SIZE, INITIAL_SIZE);
-        assertEquals(Animation.REVERSE, animationSet.getRepeatMode());
-        children = animationSet.getAnimations();
-        for (int i = 0; i < children.size(); i++) {
-            assertEquals(Animation.REVERSE, children.get(i).getRepeatMode());
-        }
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "setStartOffset",
-            args = {long.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "getStartOffset",
-            args = { }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "reset",
-            args = { }
-        )
-    })
-    public void testAccessStartOffset() {
-        final AnimationSet animationSet = createAnimationSet();
-        assertEquals(0, animationSet.getStartOffset());
-        List<Animation> children = animationSet.getAnimations();
-        final long[] originStartOffset = new long[children.size()];
-        for (int i = 0; i < children.size(); i++) {
-            originStartOffset[i] = children.get(i).getStartOffset();
-        }
-
-        animationSet.setStartOffset(100);
-        animationSet.initialize(INITIAL_SIZE, INITIAL_SIZE, INITIAL_SIZE, INITIAL_SIZE);
-        assertEquals(100, animationSet.getStartOffset());
-        children = animationSet.getAnimations();
-        for (int i = 0; i < children.size(); i++) {
-            assertEquals(originStartOffset[i] + animationSet.getStartOffset(),
-                    children.get(i).getStartOffset());
-        }
-
-        assertTrue(animationSet.isInitialized());
-        animationSet.reset();
-        assertFalse(animationSet.isInitialized());
-        children = animationSet.getAnimations();
-        for (int i = 0; i < children.size(); i++) {
-            assertEquals(originStartOffset[i], children.get(i).getStartOffset());
-        }
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "setStartTime",
-            args = {long.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "getStartTime",
-            args = { }
-        )
-    })
-    public void testAccessStartTime() {
-        final AnimationSet animationSet = createAnimationSet();
-        final long[] originChildStartTime = {1000, 2000, 3000};
-        List<Animation> children = animationSet.getAnimations();
-        for (int i = 0; i < children.size(); i++) {
-            children.get(i).setStartTime(originChildStartTime[i]);
-        }
-
-        // Get earliest start time of children animations
-        assertEquals(1000, animationSet.getStartTime());
-
-        final long startTime = 200;
-        animationSet.setStartTime(startTime);
-        assertEquals(startTime, animationSet.getStartTime());
-
-        children = animationSet.getAnimations();
-        for (int i = 0; i < children.size(); i++) {
-            assertEquals(startTime, children.get(i).getStartTime());
-        }
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "getTransformation",
-        args = {long.class, Transformation.class }
-    )
-    public void testGetTransformation() {
-        final View animWindowParent = mActivity.findViewById(R.id.anim_window_parent);
-        final View animWindow = mActivity.findViewById(R.id.anim_window);
-        final AnimationSet animationSet = createAnimationSet();
-        animationSet.setDuration(2000);
-        animationSet.initialize(animWindow.getWidth(), animWindow.getHeight(),
-                animWindowParent.getWidth(), animWindowParent.getHeight());
-
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, animationSet);
-        final long startTime = animationSet.getStartTime();
-
-        assertGetTransformation(animationSet, startTime, true);
-        assertGetTransformation(animationSet, startTime + 100, true);
-        assertGetTransformation(animationSet, startTime + animationSet.getDuration(), false);
-    }
-
-    private void assertGetTransformation(final AnimationSet animationSet,
-            final long currentTime, final boolean result) {
-        final Transformation transformation = new Transformation();
-        final Transformation expectedTransformation = new Transformation();
-        final Transformation tempTransformation = new Transformation();
-
-        assertEquals(result, animationSet.getTransformation(currentTime, transformation));
-        final List<Animation> children = animationSet.getAnimations();
-        for (int i = children.size() - 1; i >= 0; i--) {
-            tempTransformation.clear();
-            children.get(i).getTransformation(currentTime, tempTransformation);
-            expectedTransformation.compose(tempTransformation);
-        }
-        assertTransformationEquals(expectedTransformation, transformation);
-    }
-
-    private void assertTransformationEquals(final Transformation expected,
-            final Transformation actual) {
-        assertEquals(expected.getAlpha(), actual.getAlpha(), DELTA);
-        final float[] expectedValues = new float[9];
-        final float[] actualValues = new float[9];
-        expected.getMatrix().getValues(expectedValues);
-        actual.getMatrix().getValues(actualValues);
-        for (int i = 0; i < expectedValues.length; i++) {
-            assertEquals(expectedValues[i], actualValues[i], DELTA);
-        }
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "addAnimation",
-            args = {Animation.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "getAnimations",
-            args = { }
-        )
-    })
-    public void testAccessAnimations() {
-        final AnimationSet animationSet = new AnimationSet(true);
-        final Animation animation1 = new AlphaAnimation(0.0f, 1.0f);
-        animationSet.addAnimation(animation1);
-        final Animation animation2 = new AlphaAnimation(0.5f, 1.0f);
-        animationSet.addAnimation(animation2);
-        final Animation animation3 = new AlphaAnimation(1.0f, 0.5f);
-        animationSet.addAnimation(animation3);
-
-        final List<Animation> children = animationSet.getAnimations();
-        assertEquals(3, children.size());
-        assertSame(animation1, children.get(0));
-        assertSame(animation2, children.get(1));
-        assertSame(animation3, children.get(2));
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "willChangeTransformationMatrix",
-            args = { }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "willChangeBounds",
-            args = { }
-        )
-    })
-    public void testWillChangeTransformationMatrix() {
-        final AnimationSet animationSet = new AnimationSet(true);
-        assertFalse(animationSet.willChangeTransformationMatrix());
-
-        // Add first animation, this is an alpha animation and will not change
-        // the transformation matrix.
-        animationSet.addAnimation(new AlphaAnimation(0.0f, 1.0f));
-        assertFalse(animationSet.willChangeTransformationMatrix());
-        assertFalse(animationSet.willChangeBounds());
-
-        // Add second animation, this is an scale animation and will change
-        // the transformation matrix.
-        animationSet.addAnimation(new ScaleAnimation(1.0f, 2.0f, 1.0f, 2.0f));
-        assertTrue(animationSet.willChangeTransformationMatrix());
-        assertTrue(animationSet.willChangeBounds());
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "clone",
-        args = { }
-    )
-    public void testClone() throws CloneNotSupportedException {
-        final MyAnimationSet animationSet = new MyAnimationSet(false);
-        final Animation alpha = new AlphaAnimation(0.0f, 1.0f);
-        alpha.setInterpolator(new AccelerateInterpolator());
-        alpha.initialize(INITIAL_SIZE, INITIAL_SIZE, INITIAL_SIZE, INITIAL_SIZE);
-        final Animation scale = new ScaleAnimation(1.0f, 2.0f, 1.0f, 3.0f);
-        scale.initialize(INITIAL_SIZE, INITIAL_SIZE, INITIAL_SIZE, INITIAL_SIZE);
-        animationSet.addAnimation(alpha);
-        animationSet.addAnimation(scale);
-        final long startTime = 0;
-        animationSet.setStartTime(startTime);
-        animationSet.setDuration(ANIMATIONSET_DURATION);
-        animationSet.initialize(INITIAL_SIZE, INITIAL_SIZE, INITIAL_SIZE, INITIAL_SIZE);
-
-        final AnimationSet clone = animationSet.clone();
-        clone.initialize(INITIAL_SIZE, INITIAL_SIZE, INITIAL_SIZE, INITIAL_SIZE);
-        final List<Animation> children = animationSet.getAnimations();
-        final List<Animation> cloneChildren = clone.getAnimations();
-        assertEquals(children.size(), cloneChildren.size());
-        final Transformation expectedTransformation = new Transformation();
-        final Transformation transformation = new Transformation();
-        for (int i = 0; i < children.size(); i++) {
-            children.get(i).getTransformation(startTime, expectedTransformation);
-            cloneChildren.get(i).getTransformation(startTime, transformation);
-            assertTransformationEquals(expectedTransformation, transformation);
-
-            children.get(i).getTransformation(startTime + ANIMATIONSET_DURATION / 2,
-                    expectedTransformation);
-            cloneChildren.get(i).getTransformation(startTime  + ANIMATIONSET_DURATION / 2,
-                    transformation);
-            assertTransformationEquals(expectedTransformation, transformation);
-
-            children.get(i).getTransformation(startTime + ANIMATIONSET_DURATION,
-                    expectedTransformation);
-            cloneChildren.get(i).getTransformation(startTime  + ANIMATIONSET_DURATION,
-                    transformation);
-            assertTransformationEquals(expectedTransformation, transformation);
-        }
-    }
-
-    private static class MyAnimationSet extends AnimationSet {
-
-        public MyAnimationSet(boolean shareInterpolator) {
-            super(shareInterpolator);
-        }
-
-        @Override
-        protected AnimationSet clone() throws CloneNotSupportedException {
-            return super.clone();
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimationTestStubActivity.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimationTestStubActivity.java
deleted file mode 100755
index f4531332d3f12c3f04d88734f18b1624203afb98..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimationTestStubActivity.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import com.mediatek.common.view.tests.R;
-
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class AnimationTestStubActivity extends Activity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.anim_layout);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimationTestUtils.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimationTestUtils.java
deleted file mode 100755
index 94d674a1a1cd8335be87abc5515fb771504ea03c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimationTestUtils.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import android.app.Instrumentation;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.animation.Animation;
-import android.view.animation.LayoutAnimationController;
-
-/**
- * The utility methods for animation test.
- */
-public final class AnimationTestUtils {
-    /** timeout delta when wait in case the system is sluggish */
-    private static final long TIMEOUT_DELTA = 1000;
-
-    /**
-     * no public constructor since this is a utility class
-     */
-    private AnimationTestUtils() {
-
-    }
-
-    /**
-     * Assert run an animation successfully. Timeout is duration of animation.
-     *
-     * @param instrumentation to run animation.
-     * @param view view window to run animation.
-     * @param animation will be run.
-     */
-    public static void assertRunAnimation(final Instrumentation instrumentation,
-            final View view, final Animation animation) {
-        assertRunAnimation(instrumentation, view, animation, animation.getDuration());
-    }
-
-    /**
-     * Assert run an animation successfully.
-     *
-     * @param instrumentation to run animation.
-     * @param view window to run animation.
-     * @param animation will be run.
-     * @param duration in milliseconds.
-     */
-    public static void assertRunAnimation(final Instrumentation instrumentation,
-            final View view, final Animation animation, final long duration) {
-
-        instrumentation.runOnMainSync(new Runnable() {
-            public void run() {
-                view.startAnimation(animation);
-            }
-        });
-
-        // check whether it has started
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return animation.hasStarted();
-            }
-        } .run();
-
-        // check whether it has ended after duration
-        new PollingCheck(duration + TIMEOUT_DELTA) {
-            @Override
-            protected boolean check() {
-                return animation.hasEnded();
-            }
-        } .run();
-
-        instrumentation.waitForIdleSync();
-    }
-
-    /**
-     * Assert run an AbsListView with LayoutAnimationController successfully.
-     * @param instrumentation
-     * @param view
-     * @param controller
-     * @param duration
-     * @throws InterruptedException
-     */
-    public static void assertRunController(final Instrumentation instrumentation,
-            final ViewGroup view, final LayoutAnimationController controller,
-            final long duration) throws InterruptedException {
-
-        instrumentation.runOnMainSync(new Runnable() {
-           public void run() {
-                view.setLayoutAnimation(controller);
-                view.requestLayout();
-           }
-        });
-
-        // LayoutAnimationController.isDone() always returns true, it's no use for stopping
-        // the running, so just using sleeping fixed time instead. we reported issue 1799434 for it.
-        Thread.sleep(duration + TIMEOUT_DELTA);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimationUtilsTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimationUtilsTest.java
deleted file mode 100755
index 26258c68a244e7129391c93dd5b28f24f997e521..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimationUtilsTest.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import com.mediatek.common.view.tests.R;
-
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-
-import android.content.Context;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.AccelerateInterpolator;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.view.animation.GridLayoutAnimationController;
-import android.view.animation.Interpolator;
-import android.view.animation.LayoutAnimationController;
-
-@TestTargetClass(AnimationUtils.class)
-public class AnimationUtilsTest extends
-        ActivityInstrumentationTestCase2<AnimationTestStubActivity> {
-
-    private AnimationTestStubActivity mActivity;
-
-    public AnimationUtilsTest() {
-        super("com.android.cts.stub", AnimationTestStubActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = (AnimationTestStubActivity) getActivity();
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "loadAnimation",
-            args = {Context.class, int.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "loadInterpolator",
-            args = {Context.class, int.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "loadLayoutAnimation",
-            args = {Context.class, int.class }
-        )
-    })
-    public void testLoad() {
-        // XML file of com.android.cts.stub.R.anim.anim_alpha
-        // <alpha xmlns:android="http://schemas.android.com/apk/res/android"
-        //      android:interpolator="@android:anim/accelerate_interpolator"
-        //      android:fromAlpha="0.0"
-        //      android:toAlpha="1.0"
-        //      android:duration="500" />
-        int duration = 500;
-        Animation animation = AnimationUtils.loadAnimation(mActivity, R.anim.anim_alpha);
-        assertEquals(duration, animation.getDuration());
-        assertTrue(animation instanceof AlphaAnimation);
-
-        // Load Interpolator from android.R.anim.accelerate_interpolator
-        Interpolator interpolator = AnimationUtils.loadInterpolator(mActivity,
-                android.R.anim.accelerate_interpolator);
-        assertTrue(interpolator instanceof AccelerateInterpolator);
-
-        // Load LayoutAnimationController from com.android.cts.stub.R.anim.anim_gridlayout
-        // <gridLayoutAnimation xmlns:android="http://schemas.android.com/apk/res/android"
-        //      android:delay="10%"
-        //      android:rowDelay="50%"
-        //      android:directionPriority="column"
-        //      android:animation="@anim/anim_alpha" />
-        LayoutAnimationController controller = AnimationUtils.loadLayoutAnimation(mActivity,
-                R.anim.anim_gridlayout);
-        assertTrue(controller instanceof GridLayoutAnimationController);
-        assertEquals(duration, controller.getAnimation().getDuration());
-        assertEquals(0.1f, controller.getDelay(), 0.001f);
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.NOT_FEASIBLE,
-            method = "makeInAnimation",
-            args = {Context.class, boolean.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.NOT_FEASIBLE,
-            method = "makeOutAnimation",
-            args = {Context.class, boolean.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.NOT_FEASIBLE,
-            method = "makeInChildBottomAnimation",
-            args = {Context.class }
-        )
-    })
-    public void testMakeAnimation() {
-        Animation inAnimation = AnimationUtils.makeInAnimation(mActivity, true);
-        assertNotNull(inAnimation);
-        Animation outAnimation = AnimationUtils.makeOutAnimation(mActivity, true);
-        assertNotNull(outAnimation);
-        Animation bottomAnimation = AnimationUtils.makeInChildBottomAnimation(mActivity);
-        assertNotNull(bottomAnimation);
-        // TODO: How to assert these Animations.
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "currentAnimationTimeMillis",
-        args = { }
-    )
-    public void testCurrentAnimationTimeMillis() {
-        long time1 = AnimationUtils.currentAnimationTimeMillis();
-        assertTrue(time1 > 0);
-
-        long time2 = 0L;
-        for (int i = 0; i < 1000 && time1 >= time2; i++) {
-            time2 = AnimationUtils.currentAnimationTimeMillis();
-            assertTrue(time2 > 0);
-        }
-        assertTrue(time2 > time1);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimatorSetEventsTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimatorSetEventsTest.java
deleted file mode 100755
index c5f287ad14427b42cdf965adca3acf6b69a66e63..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimatorSetEventsTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-* Copyright (C) 2011 The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-package com.mediatek.common.view.tests.animation;
-
-import android.animation.ObjectAnimator;
-import android.animation.AnimatorSet;
-import android.os.Handler;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.Button;
-
-import java.util.concurrent.TimeUnit;
-
-import com.mediatek.common.view.tests.R;
-
-
-/**
- * Listener tests for AnimatorSet.
- */
-public class AnimatorSetEventsTest extends EventsTest {
-
-    Button button;
-    ObjectAnimator xAnim = ObjectAnimator.ofFloat(this, "translationX", 0, 100);
-    ObjectAnimator yAnim = ObjectAnimator.ofFloat(this, "translationY", 0, 100);
-
-    @Override
-    public void setUp() throws Exception {
-        button = (Button) getActivity().findViewById(R.id.animatingButton);
-        mAnimator = new AnimatorSet();
-        ((AnimatorSet) mAnimator).playSequentially(xAnim, yAnim);
-
-        super.setUp();
-    }
-
-    @Override
-    protected long getTimeout() {
-        return (xAnim.getDuration() + yAnim.getDuration()) +
-                (xAnim.getStartDelay() + yAnim.getStartDelay()) +
-                ANIM_DELAY + FUTURE_RELEASE_DELAY;
-    }
-
-    /**
-     * Tests that an AnimatorSet can be correctly canceled during the delay of one of
-     * its children
-     */
-    @MediumTest
-    public void testPlayingCancelDuringChildDelay() throws Exception {
-        yAnim.setStartDelay(500);
-        final AnimatorSet animSet = new AnimatorSet();
-        animSet.playSequentially(xAnim, yAnim);
-        mFutureListener = new FutureReleaseListener(mFuture);
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    Handler handler = new Handler();
-                    animSet.addListener(mFutureListener);
-                    mRunning = true;
-                    animSet.start();
-                    handler.postDelayed(new Canceler(animSet, mFuture), ANIM_DURATION + 250);
-                } catch (junit.framework.AssertionFailedError e) {
-                    mFuture.setException(new RuntimeException(e));
-                }
-            }
-        });
-        mFuture.get(getTimeout(), TimeUnit.MILLISECONDS);
-    }
-
-    public void setTranslationX(float value) {
-        button.setTranslationX(value);
-    }
-
-
-    public void setTranslationY(float value) {
-        button.setTranslationY(value);
-    }
-
-
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimatorSetTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimatorSetTest.java
deleted file mode 100755
index f29c834cf514c736c0d522bd8dc9836c0c1150e0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimatorSetTest.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mediatek.common.view.tests.animation;
-
-import java.util.ArrayList;
-
-import android.animation.Animator;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
-import android.animation.TimeInterpolator;
-import android.animation.ValueAnimator;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.AccelerateDecelerateInterpolator;
-import android.view.animation.AccelerateInterpolator;
-
-public class AnimatorSetTest extends
-        ActivityInstrumentationTestCase2<AnimationActivity> {
-    private AnimationActivity mActivity;
-    private AnimatorSet mAnimatorSet;
-    private long mDuration = 1000;
-    private Object object;
-    private ObjectAnimator yAnimator;
-    private ObjectAnimator xAnimator;
-
-    public AnimatorSetTest() {
-        super(AnimationActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = getActivity();
-        object = mActivity.view.newBall;
-        yAnimator = getYAnimator(object);
-        xAnimator = getXAnimator(object);
-    }
-
-     public void testPlaySequentially() throws Throwable {
-         Animator[] animatorArray = {xAnimator, yAnimator};
-
-         mAnimatorSet = new AnimatorSet();
-         mAnimatorSet.playSequentially(animatorArray);
-
-         assertFalse(mAnimatorSet.isRunning());
-         startAnimation(mAnimatorSet);
-         Thread.sleep(100);
-         assertTrue(mAnimatorSet.isRunning());
-    }
-
-    public void testPlayTogether() throws Throwable {
-        xAnimator.setRepeatCount(ValueAnimator.INFINITE);
-        Animator[] animatorArray = {xAnimator, yAnimator};
-
-        mAnimatorSet = new AnimatorSet();
-        mAnimatorSet.playTogether(animatorArray);
-
-        assertFalse(mAnimatorSet.isRunning());
-        startAnimation(mAnimatorSet);
-        Thread.sleep(100);
-        assertTrue(mAnimatorSet.isRunning());
-   }
-
-    public void testDuration() throws Throwable {
-        xAnimator.setRepeatCount(ValueAnimator.INFINITE);
-        Animator[] animatorArray = { xAnimator, yAnimator };
-
-        mAnimatorSet = new AnimatorSet();
-        mAnimatorSet.playTogether(animatorArray);
-        mAnimatorSet.setDuration(1000);
-
-        startAnimation(mAnimatorSet);
-        Thread.sleep(100);
-        assertEquals(mAnimatorSet.getDuration(), 1000);
-    }
-
-    public void testStartDelay() throws Throwable {
-        xAnimator.setRepeatCount(ValueAnimator.INFINITE);
-        Animator[] animatorArray = { xAnimator, yAnimator };
-
-        mAnimatorSet = new AnimatorSet();
-        mAnimatorSet.playTogether(animatorArray);
-        mAnimatorSet.setStartDelay(10);
-
-        startAnimation(mAnimatorSet);
-        Thread.sleep(100);
-        assertEquals(mAnimatorSet.getStartDelay(), 10);
-    }
-
-    public void testgetChildAnimations() throws Throwable {
-        Animator[] animatorArray = { xAnimator, yAnimator };
-
-        mAnimatorSet = new AnimatorSet();
-        ArrayList<Animator> childAnimations = mAnimatorSet.getChildAnimations();
-        assertEquals(0, mAnimatorSet.getChildAnimations().size());
-        mAnimatorSet.playSequentially(animatorArray);
-        assertEquals(2, mAnimatorSet.getChildAnimations().size());
-    }
-
-    public void testSetInterpolator() throws Throwable {
-        xAnimator.setRepeatCount(ValueAnimator.INFINITE);
-        Animator[] animatorArray = {xAnimator, yAnimator};
-        TimeInterpolator interpolator = new AccelerateDecelerateInterpolator();
-        mAnimatorSet = new AnimatorSet();
-        mAnimatorSet.playTogether(animatorArray);
-        mAnimatorSet.setInterpolator(interpolator);
-
-        assertFalse(mAnimatorSet.isRunning());
-        startAnimation(mAnimatorSet);
-        Thread.sleep(100);
-
-        ArrayList<Animator> animatorList = mAnimatorSet.getChildAnimations();
-        assertEquals(interpolator, ((ObjectAnimator) animatorList.get(0)).getInterpolator());
-        assertEquals(interpolator, ((ObjectAnimator) animatorList.get(1)).getInterpolator());
-    }
-
-    public ObjectAnimator getXAnimator(Object object) {
-        String propertyX = "x";
-        float startX = mActivity.mStartX;
-        float endX = mActivity.mStartX + mActivity.mDeltaX;
-        ObjectAnimator xAnimator = ObjectAnimator.ofFloat(object, propertyX, startX, endX);
-        xAnimator.setDuration(mDuration);
-        xAnimator.setRepeatCount(ValueAnimator.INFINITE);
-        xAnimator.setInterpolator(new AccelerateInterpolator());
-        xAnimator.setRepeatMode(ValueAnimator.REVERSE);
-        return xAnimator;
-    }
-
-    public ObjectAnimator getYAnimator(Object object) {
-         String property = "y";
-         float startY = mActivity.mStartY;
-         float endY = mActivity.mStartY + mActivity.mDeltaY;
-         ObjectAnimator yAnimator = ObjectAnimator.ofFloat(object, property, startY, endY);
-         yAnimator.setDuration(mDuration);
-         yAnimator.setRepeatCount(2);
-         yAnimator.setInterpolator(new AccelerateInterpolator());
-         yAnimator.setRepeatMode(ValueAnimator.REVERSE);
-        return yAnimator;
-    }
-
-    private void startAnimation(final AnimatorSet animatorSet) throws Throwable {
-        this.runTestOnUiThread(new Runnable() {
-            public void run() {
-                mActivity.startAnimatorSet(animatorSet);
-            }
-        });
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimatorTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimatorTest.java
deleted file mode 100755
index 01f6266402d91e1933f701bd117838f0477a2d35..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AnimatorTest.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mediatek.common.view.tests.animation;
-
-import android.animation.Animator;
-import android.animation.ObjectAnimator;
-import android.animation.ValueAnimator;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.AccelerateInterpolator;
-
-import java.util.List;
-
-public class AnimatorTest extends ActivityInstrumentationTestCase2<AnimationActivity> {
-    private AnimationActivity mActivity;
-    private Animator mAnimator;
-    private long mDuration = 1000;
-    public AnimatorTest() {
-        super(AnimationActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = getActivity();
-        mAnimator = mActivity.createAnimatorWithDuration(mDuration);
-    }
-
-    public void testConstructor() {
-        mAnimator = new ValueAnimator();
-        assertNotNull(mAnimator);
-    }
-
-    public void testClone() {
-        Animator animatorClone = mAnimator.clone();
-        assertEquals(mAnimator.getDuration(), animatorClone.getDuration());
-    }
-
-    public void testStartDelay() {
-        long startDelay = 1000;
-        mAnimator.setStartDelay(startDelay);
-        assertEquals(startDelay, mAnimator.getStartDelay());
-    }
-
-    public void testStart() {
-        mAnimator.start();
-        assertTrue(mAnimator.isRunning());
-        assertTrue(mAnimator.isStarted());
-    }
-
-    public void testGetDuration() throws Throwable {
-        final long duration = 2000;
-        Animator animatorLocal = mActivity.createAnimatorWithDuration(duration);
-        startAnimation(animatorLocal);
-        assertEquals(duration, animatorLocal.getDuration());
-    }
-
-    public void testIsRunning() throws Throwable {
-        assertFalse(mAnimator.isRunning());
-        startAnimation(mAnimator);
-        assertTrue(mAnimator.isRunning());
-    }
-
-    public void testIsStarted() throws Throwable {
-        assertFalse(mAnimator.isRunning());
-        assertFalse(mAnimator.isStarted());
-        long startDelay = 10000;
-        mAnimator.setStartDelay(startDelay);
-        startAnimation(mAnimator);
-        assertFalse(mAnimator.isRunning());
-        assertTrue(mAnimator.isStarted());
-    }
-
-    public void testSetInterpolator() throws Throwable {
-        AccelerateInterpolator interpolator = new AccelerateInterpolator();
-        ValueAnimator mValueAnimator = mActivity.createAnimatorWithInterpolator(interpolator);
-        startAnimation(mValueAnimator);
-        assertTrue(interpolator.equals(mValueAnimator.getInterpolator()));
-    }
-
-    public void testCancel() throws Throwable {
-        startAnimation(mAnimator);
-        Thread.sleep(100);
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mAnimator.cancel();
-            }
-        });
-        assertFalse(mAnimator.isRunning());
-    }
-
-    public void testEnd() throws Throwable {
-        Object object = mActivity.view.newBall;
-        String property = "y";
-        float startY = mActivity.mStartY;
-        float endY = mActivity.mStartY + mActivity.mDeltaY;
-        Animator animator = ObjectAnimator.ofFloat(object, property, startY, endY);
-        animator.setDuration(mDuration);
-        ((ObjectAnimator) animator).setRepeatCount(ValueAnimator.INFINITE);
-        animator.setInterpolator(new AccelerateInterpolator());
-        ((ObjectAnimator) animator).setRepeatMode(ValueAnimator.REVERSE);
-        startAnimation(animator);
-        Thread.sleep(100);
-        endAnimation(animator);
-        float y = mActivity.view.newBall.getY();
-        assertEquals(y, endY);
-    }
-
-    public void testSetListener() throws Throwable {
-        List<Animator.AnimatorListener> listListeners = mAnimator.getListeners();
-        assertNull(listListeners);
-        MyListener listener = new MyListener();
-        assertFalse(listener.mStart);
-        assertFalse(listener.mEnd);
-        assertEquals(listener.mRepeat, 0);
-        mAnimator.addListener(listener);
-        mAnimator.setDuration(100L);
-        startAnimation(mAnimator);
-        Thread.sleep(200);
-
-        assertTrue(listener.mStart);
-        assertFalse(listener.mEnd);
-        assertTrue(listener.mRepeat >= 0);
-
-        mAnimator.cancel();
-        assertTrue(listener.mCancel);
-
-        mAnimator.end();
-        assertTrue(listener.mEnd);
-    }
-
-    public void testRemoveListener() throws Throwable {
-        List<Animator.AnimatorListener> listListenersOne = mAnimator.getListeners();
-        assertNull(listListenersOne);
-        MyListener listener = new MyListener();
-        mAnimator.addListener(listener);
-
-        List<Animator.AnimatorListener> listListenersTwo = mAnimator.getListeners();
-        assertEquals(listListenersTwo.size(), 1);
-        mAnimator.removeListener(listener);
-
-        List<Animator.AnimatorListener> listListenersThree = mAnimator.getListeners();
-        assertNull(listListenersThree);
-    }
-
-    public void testRemoveAllListenerers() throws Throwable {
-        MyListener listener1 = new MyListener();
-        MyListener listener2 = new MyListener();
-        mAnimator.addListener(listener1);
-        mAnimator.addListener(listener2);
-
-        List<Animator.AnimatorListener> listListenersOne = mAnimator.getListeners();
-        assertEquals(listListenersOne.size(), 2);
-        mAnimator.removeAllListeners();
-
-        List<Animator.AnimatorListener> listListenersTwo = mAnimator.getListeners();
-        assertNull(listListenersTwo);
-    }
-
-    class MyListener implements Animator.AnimatorListener {
-        boolean mStart = false;
-        boolean mEnd = false;
-        boolean mCancel = false;
-        int mRepeat = 0;
-
-        public void onAnimationCancel(Animator animation) {
-            mCancel = true;
-        }
-
-        public void onAnimationEnd(Animator animation) {
-            mEnd = true;
-        }
-
-        public void onAnimationRepeat(Animator animation) {
-            mRepeat++;
-        }
-
-        public void onAnimationStart(Animator animation) {
-            mStart = true;
-        }
-    }
-    private void startAnimation(final Animator animator) throws Throwable {
-        this.runTestOnUiThread(new Runnable() {
-            public void run() {
-                mActivity.startAnimation(animator);
-            }
-        });
-    }
-
-    private void endAnimation(final Animator animator) throws Throwable {
-        Thread animationRunnable = new Thread() {
-            public void run() {
-                animator.end();
-            }
-        };
-        this.runTestOnUiThread(animationRunnable);
-    }
-}
-
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ArgbEvaluatorTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ArgbEvaluatorTest.java
deleted file mode 100755
index 454d80f6c4ae6f2acda9703aed1324d8eccb752e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ArgbEvaluatorTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import android.animation.ArgbEvaluator;
-import android.graphics.Color;
-import android.test.InstrumentationTestCase;
-
-public class ArgbEvaluatorTest extends InstrumentationTestCase {
-    public void testEvaluate() throws Throwable {
-        final int RED =  0xffFF8080;
-        final int BLUE = 0xff8080FF;
-        int aRED = Color.alpha(RED);
-        int rRED = Color.red(RED);
-        int gRED = Color.green(RED);
-        int bRED = Color.blue(RED);
-        int aBLUE = Color.alpha(BLUE);
-        int rBLUE = Color.red(BLUE);
-        int gBLUE = Color.green(BLUE);
-        int bBLUE = Color.blue(BLUE);
-
-        final ArgbEvaluator evaluator = new ArgbEvaluator();
-        class AnimationRunnable implements Runnable {
-            int result;
-            public void run() {
-                result = (Integer) evaluator.evaluate(0.5f, RED, BLUE);
-            }
-        }
-        AnimationRunnable aRunnable = new AnimationRunnable();
-        this.runTestOnUiThread(aRunnable);
-        Thread.sleep(100);
-        int result = aRunnable.result;
-
-        int aResult = Color.alpha(result);
-        int rResult = Color.red(result);
-        int gResult = Color.green(result);
-        int bResult = Color.blue(result);
-        assertTrue(aResult >= aRED);
-        assertTrue(aResult <= aBLUE);
-        assertTrue(rResult <= rRED);
-        assertTrue(rResult >= rBLUE);
-        assertTrue(gResult >= gRED);
-        assertTrue(gResult <= gBLUE);
-        assertTrue(bResult >= bRED);
-        assertTrue(bResult <= bBLUE);
-    }
-}
-
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AutoCancelTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AutoCancelTest.java
deleted file mode 100755
index c09163fa02e81fc9ba8b015548facb7a1c0feb99..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/AutoCancelTest.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mediatek.common.view.tests.animation;
-
-import android.animation.Animator;
-import android.animation.ObjectAnimator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.PropertyValuesHolder;
-import android.os.Handler;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import java.util.HashMap;
-import java.util.concurrent.TimeUnit;
-
-public class AutoCancelTest extends ActivityInstrumentationTestCase2<BasicAnimatorActivity> {
-
-    boolean mAnimX1Canceled = false;
-    boolean mAnimXY1Canceled = false;
-    boolean mAnimX2Canceled = false;
-    boolean mAnimXY2Canceled = false;
-
-    private static final long START_DELAY = 100;
-    private static final long DELAYED_START_DURATION = 200;
-    private static final long FUTURE_TIMEOUT = 1000;
-
-    HashMap<Animator, Boolean> mCanceledMap = new HashMap<Animator, Boolean>();
-
-    public AutoCancelTest() {
-        super(BasicAnimatorActivity.class);
-    }
-
-    ObjectAnimator setupAnimator(long startDelay, String... properties) {
-        ObjectAnimator returnVal;
-        if (properties.length == 1) {
-            returnVal = ObjectAnimator.ofFloat(this, properties[0], 0, 1);
-        } else {
-            PropertyValuesHolder[] pvhArray = new PropertyValuesHolder[properties.length];
-            for (int i = 0; i < properties.length; i++) {
-                pvhArray[i] = PropertyValuesHolder.ofFloat(properties[i], 0, 1);
-            }
-            returnVal = ObjectAnimator.ofPropertyValuesHolder(this, pvhArray);
-        }
-        returnVal.setAutoCancel(true);
-        returnVal.setStartDelay(startDelay);
-        returnVal.addListener(mCanceledListener);
-        return returnVal;
-    }
-
-    private void setupAnimators(long startDelay, boolean startLater, final FutureWaiter future)
-    throws Exception {
-        // Animators to be auto-canceled
-        final ObjectAnimator animX1 = setupAnimator(startDelay, "x");
-        final ObjectAnimator animY1 = setupAnimator(startDelay, "y");
-        final ObjectAnimator animXY1 = setupAnimator(startDelay, "x", "y");
-        final ObjectAnimator animXZ1 = setupAnimator(startDelay, "x", "z");
-
-        animX1.start();
-        animY1.start();
-        animXY1.start();
-        animXZ1.start();
-
-        final ObjectAnimator animX2 = setupAnimator(0, "x");
-        animX2.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationStart(Animator animation) {
-                // We expect only animX1 to be canceled at this point
-                if (mCanceledMap.get(animX1) == null ||
-                        mCanceledMap.get(animX1) != true ||
-                        mCanceledMap.get(animY1) != null ||
-                        mCanceledMap.get(animXY1) != null ||
-                        mCanceledMap.get(animXZ1) != null) {
-                    future.set(false);
-                }
-            }
-        });
-
-        final ObjectAnimator animXY2 = setupAnimator(0, "x", "y");
-        animXY2.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationStart(Animator animation) {
-                // We expect only animXY1 to be canceled at this point
-                if (mCanceledMap.get(animXY1) == null ||
-                        mCanceledMap.get(animXY1) != true ||
-                        mCanceledMap.get(animY1) != null ||
-                        mCanceledMap.get(animXZ1) != null) {
-                    future.set(false);
-                }
-
-            }
-
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                // Release future if not done already via failures during start
-                future.release();
-            }
-        });
-
-        if (startLater) {
-            Handler handler = new Handler();
-            handler.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    animX2.start();
-                    animXY2.start();
-                }
-            }, DELAYED_START_DURATION);
-        } else {
-            animX2.start();
-            animXY2.start();
-        }
-    }
-
-    @SmallTest
-    public void testAutoCancel() throws Exception {
-        final FutureWaiter future = new FutureWaiter();
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    setupAnimators(0, false, future);
-                } catch (Exception e) {
-                    future.setException(e);
-                }
-            }
-        });
-        assertTrue(future.get(FUTURE_TIMEOUT, TimeUnit.MILLISECONDS));
-    }
-
-    @SmallTest
-    public void testAutoCancelDelayed() throws Exception {
-        final FutureWaiter future = new FutureWaiter();
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    setupAnimators(START_DELAY, false, future);
-                } catch (Exception e) {
-                    future.setException(e);
-                }
-            }
-        });
-        assertTrue(future.get(FUTURE_TIMEOUT, TimeUnit.MILLISECONDS));
-    }
-
-    @SmallTest
-    public void testAutoCancelTestLater() throws Exception {
-        final FutureWaiter future = new FutureWaiter();
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    setupAnimators(0, true, future);
-                } catch (Exception e) {
-                    future.setException(e);
-                }
-            }
-        });
-        assertTrue(future.get(FUTURE_TIMEOUT, TimeUnit.MILLISECONDS));
-    }
-
-    @SmallTest
-    public void testAutoCancelDelayedTestLater() throws Exception {
-        final FutureWaiter future = new FutureWaiter();
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    setupAnimators(START_DELAY, true, future);
-                } catch (Exception e) {
-                    future.setException(e);
-                }
-            }
-        });
-        assertTrue(future.get(FUTURE_TIMEOUT, TimeUnit.MILLISECONDS));
-    }
-
-    private AnimatorListenerAdapter mCanceledListener = new AnimatorListenerAdapter() {
-        @Override
-        public void onAnimationCancel(Animator animation) {
-            mCanceledMap.put(animation, true);
-        }
-    };
-
-    public void setX(float x) {}
-
-    public void setY(float y) {}
-
-    public void setZ(float z) {}
-}
-
-
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/BasicAnimatorActivity.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/BasicAnimatorActivity.java
deleted file mode 100755
index 706cede9da9c0500a8bc47d32020798290605438..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/BasicAnimatorActivity.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mediatek.common.view.tests.animation;
-
-import android.app.Activity;
-import android.os.Bundle;
-import com.mediatek.common.view.tests.R;
-
-public class BasicAnimatorActivity extends Activity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.animator_basic);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/CycleInterpolatorTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/CycleInterpolatorTest.java
deleted file mode 100755
index cfe9b9d5965380ba62d7651e7c0eaed95e309976..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/CycleInterpolatorTest.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import android.app.Activity;
-import android.content.res.XmlResourceParser;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.AttributeSet;
-import android.util.Xml;
-import android.view.View;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.view.animation.CycleInterpolator;
-import android.view.animation.Interpolator;
-import android.view.animation.Transformation;
-
-import com.mediatek.common.view.tests.R;
-
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-
-/**
- * Test {@link CycleInterpolator}.
- */
-@TestTargetClass(CycleInterpolator.class)
-public class CycleInterpolatorTest
-        extends ActivityInstrumentationTestCase2<AnimationTestStubActivity> {
-
-    private Activity mActivity;
-
-    /** It is defined in R.anim.cycle_alpha */
-    private static final long CYCLE_ALPHA_DURATION = 2000;
-    private static final float ALPHA_DELTA = 0.001f;
-
-    public CycleInterpolatorTest() {
-        super("com.android.cts.stub", AnimationTestStubActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "CycleInterpolator",
-            args = {float.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "CycleInterpolator",
-            args = {android.content.Context.class, android.util.AttributeSet.class }
-        )
-    })
-    public void testConstructors() {
-        new CycleInterpolator(1.0f);
-
-        XmlResourceParser parser = mActivity.getResources().getAnimation(R.anim.cycle_alpha);
-        AttributeSet attrs = Xml.asAttributeSet(parser);
-        new CycleInterpolator(mActivity, attrs);
-    }
-
-    public void testCycyleInterpolator() {
-        final View animWindow = mActivity.findViewById(R.id.anim_window);
-        final Animation anim = AnimationUtils.loadAnimation(mActivity, R.anim.cycle_alpha);
-        assertEquals(CYCLE_ALPHA_DURATION, anim.getDuration());
-        assertTrue(anim instanceof AlphaAnimation);
-
-        // cycle only once.
-        Interpolator interpolator = new CycleInterpolator(1.0f);
-        anim.setInterpolator(interpolator);
-        assertFalse(anim.hasStarted());
-
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, anim);
-
-        Transformation transformation = new Transformation();
-        long startTime = anim.getStartTime();
-        anim.getTransformation(startTime, transformation);
-        final float alpha1 = transformation.getAlpha();
-        assertEquals(0.0f, alpha1, ALPHA_DELTA);
-
-        anim.getTransformation(startTime + 500, transformation);
-        final float alpha2 = transformation.getAlpha();
-        assertEquals(1.0f, alpha2, ALPHA_DELTA);
-
-        anim.getTransformation(startTime + 1000, transformation);
-        final float alpha3 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + 1500, transformation);
-        final float alpha4 = transformation.getAlpha();
-        assertEquals(-1.0f, alpha4, ALPHA_DELTA);
-
-        anim.getTransformation(startTime + CYCLE_ALPHA_DURATION, transformation);
-        final float alpha5 = transformation.getAlpha();
-        assertEquals(0.0f, alpha5, ALPHA_DELTA);
-
-        // check cycle sinusoidal delta alpha
-        final float delta1 = alpha2 - alpha1;
-        final float delta2 = alpha3 - alpha2;
-        final float delta3 = alpha4 - alpha3;
-        final float delta4 = alpha5 - alpha4;
-        assertEquals(alpha1, alpha3, ALPHA_DELTA);
-        assertEquals(alpha3, alpha5, ALPHA_DELTA);
-        assertEquals(alpha2, -alpha4, ALPHA_DELTA);
-        assertEquals(delta1, -delta2, ALPHA_DELTA);
-        assertEquals(delta2, delta3, ALPHA_DELTA);
-        assertEquals(delta3, -delta4, ALPHA_DELTA);
-
-        // cycle twice.
-        interpolator = new CycleInterpolator(2.0f);
-        anim.setInterpolator(interpolator);
-
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, anim);
-
-        transformation = new Transformation();
-        startTime = anim.getStartTime();
-        anim.getTransformation(startTime, transformation);
-        final float alpha6 = transformation.getAlpha();
-        assertEquals(0.0f, alpha1, ALPHA_DELTA);
-
-        anim.getTransformation(startTime + 250, transformation);
-        final float alpha7 = transformation.getAlpha();
-        assertEquals(1.0f, alpha7, ALPHA_DELTA);
-
-        anim.getTransformation(startTime + 500, transformation);
-        final float alpha8 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + 750, transformation);
-        final float alpha9 = transformation.getAlpha();
-        assertEquals(-1.0f, alpha9, ALPHA_DELTA);
-
-        anim.getTransformation(startTime + 1000, transformation);
-        final float alpha10 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + 1250, transformation);
-        final float alpha11 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + 1500, transformation);
-        final float alpha12 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + 1750, transformation);
-        final float alpha13 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + CYCLE_ALPHA_DURATION, transformation);
-        final float alpha14 = transformation.getAlpha();
-        assertEquals(0.0f, alpha14, ALPHA_DELTA);
-
-        // check cycle sinusoidal delta alpha
-        final float delta5 = alpha7 - alpha6;
-        final float delta6 = alpha8 - alpha7;
-        final float delta7 = alpha9 - alpha8;
-        final float delta8 = alpha10 - alpha9;
-        final float delta9 = alpha11 - alpha10;
-        final float delta10 = alpha12 - alpha11;
-        final float delta11 = alpha13 - alpha12;
-        final float delta12 = alpha14 - alpha13;
-        assertEquals(alpha6, alpha8, ALPHA_DELTA);
-        assertEquals(alpha8, alpha10, ALPHA_DELTA);
-        assertEquals(alpha10, alpha12, ALPHA_DELTA);
-        assertEquals(alpha12, alpha14, ALPHA_DELTA);
-        assertEquals(alpha7, -alpha9, ALPHA_DELTA);
-        assertEquals(alpha9, -alpha11, ALPHA_DELTA);
-        assertEquals(alpha11, -alpha13, ALPHA_DELTA);
-        assertEquals(delta6, -delta5, ALPHA_DELTA);
-        assertEquals(delta7, delta6, ALPHA_DELTA);
-        assertEquals(delta8, -delta7, ALPHA_DELTA);
-        assertEquals(delta9, delta8, ALPHA_DELTA);
-        assertEquals(delta10, -delta9, ALPHA_DELTA);
-        assertEquals(delta11, delta10, ALPHA_DELTA);
-        assertEquals(delta12, -delta11, ALPHA_DELTA);
-
-        // check whether it cycle the same
-        assertEquals(alpha6, alpha1, ALPHA_DELTA);
-        assertEquals(alpha7, alpha2, ALPHA_DELTA);
-        assertEquals(alpha8, alpha3, ALPHA_DELTA);
-        assertEquals(alpha9, alpha4, ALPHA_DELTA);
-        assertEquals(alpha10, alpha5, ALPHA_DELTA);
-        assertEquals(alpha10, alpha1, ALPHA_DELTA);
-        assertEquals(alpha11, alpha2, ALPHA_DELTA);
-        assertEquals(alpha12, alpha3, ALPHA_DELTA);
-        assertEquals(alpha13, alpha4, ALPHA_DELTA);
-        assertEquals(alpha14, alpha5, ALPHA_DELTA);
-        assertEquals(delta5, delta1, ALPHA_DELTA);
-        assertEquals(delta6, delta2, ALPHA_DELTA);
-        assertEquals(delta7, delta3, ALPHA_DELTA);
-        assertEquals(delta8, delta4, ALPHA_DELTA);
-        assertEquals(delta9, delta1, ALPHA_DELTA);
-        assertEquals(delta10, delta2, ALPHA_DELTA);
-        assertEquals(delta11, delta3, ALPHA_DELTA);
-        assertEquals(delta12, delta4, ALPHA_DELTA);
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "getInterpolation",
-        args = {float.class }
-    )
-    public void testGetInterpolation() {
-        CycleInterpolator cycleInterpolator = new CycleInterpolator(2.0f);
-        final float out1 = cycleInterpolator.getInterpolation(0.0f);
-        final float out2 = cycleInterpolator.getInterpolation(0.125f);
-        final float out3 = cycleInterpolator.getInterpolation(0.25f);
-        final float out4 = cycleInterpolator.getInterpolation(0.375f);
-        final float out5 = cycleInterpolator.getInterpolation(0.5f);
-        final float out6 = cycleInterpolator.getInterpolation(0.625f);
-        final float out7 = cycleInterpolator.getInterpolation(0.75f);
-        final float out8 = cycleInterpolator.getInterpolation(0.875f);
-        final float out9 = cycleInterpolator.getInterpolation(1.0f);
-        final float delta1 = out2 - out1;
-        final float delta2 = out3 - out2;
-        final float delta3 = out4 - out3;
-        final float delta4 = out5 - out4;
-        final float delta5 = out6 - out5;
-        final float delta6 = out7 - out6;
-        final float delta7 = out8 - out7;
-        final float delta8 = out9 - out8;
-        assertEquals(out1, out3, ALPHA_DELTA);
-        assertEquals(out3, out5, ALPHA_DELTA);
-        assertEquals(out5, out7, ALPHA_DELTA);
-        assertEquals(out7, out9, ALPHA_DELTA);
-        assertEquals(delta1, -delta2, ALPHA_DELTA);
-        assertEquals(delta2, delta3, ALPHA_DELTA);
-        assertEquals(delta3, -delta4, ALPHA_DELTA);
-        assertEquals(delta4, delta5, ALPHA_DELTA);
-        assertEquals(delta5, -delta6, ALPHA_DELTA);
-        assertEquals(delta6, delta7, ALPHA_DELTA);
-        assertEquals(delta7, -delta8, ALPHA_DELTA);
-
-        final float timeDelta = 0.015f;
-        assertEquals(cycleInterpolator.getInterpolation(0.0f + timeDelta),
-                cycleInterpolator.getInterpolation(0.5f + timeDelta), ALPHA_DELTA);
-        assertEquals(cycleInterpolator.getInterpolation(0.25f + timeDelta),
-                cycleInterpolator.getInterpolation(0.75f + timeDelta), ALPHA_DELTA);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/DecelerateInterpolatorTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/DecelerateInterpolatorTest.java
deleted file mode 100755
index badda5a92e2c8da8d6b10c2c8351f72085b1511f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/DecelerateInterpolatorTest.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import com.mediatek.common.view.tests.R;
-
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-
-import android.app.Activity;
-import android.content.res.XmlResourceParser;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.AttributeSet;
-import android.util.Xml;
-import android.view.View;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.view.animation.DecelerateInterpolator;
-import android.view.animation.Interpolator;
-import android.view.animation.Transformation;
-
-/**
- * Test {@link DecelerateInterpolator}.
- */
-@TestTargetClass(DecelerateInterpolator.class)
-public class DecelerateInterpolatorTest
-        extends ActivityInstrumentationTestCase2<AnimationTestStubActivity> {
-
-    private Activity mActivity;
-    private static final float ALPHA_DELTA = 0.001f;
-
-    /** It is defined in R.anim.decelerate_alpha */
-    private static final long DECELERATE_ALPHA_DURATION = 2000;
-
-    public DecelerateInterpolatorTest() {
-        super("com.android.cts.stub", AnimationTestStubActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            notes = "Test constructor(s) of {@link DecelerateInterpolator}",
-            method = "DecelerateInterpolator",
-            args = { }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            notes = "Test constructor(s) of {@link DecelerateInterpolator}",
-            method = "DecelerateInterpolator",
-            args = {float.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            notes = "Test constructor(s) of {@link DecelerateInterpolator}",
-            method = "DecelerateInterpolator",
-            args = {android.content.Context.class, android.util.AttributeSet.class }
-        )
-    })
-    public void testConstructor() {
-        new DecelerateInterpolator();
-
-        new DecelerateInterpolator(1.0f);
-
-        XmlResourceParser parser = mActivity.getResources().getAnimation(R.anim.decelerate_alpha);
-        AttributeSet attrs = Xml.asAttributeSet(parser);
-        new DecelerateInterpolator(mActivity, attrs);
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        notes = "test case will decelerate AlphaAnimation. It will change alpha from 0.0 to"
-                + " 1.0, the rate of change alpha starts out quickly and then decelerates.",
-        method = "getInterpolation",
-        args = {float.class }
-    )
-    public void testDecelerateInterpolator() {
-        final View animWindow = mActivity.findViewById(R.id.anim_window);
-
-        // XML file of R.anim.decelerate_alpha
-        // <alpha xmlns:android="http://schemas.android.com/apk/res/android"
-        //      android:interpolator="@android:anim/decelerate_interpolator"
-        //      android:fromAlpha="0.0"
-        //      android:toAlpha="1.0"
-        //      android:duration="2000" />
-        final Animation anim = AnimationUtils.loadAnimation(mActivity, R.anim.decelerate_alpha);
-
-        assertEquals(DECELERATE_ALPHA_DURATION, anim.getDuration());
-        assertTrue(anim instanceof AlphaAnimation);
-
-        // factor is 1.0f
-        Interpolator interpolator = new DecelerateInterpolator(1.0f);
-        anim.setInterpolator(interpolator);
-        assertFalse(anim.hasStarted());
-
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, anim);
-
-        Transformation transformation = new Transformation();
-        long startTime = anim.getStartTime();
-        anim.getTransformation(startTime, transformation);
-        float alpha1 = transformation.getAlpha();
-        assertEquals(0.0f, alpha1, ALPHA_DELTA);
-
-        anim.getTransformation(startTime + 500, transformation);
-        float alpha2 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + 1000, transformation);
-        float alpha3 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + 1500, transformation);
-        float alpha4 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + DECELERATE_ALPHA_DURATION, transformation);
-        float alpha5 = transformation.getAlpha();
-        assertEquals(1.0f, alpha5, ALPHA_DELTA);
-
-        // check decelerating delta alpha
-        float delta1 = alpha2 - alpha1;
-        float delta2 = alpha3 - alpha2;
-        float delta3 = alpha4 - alpha3;
-        float delta4 = alpha5 - alpha4;
-        assertTrue(delta1 > delta2);
-        assertTrue(delta2 > delta3);
-        assertTrue(delta3 > delta4);
-
-        // factor is 1.5f, it starts even faster and ends evens slower than 1.0f
-        interpolator = new DecelerateInterpolator(1.5f);
-        anim.setInterpolator(interpolator);
-
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, anim);
-
-        transformation = new Transformation();
-        startTime = anim.getStartTime();
-        anim.getTransformation(startTime, transformation);
-        float alpha6 = transformation.getAlpha();
-        assertEquals(0.0f, alpha1, ALPHA_DELTA);
-
-        anim.getTransformation(startTime + 500, transformation);
-        float alpha7 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + 1000, transformation);
-        float alpha8 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + 1500, transformation);
-        float alpha9 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + DECELERATE_ALPHA_DURATION, transformation);
-        float alpha10 = transformation.getAlpha();
-        assertEquals(1.0f, alpha5, ALPHA_DELTA);
-
-        // check decelerating delta alpha
-        float delta5 = alpha7 - alpha6;
-        float delta6 = alpha8 - alpha7;
-        float delta7 = alpha9 - alpha8;
-        float delta8 = alpha10 - alpha9;
-        assertTrue(delta5 > delta6);
-        assertTrue(delta6 > delta7);
-        assertTrue(delta7 > delta8);
-
-        // check whether it starts even faster
-        assertTrue(delta5 > delta1);
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        notes = "Test {@link DecelerateInterpolator#getInterpolation(float)}.",
-        method = "getInterpolation",
-        args = {float.class }
-    )
-    public void testGetInterpolation() {
-        final float input = 0.25f;
-        Interpolator interpolator1 = new DecelerateInterpolator(1.0f);
-        // factor is 2.0f, it starts even faster and ends evens slower than 1.0f
-        Interpolator interpolator2 = new DecelerateInterpolator(2.0f);
-
-        float delta1 = interpolator1.getInterpolation(input);
-        float delta2 = interpolator2.getInterpolation(input);
-
-        // check whether it starts even faster
-        assertTrue(delta2 > delta1);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/DelayedCheck.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/DelayedCheck.java
deleted file mode 100755
index f5e69895e751be4d06dbae7d2595b617e62ffbb5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/DelayedCheck.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.cts.window;
-
-import junit.framework.Assert;
-
-public abstract class DelayedCheck {
-    private static final long TIME_SLICE = 200;
-    private long mTimeout = 3000;
-
-    public DelayedCheck() {
-
-    }
-
-    public DelayedCheck(long timeout) {
-        mTimeout = timeout;
-    }
-
-    protected abstract boolean check();
-
-    public void run() {
-        long timeout = mTimeout;
-        while (timeout > 0) {
-            try {
-                Thread.sleep(TIME_SLICE);
-            } catch (InterruptedException e) {
-                Assert.fail("unexpected InterruptedException");
-            }
-
-            if (check()) {
-                return;
-            }
-
-            timeout -= TIME_SLICE;
-        }
-
-        Assert.fail("unexpected timeout");
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/EventsTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/EventsTest.java
deleted file mode 100755
index 1efb1829d277423df8fb96f7e596d2f0631475f7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/EventsTest.java
+++ /dev/null
@@ -1,560 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mediatek.common.view.tests.animation;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.os.Handler;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * Tests for the various lifecycle events of Animators. This abstract class is subclassed by
- * concrete implementations that provide the actual Animator objects being tested. All of the
- * testing mechanisms are in this class; the subclasses are only responsible for providing
- * the mAnimator object.
- *
- * This test is more complicated than a typical synchronous test because much of the functionality
- * must happen on the UI thread. Some tests do this by using the UiThreadTest annotation to
- * automatically run the whole test on that thread. Other tests must run on the UI thread and also
- * wait for some later event to occur before ending. These tests use a combination of an
- * AbstractFuture mechanism and a delayed action to release that Future later.
- */
-public abstract class EventsTest
-        extends ActivityInstrumentationTestCase2<BasicAnimatorActivity> {
-
-    protected static final int ANIM_DURATION = 400;
-    protected static final int ANIM_DELAY = 100;
-    protected static final int ANIM_MID_DURATION = ANIM_DURATION / 2;
-    protected static final int ANIM_MID_DELAY = ANIM_DELAY / 2;
-    protected static final int FUTURE_RELEASE_DELAY = 50;
-
-    private boolean mStarted;  // tracks whether we've received the onAnimationStart() callback
-    protected boolean mRunning;  // tracks whether we've started the animator
-    private boolean mCanceled; // trackes whether we've canceled the animator
-    protected Animator.AnimatorListener mFutureListener; // mechanism for delaying the end of the test
-    protected FutureWaiter mFuture; // Mechanism for waiting for the UI test to complete
-    private Animator.AnimatorListener mListener; // Listener that handles/tests the events
-
-    protected Animator mAnimator; // The animator used in the tests. Must be set in subclass
-                                  // setup() method prior to calling the superclass setup()
-
-    /**
-     * Cancels the given animator. Used to delay cancellation until some later time (after the
-     * animator has started playing).
-     */
-    protected static class Canceler implements Runnable {
-        Animator mAnim;
-        FutureWaiter mFuture;
-        public Canceler(Animator anim, FutureWaiter future) {
-            mAnim = anim;
-            mFuture = future;
-        }
-        @Override
-        public void run() {
-            try {
-                mAnim.cancel();
-            } catch (junit.framework.AssertionFailedError e) {
-                mFuture.setException(new RuntimeException(e));
-            }
-        }
-    };
-
-    /**
-     * Timeout length, based on when the animation should reasonably be complete.
-     */
-    protected long getTimeout() {
-        return ANIM_DURATION + ANIM_DELAY + FUTURE_RELEASE_DELAY;
-    }
-
-    /**
-     * Ends the given animator. Used to delay ending until some later time (after the
-     * animator has started playing).
-     */
-    static class Ender implements Runnable {
-        Animator mAnim;
-        FutureWaiter mFuture;
-        public Ender(Animator anim, FutureWaiter future) {
-            mAnim = anim;
-            mFuture = future;
-        }
-        @Override
-        public void run() {
-            try {
-                mAnim.end();
-            } catch (junit.framework.AssertionFailedError e) {
-                mFuture.setException(new RuntimeException(e));
-            }
-        }
-    };
-
-    /**
-     * Releases the given Future object when the listener's end() event is called. Specifically,
-     * it releases it after some further delay, to give the test time to do other things right
-     * after an animation ends.
-     */
-    protected static class FutureReleaseListener extends AnimatorListenerAdapter {
-        FutureWaiter mFuture;
-
-        public FutureReleaseListener(FutureWaiter future) {
-            mFuture = future;
-        }
-
-        /**
-         * Variant constructor that auto-releases the FutureWaiter after the specified timeout.
-         * @param future
-         * @param timeout
-         */
-        public FutureReleaseListener(FutureWaiter future, long timeout) {
-            mFuture = future;
-            Handler handler = new Handler();
-            handler.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    mFuture.release();
-                }
-            }, timeout);
-        }
-
-        @Override
-        public void onAnimationEnd(Animator animation) {
-            Handler handler = new Handler();
-            handler.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    mFuture.release();
-                }
-            }, FUTURE_RELEASE_DELAY);
-        }
-    };
-
-    public EventsTest() {
-        super(BasicAnimatorActivity.class);
-    }
-
-    /**
-     * Sets up the fields used by each test. Subclasses must override this method to create
-     * the protected mAnimator object used in all tests. Overrides must create that animator
-     * and then call super.setup(), where further properties are set on that animator.
-     * @throws Exception
-     */
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-
-        // mListener is the main testing mechanism of this file. The asserts of each test
-        // are embedded in the listener callbacks that it implements.
-        mListener = new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationStart(Animator animation) {
-                // This should only be called on an animation that has not yet been started
-                assertFalse(mStarted);
-                assertTrue(mRunning);
-                mStarted = true;
-            }
-
-            @Override
-            public void onAnimationCancel(Animator animation) {
-                // This should only be called on an animation that has been started and not
-                // yet canceled or ended
-                assertFalse(mCanceled);
-                assertTrue(mRunning || mStarted);
-                mCanceled = true;
-            }
-
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                // This should only be called on an animation that has been started and not
-                // yet ended
-                assertTrue(mRunning || mStarted);
-                mRunning = false;
-                mStarted = false;
-                super.onAnimationEnd(animation);
-            }
-        };
-
-        mAnimator.addListener(mListener);
-        mAnimator.setDuration(ANIM_DURATION);
-
-        mFuture = new FutureWaiter();
-
-        mRunning = false;
-        mCanceled = false;
-        mStarted = false;
-    }
-
-    /**
-     * Verify that calling cancel on an unstarted animator does nothing.
-     */
-    @UiThreadTest
-    @SmallTest
-    public void testCancel() throws Exception {
-        mAnimator.cancel();
-    }
-
-    /**
-     * Verify that calling end on an unstarted animator starts/ends an animator.
-     */
-    @UiThreadTest
-    @SmallTest
-    public void testEnd() throws Exception {
-        mRunning = true; // end() implicitly starts an unstarted animator
-        mAnimator.end();
-    }
-
-    /**
-     * Verify that calling cancel on a started animator does the right thing.
-     */
-    @UiThreadTest
-    @SmallTest
-    public void testStartCancel() throws Exception {
-        mFutureListener = new FutureReleaseListener(mFuture);
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    mRunning = true;
-                    mAnimator.start();
-                    mAnimator.cancel();
-                    mFuture.release();
-                } catch (junit.framework.AssertionFailedError e) {
-                    mFuture.setException(new RuntimeException(e));
-                }
-            }
-        });
-        mFuture.get(getTimeout(), TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Verify that calling end on a started animator does the right thing.
-     */
-    @UiThreadTest
-    @SmallTest
-    public void testStartEnd() throws Exception {
-        mFutureListener = new FutureReleaseListener(mFuture);
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    mRunning = true;
-                    mAnimator.start();
-                    mAnimator.end();
-                    mFuture.release();
-                } catch (junit.framework.AssertionFailedError e) {
-                    mFuture.setException(new RuntimeException(e));
-                }
-            }
-        });
-        mFuture.get(getTimeout(), TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Same as testStartCancel, but with a startDelayed animator
-     */
-    @SmallTest
-    public void testStartDelayedCancel() throws Exception {
-        mFutureListener = new FutureReleaseListener(mFuture);
-        mAnimator.setStartDelay(ANIM_DELAY);
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    mRunning = true;
-                    mAnimator.start();
-                    mAnimator.cancel();
-                    mFuture.release();
-                } catch (junit.framework.AssertionFailedError e) {
-                    mFuture.setException(new RuntimeException(e));
-                }
-            }
-        });
-        mFuture.get(getTimeout(), TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Same as testStartEnd, but with a startDelayed animator
-     */
-    @SmallTest
-    public void testStartDelayedEnd() throws Exception {
-        mFutureListener = new FutureReleaseListener(mFuture);
-        mAnimator.setStartDelay(ANIM_DELAY);
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    mRunning = true;
-                    mAnimator.start();
-                    mAnimator.end();
-                    mFuture.release();
-                } catch (junit.framework.AssertionFailedError e) {
-                    mFuture.setException(new RuntimeException(e));
-                }
-            }
-        });
-        mFuture.get(getTimeout(), TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Verify that canceling an animator that is playing does the right thing.
-     */
-    @MediumTest
-    public void testPlayingCancel() throws Exception {
-        mFutureListener = new FutureReleaseListener(mFuture);
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    Handler handler = new Handler();
-                    mAnimator.addListener(mFutureListener);
-                    mRunning = true;
-                    mAnimator.start();
-                    handler.postDelayed(new Canceler(mAnimator, mFuture), ANIM_MID_DURATION);
-                } catch (junit.framework.AssertionFailedError e) {
-                    mFuture.setException(new RuntimeException(e));
-                }
-            }
-        });
-        mFuture.get(getTimeout(), TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Verify that ending an animator that is playing does the right thing.
-     */
-    @MediumTest
-    public void testPlayingEnd() throws Exception {
-        mFutureListener = new FutureReleaseListener(mFuture);
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    Handler handler = new Handler();
-                    mAnimator.addListener(mFutureListener);
-                    mRunning = true;
-                    mAnimator.start();
-                    handler.postDelayed(new Ender(mAnimator, mFuture), ANIM_MID_DURATION);
-                } catch (junit.framework.AssertionFailedError e) {
-                    mFuture.setException(new RuntimeException(e));
-                }
-            }
-        });
-        mFuture.get(getTimeout(), TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Same as testPlayingCancel, but with a startDelayed animator
-     */
-    @MediumTest
-    public void testPlayingDelayedCancel() throws Exception {
-        mAnimator.setStartDelay(ANIM_DELAY);
-        mFutureListener = new FutureReleaseListener(mFuture);
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    Handler handler = new Handler();
-                    mAnimator.addListener(mFutureListener);
-                    mRunning = true;
-                    mAnimator.start();
-                    handler.postDelayed(new Canceler(mAnimator, mFuture), ANIM_MID_DURATION);
-                } catch (junit.framework.AssertionFailedError e) {
-                    mFuture.setException(new RuntimeException(e));
-                }
-            }
-        });
-        mFuture.get(getTimeout(),  TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Same as testPlayingEnd, but with a startDelayed animator
-     */
-    @MediumTest
-    public void testPlayingDelayedEnd() throws Exception {
-        mAnimator.setStartDelay(ANIM_DELAY);
-        mFutureListener = new FutureReleaseListener(mFuture);
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    Handler handler = new Handler();
-                    mAnimator.addListener(mFutureListener);
-                    mRunning = true;
-                    mAnimator.start();
-                    handler.postDelayed(new Ender(mAnimator, mFuture), ANIM_MID_DURATION);
-                } catch (junit.framework.AssertionFailedError e) {
-                    mFuture.setException(new RuntimeException(e));
-                }
-            }
-        });
-        mFuture.get(getTimeout(),  TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Same as testPlayingDelayedCancel, but cancel during the startDelay period
-     */
-    @MediumTest
-    public void testPlayingDelayedCancelMidDelay() throws Exception {
-        mAnimator.setStartDelay(ANIM_DELAY);
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    // Set the listener to automatically timeout after an uncanceled animation
-                    // would have finished. This tests to make sure that we're not calling
-                    // the listeners with cancel/end callbacks since they won't be called
-                    // with the start event.
-                    mFutureListener = new FutureReleaseListener(mFuture, getTimeout());
-                    Handler handler = new Handler();
-                    mRunning = true;
-                    mAnimator.start();
-                    handler.postDelayed(new Canceler(mAnimator, mFuture), ANIM_MID_DELAY);
-                } catch (junit.framework.AssertionFailedError e) {
-                    mFuture.setException(new RuntimeException(e));
-                }
-            }
-        });
-        mFuture.get(getTimeout() + 100,  TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Same as testPlayingDelayedEnd, but end during the startDelay period
-     */
-    @MediumTest
-    public void testPlayingDelayedEndMidDelay() throws Exception {
-        mAnimator.setStartDelay(ANIM_DELAY);
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    // Set the listener to automatically timeout after an uncanceled animation
-                    // would have finished. This tests to make sure that we're not calling
-                    // the listeners with cancel/end callbacks since they won't be called
-                    // with the start event.
-                    mFutureListener = new FutureReleaseListener(mFuture, getTimeout());
-                    Handler handler = new Handler();
-                    mRunning = true;
-                    mAnimator.start();
-                    handler.postDelayed(new Ender(mAnimator, mFuture), ANIM_MID_DELAY);
-                } catch (junit.framework.AssertionFailedError e) {
-                    mFuture.setException(new RuntimeException(e));
-                }
-            }
-        });
-        mFuture.get(getTimeout() + 100,  TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Verifies that canceling a started animation after it has already been canceled
-     * does nothing.
-     */
-    @MediumTest
-    public void testStartDoubleCancel() throws Exception {
-        mFutureListener = new FutureReleaseListener(mFuture);
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    mRunning = true;
-                    mAnimator.start();
-                    mAnimator.cancel();
-                    mAnimator.cancel();
-                    mFuture.release();
-                } catch (junit.framework.AssertionFailedError e) {
-                    mFuture.setException(new RuntimeException(e));
-                }
-            }
-        });
-        mFuture.get(getTimeout(),  TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Verifies that ending a started animation after it has already been ended
-     * does nothing.
-     */
-    @MediumTest
-    public void testStartDoubleEnd() throws Exception {
-        mFutureListener = new FutureReleaseListener(mFuture);
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    mRunning = true;
-                    mAnimator.start();
-                    mAnimator.end();
-                    mRunning = true; // end() implicitly starts an unstarted animator
-                    mAnimator.end();
-                    mFuture.release();
-                } catch (junit.framework.AssertionFailedError e) {
-                    mFuture.setException(new RuntimeException(e));
-                }
-            }
-        });
-        mFuture.get(getTimeout(),  TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Same as testStartDoubleCancel, but with a startDelayed animator
-     */
-    @MediumTest
-    public void testStartDelayedDoubleCancel() throws Exception {
-        mAnimator.setStartDelay(ANIM_DELAY);
-        mFutureListener = new FutureReleaseListener(mFuture);
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    mRunning = true;
-                    mAnimator.start();
-                    mAnimator.cancel();
-                    mAnimator.cancel();
-                    mFuture.release();
-                } catch (junit.framework.AssertionFailedError e) {
-                    mFuture.setException(new RuntimeException(e));
-                }
-            }
-        });
-        mFuture.get(getTimeout(),  TimeUnit.MILLISECONDS);
-     }
-
-    /**
-     * Same as testStartDoubleEnd, but with a startDelayed animator
-     */
-    @MediumTest
-    public void testStartDelayedDoubleEnd() throws Exception {
-        mAnimator.setStartDelay(ANIM_DELAY);
-        mFutureListener = new FutureReleaseListener(mFuture);
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    mRunning = true;
-                    mAnimator.start();
-                    mAnimator.end();
-                    mRunning = true; // end() implicitly starts an unstarted animator
-                    mAnimator.end();
-                    mFuture.release();
-                } catch (junit.framework.AssertionFailedError e) {
-                    mFuture.setException(new RuntimeException(e));
-                }
-            }
-        });
-        mFuture.get(getTimeout(),  TimeUnit.MILLISECONDS);
-     }
-
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/FloatEvaluatorTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/FloatEvaluatorTest.java
deleted file mode 100755
index 5518094e167e63f2eba90db93cb1c53e41b11730..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/FloatEvaluatorTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import android.animation.FloatEvaluator;
-import android.test.InstrumentationTestCase;
-
-public class FloatEvaluatorTest extends InstrumentationTestCase {
-    public void testEvaluate() {
-        float start = 0.0f;
-        float end = 1.0f;
-        float fraction = 0.5f;
-        FloatEvaluator floatEvaluator = new FloatEvaluator();
-        float result = floatEvaluator.evaluate(fraction, start, end);
-        assertTrue(result >= (fraction * start));
-        assertTrue(result <= (fraction * end));
-    }
-}
-
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/FutureWaiter.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/FutureWaiter.java
deleted file mode 100755
index 2ad38fa42f039d4accd7a5401db58a87b7d76ed6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/FutureWaiter.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mediatek.common.view.tests.animation;
-
-import com.google.common.util.concurrent.AbstractFuture;
-
-/**
- * Simple extension of {@link com.google.common.util.concurrent.AbstractFuture} which exposes a new
- * release() method which calls the protected
- * {@link com.google.common.util.concurrent.AbstractFuture#set(Object)} method internally. It
- * also exposes the protected {@link AbstractFuture#setException(Throwable)} method.
- */
-public class FutureWaiter extends AbstractFuture<Boolean> {
-
-    /**
-     * Release the Future currently waiting on
-     * {@link com.google.common.util.concurrent.AbstractFuture#get()}.
-     */
-    public void release() {
-        super.set(true);
-    }
-
-    /**
-     * Used to indicate failure (when the result value is false).
-     */
-    public void set(boolean result) {
-        super.set(result);
-    }
-
-    @Override
-    public boolean setException(Throwable throwable) {
-        return super.setException(throwable);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/GridLayoutAnimStubActivity.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/GridLayoutAnimStubActivity.java
deleted file mode 100755
index 629cbc2b875cceaad0c56c8c82a6a3d168b34e8b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/GridLayoutAnimStubActivity.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import com.mediatek.common.view.tests.R;
-
-import android.app.Activity;
-import android.database.DataSetObserver;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AbsListView;
-import android.widget.GridView;
-import android.widget.ImageView;
-import android.widget.ListAdapter;
-
-public class GridLayoutAnimStubActivity extends Activity {
-
-    private GridView mGridView;
-    private static final int GRID_NUM = 9;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.gridlayout_anim_controller_layout);
-        mGridView = (GridView) findViewById(R.id.gridlayout_anim_gridview);
-        mGridView.setAdapter(new MockGridViewAdapter(GRID_NUM));
-    }
-
-    public GridView getGridView() {
-        return mGridView;
-    }
-
-    private class MockGridViewAdapter implements ListAdapter {
-        private final int mCount;
-
-        MockGridViewAdapter(int count) {
-            mCount = count;
-        }
-
-        MockGridViewAdapter() {
-            this(1);
-        }
-
-        public boolean areAllItemsEnabled() {
-            return true;
-        }
-
-        public boolean isEnabled(int position) {
-            return true;
-        }
-
-        public void registerDataSetObserver(DataSetObserver observer) {
-        }
-
-        public void unregisterDataSetObserver(DataSetObserver observer) {
-        }
-
-        public int getCount() {
-            return mCount;
-        }
-
-        public Object getItem(int position) {
-            return position;
-        }
-
-        public long getItemId(int position) {
-            return position;
-        }
-
-        public boolean hasStableIds() {
-            return false;
-        }
-
-        public View getView(int position, View convertView, ViewGroup parent) {
-            if ((convertView != null) && (convertView instanceof ImageView)) {
-                ((ImageView) convertView).setImageResource(R.drawable.size_48x48);
-                return convertView;
-            }
-
-            ImageView newView = new ImageView(GridLayoutAnimStubActivity.this);
-            AbsListView.LayoutParams params = new AbsListView.LayoutParams(
-                    AbsListView.LayoutParams.WRAP_CONTENT, AbsListView.LayoutParams.WRAP_CONTENT);
-            newView.setLayoutParams(params);
-            newView.setImageResource(R.drawable.size_48x48);
-            return newView;
-        }
-
-        public int getItemViewType(int position) {
-            return 0;
-        }
-
-        public int getViewTypeCount() {
-            return 1;
-        }
-
-        public boolean isEmpty() {
-            return false;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/GridLayoutAnimationControllerTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/GridLayoutAnimationControllerTest.java
deleted file mode 100755
index a96c4f2ace41750199ac8ebad532a466840599db..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/GridLayoutAnimationControllerTest.java
+++ /dev/null
@@ -1,549 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import com.mediatek.common.view.tests.R;
-
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-
-import android.content.Context;
-import android.content.res.XmlResourceParser;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.AttributeSet;
-import android.util.Xml;
-import android.view.View;
-import android.view.ViewGroup.LayoutParams;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.view.animation.GridLayoutAnimationController;
-import android.view.animation.Transformation;
-import android.view.animation.GridLayoutAnimationController.AnimationParameters;
-import android.widget.AbsListView;
-import android.widget.GridView;
-
-@TestTargetClass(GridLayoutAnimationController.class)
-public class GridLayoutAnimationControllerTest
-    extends ActivityInstrumentationTestCase2<GridLayoutAnimStubActivity> {
-
-    private GridLayoutAnimStubActivity mActivity;
-    private Animation mDefaultAnimation;
-    private GridLayoutAnimationController mController;
-    /** The GridView will be 3*3 */
-    private GridView mGridView;
-    /** Default delay of GridLayoutAnimationController */
-    private static final float DEFAULT_DELAY = 0.5f;
-    /** Default max duration of running */
-    private static final long DEFAULT_MAX_DURATION = 5000;
-    private static final float DELTA = 0.1f;
-    private static final int INDEX_OF_CHILD1 = 0;
-    private static final int INDEX_OF_CHILD2 = 1;
-    private static final int INDEX_OF_CHILD3 = 2;
-    private static final int INDEX_OF_CHILD4 = 3;
-    private static final int INDEX_OF_CHILD5 = 4;
-    private static final int INDEX_OF_CHILD6 = 5;
-    private static final int INDEX_OF_CHILD7 = 6;
-    private static final int INDEX_OF_CHILD8 = 7;
-    private static final int INDEX_OF_CHILD9 = 8;
-
-    public GridLayoutAnimationControllerTest() {
-        super("com.android.cts.stub", GridLayoutAnimStubActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        mDefaultAnimation = AnimationUtils.loadAnimation(mActivity,
-                R.anim.layout_anim_controller_animation);
-        mController = new GridLayoutAnimationController(mDefaultAnimation, DEFAULT_DELAY,
-                DEFAULT_DELAY);
-        mGridView = mActivity.getGridView();
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "GridLayoutAnimationController",
-            args = {Context.class, AttributeSet.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "GridLayoutAnimationController",
-            args = {Animation.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "GridLayoutAnimationController",
-            args = {Animation.class, float.class, float.class }
-        )
-    })
-    public void testConstructor() {
-        XmlResourceParser parser = mActivity.getResources().getAnimation(
-                R.anim.accelerate_decelerate_alpha);
-        AttributeSet attrs = Xml.asAttributeSet(parser);
-        new GridLayoutAnimationController(mActivity, attrs);
-        GridLayoutAnimationController controller =
-                new GridLayoutAnimationController(mDefaultAnimation);
-        // Default rowDelay and columnDelay is 0.5f
-        assertEquals(DEFAULT_DELAY, controller.getRowDelay());
-        assertEquals(DEFAULT_DELAY, controller.getColumnDelay());
-        new GridLayoutAnimationController(mDefaultAnimation, 0.5f, 0.5f);
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "getColumnDelay",
-            args = { }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "setColumnDelay",
-            args = {float.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "getRowDelay",
-            args = { }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "setRowDelay",
-            args = {float.class }
-        )
-    })
-    public void testAccessDelay() throws InterruptedException {
-        float delay = 1.5f;
-        long maxDuration = 13000;
-        mController.setRowDelay(delay);
-        assertEquals(delay, mController.getRowDelay());
-        AnimationTestUtils.assertRunController(getInstrumentation(), mGridView, mController,
-                maxDuration);
-
-        Animation childAnimation1 = mGridView.getChildAt(INDEX_OF_CHILD1).getAnimation();
-        Animation childAnimation4 = mGridView.getChildAt(INDEX_OF_CHILD4).getAnimation();
-        Animation childAnimation7 = mGridView.getChildAt(INDEX_OF_CHILD7).getAnimation();
-        assertChildrenDelay(childAnimation1, childAnimation4, childAnimation7);
-
-        mController.setColumnDelay(delay);
-        assertEquals(delay, mController.getColumnDelay());
-        AnimationTestUtils.assertRunController(getInstrumentation(), mGridView, mController,
-                maxDuration);
-
-        childAnimation1 = mGridView.getChildAt(INDEX_OF_CHILD1).getAnimation();
-        Animation childAnimation2 = mGridView.getChildAt(INDEX_OF_CHILD2).getAnimation();
-        Animation childAnimation3 = mGridView.getChildAt(INDEX_OF_CHILD3).getAnimation();
-        assertChildrenDelay(childAnimation1, childAnimation2, childAnimation3);
-    }
-
-    /**
-     * This method is used to assert child animation's attrs to check setDelay() works.
-     * The set delay is 1.5f.
-     * @param child1
-     * @param child2
-     * @param child3
-     * @param delay
-     */
-    private void assertChildrenDelay(Animation child1, Animation child2, Animation child3) {
-        long startTime = child1.getStartTime();
-        long offsetTime1 = child1.getStartOffset();
-        long offsetTime2 = child2.getStartOffset();
-        long offsetTime3 = child3.getStartOffset();
-        assertEquals(0, offsetTime1);
-        assertEquals(1500, offsetTime2);
-        assertEquals(3000, offsetTime3);
-
-        Transformation transformation1 = new Transformation();
-        Transformation transformation2 = new Transformation();
-        Transformation transformation3 = new Transformation();
-
-        // child1 has started animation, child2 and child3 haven't started
-        child1.getTransformation(startTime + 500, transformation1);
-        child2.getTransformation(startTime + 500, transformation2);
-        child3.getTransformation(startTime + 500, transformation3);
-        assertIsRunningAnimation(transformation1.getAlpha());
-        assertEquals(0.0f, transformation2.getAlpha(), DELTA);
-        assertEquals(0.0f, transformation3.getAlpha(), DELTA);
-
-        // child1 has finished, child2 and child3 haven't started
-        child1.getTransformation(startTime + 1200, transformation1);
-        child2.getTransformation(startTime + 1200, transformation2);
-        child3.getTransformation(startTime + 1200, transformation3);
-        assertEquals(1.0f, transformation1.getAlpha(), DELTA);
-        assertEquals(0.0f, transformation2.getAlpha(), DELTA);
-        assertEquals(0.0f, transformation3.getAlpha(), DELTA);
-
-        // child1 has finished, child2 has started animation, child3 hasn't started.
-        child1.getTransformation(startTime + 2000, transformation1);
-        child2.getTransformation(startTime + 2000, transformation2);
-        child3.getTransformation(startTime + 2000, transformation3);
-        assertEquals(1.0f, transformation1.getAlpha(), DELTA);
-        assertIsRunningAnimation(transformation2.getAlpha());
-        assertEquals(0.0f, transformation3.getAlpha(), DELTA);
-
-        // child1 and child2 have finished, child3 hasn't started
-        child1.getTransformation(startTime + 2700, transformation1);
-        child2.getTransformation(startTime + 2700, transformation2);
-        child3.getTransformation(startTime + 2700, transformation3);
-        assertEquals(1.0f, transformation1.getAlpha(), DELTA);
-        assertEquals(1.0f, transformation2.getAlpha(), DELTA);
-        assertEquals(0.0f, transformation3.getAlpha(), DELTA);
-
-        // child1 and child2 have finished, child3 has started animation
-        child1.getTransformation(startTime + 3500, transformation1);
-        child2.getTransformation(startTime + 3500, transformation2);
-        child3.getTransformation(startTime + 3500, transformation3);
-        assertIsRunningAnimation(transformation3.getAlpha());
-    }
-
-    private void assertIsRunningAnimation(float alpha) {
-        assertTrue(alpha > 0.0f);
-        assertTrue(alpha < 1.0f);
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "getDirection",
-            args = { }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "setDirection",
-            args = {int.class }
-        )
-    })
-    public void testAccessDirection() throws InterruptedException {
-        mController.setDirection(GridLayoutAnimationController.DIRECTION_BOTTOM_TO_TOP);
-        assertEquals(GridLayoutAnimationController.DIRECTION_BOTTOM_TO_TOP,
-                mController.getDirection());
-        AnimationTestUtils.assertRunController(getInstrumentation(), mGridView, mController,
-                DEFAULT_MAX_DURATION);
-
-        Animation childAnimation1 = mGridView.getChildAt(INDEX_OF_CHILD1).getAnimation();
-        Animation childAnimation4 = mGridView.getChildAt(INDEX_OF_CHILD4).getAnimation();
-        Animation childAnimation7 = mGridView.getChildAt(INDEX_OF_CHILD7).getAnimation();
-
-        // Test bottom_to_top direction
-        long startTime = childAnimation7.getStartTime();
-        assertEquals(1000, childAnimation1.getStartOffset());
-        assertEquals(500, childAnimation4.getStartOffset());
-        assertEquals(0, childAnimation7.getStartOffset());
-
-        Transformation transformation1 = new Transformation();
-        Transformation transformation2 = new Transformation();
-        Transformation transformation3 = new Transformation();
-
-        // childAnimation7 has started animation, childAnimation4 and childAnimation1 haven't
-        // started
-        childAnimation1.getTransformation(startTime + 500, transformation1);
-        childAnimation4.getTransformation(startTime + 500, transformation2);
-        childAnimation7.getTransformation(startTime + 500, transformation3);
-        assertEquals(0.0f, transformation1.getAlpha(), DELTA);
-        assertEquals(0.0f, transformation2.getAlpha(), DELTA);
-        assertIsRunningAnimation(transformation3.getAlpha());
-
-        // childAnimation4 has started animation, childAnimation7 has finished and childAnimation1
-        // hasn't started
-        childAnimation1.getTransformation(startTime + 1000, transformation1);
-        childAnimation4.getTransformation(startTime + 1000, transformation2);
-        childAnimation7.getTransformation(startTime + 1000, transformation3);
-        assertEquals(0.0f, transformation1.getAlpha(), DELTA);
-        assertIsRunningAnimation(transformation2.getAlpha());
-        assertEquals(1.0f, transformation3.getAlpha(), DELTA);
-
-        // childAnimation1 has started animation, childAnimation4, childAnimation7 have finished
-        childAnimation1.getTransformation(startTime + 1500, transformation1);
-        childAnimation4.getTransformation(startTime + 1500, transformation2);
-        childAnimation7.getTransformation(startTime + 1500, transformation3);
-        assertIsRunningAnimation(transformation1.getAlpha());
-        assertEquals(1.0f, transformation2.getAlpha(), DELTA);
-        assertEquals(1.0f, transformation3.getAlpha(), DELTA);
-
-        // Test top_to_bottom direction
-        mController.setDirection(GridLayoutAnimationController.DIRECTION_TOP_TO_BOTTOM);
-        assertEquals(GridLayoutAnimationController.DIRECTION_TOP_TO_BOTTOM,
-                mController.getDirection());
-        AnimationTestUtils.assertRunController(getInstrumentation(), mGridView, mController,
-                DEFAULT_MAX_DURATION);
-
-        transformation1 = new Transformation();
-        transformation2 = new Transformation();
-        transformation3 = new Transformation();
-        childAnimation1 = mGridView.getChildAt(INDEX_OF_CHILD1).getAnimation();
-        childAnimation4 = mGridView.getChildAt(INDEX_OF_CHILD4).getAnimation();
-        childAnimation7 = mGridView.getChildAt(INDEX_OF_CHILD7).getAnimation();
-        startTime = childAnimation1.getStartTime();
-        assertEquals(0, childAnimation1.getStartOffset());
-        assertEquals(500, childAnimation4.getStartOffset());
-        assertEquals(1000, childAnimation7.getStartOffset());
-
-        // childAnimation1 has started animation, childAnimation4 and childAnimation7 haven't
-        // started
-        childAnimation1.getTransformation(startTime + 500, transformation1);
-        childAnimation4.getTransformation(startTime + 500, transformation2);
-        childAnimation7.getTransformation(startTime + 500, transformation3);
-        assertIsRunningAnimation(transformation1.getAlpha());
-        assertEquals(0.0f, transformation2.getAlpha(), DELTA);
-        assertEquals(0.0f, transformation3.getAlpha(), DELTA);
-
-        // childAnimation4 has started animation, childAnimation1 has finished and childAnimation7
-        // hasn't started
-        childAnimation1.getTransformation(startTime + 1000, transformation1);
-        childAnimation4.getTransformation(startTime + 1000, transformation2);
-        childAnimation7.getTransformation(startTime + 1000, transformation3);
-        assertEquals(1.0f, transformation1.getAlpha(), DELTA);
-        assertIsRunningAnimation(transformation2.getAlpha());
-        assertEquals(0.0f, transformation3.getAlpha(), DELTA);
-
-        // childAnimation7 has started animation, childAnimation1 and childAnimation4 has finished
-        childAnimation1.getTransformation(startTime + 1500, transformation1);
-        childAnimation4.getTransformation(startTime + 1500, transformation2);
-        childAnimation7.getTransformation(startTime + 1500, transformation3);
-        assertEquals(1.0f, transformation1.getAlpha(), DELTA);
-        assertEquals(1.0f, transformation2.getAlpha(), DELTA);
-        assertIsRunningAnimation(transformation3.getAlpha());
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "getDelayForView",
-        args = {View.class }
-    )
-    public void testGetDelayForView() throws Throwable {
-        Animation animation = AnimationUtils.loadAnimation(mActivity, R.anim.decelerate_alpha);
-        animation.setFillAfter(true);
-        MyGridLayoutAnimationController controller = new MyGridLayoutAnimationController(animation);
-
-        // child1's animationParams
-        final AbsListView.LayoutParams layoutParams1 = setAnimationParameters(0);
-        // child2's animationParams
-        final AbsListView.LayoutParams layoutParams2 = setAnimationParameters(1);
-        // child3's animationParams
-        final AbsListView.LayoutParams layoutParams3 = setAnimationParameters(2);
-        // child4's animationParams
-        final AbsListView.LayoutParams layoutParams4 = setAnimationParameters(3);
-        // child5's animationParams
-        final AbsListView.LayoutParams layoutParams5 = setAnimationParameters(4);
-        // child6's animationParams
-        final AbsListView.LayoutParams layoutParams6 = setAnimationParameters(5);
-        // child7's animationParams
-        final AbsListView.LayoutParams layoutParams7 = setAnimationParameters(6);
-        // child8's animationParams
-        final AbsListView.LayoutParams layoutParams8 = setAnimationParameters(7);
-        // child9's animationParams
-        final AbsListView.LayoutParams layoutParams9 = setAnimationParameters(8);
-
-        final View child1 = mGridView.getChildAt(INDEX_OF_CHILD1);
-        final View child2 = mGridView.getChildAt(INDEX_OF_CHILD2);
-        final View child3 = mGridView.getChildAt(INDEX_OF_CHILD3);
-        final View child4 = mGridView.getChildAt(INDEX_OF_CHILD4);
-        final View child5 = mGridView.getChildAt(INDEX_OF_CHILD5);
-        final View child6 = mGridView.getChildAt(INDEX_OF_CHILD6);
-        final View child7 = mGridView.getChildAt(INDEX_OF_CHILD7);
-        final View child8 = mGridView.getChildAt(INDEX_OF_CHILD8);
-        final View child9 = mGridView.getChildAt(INDEX_OF_CHILD9);
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                child1.setLayoutParams(layoutParams1);
-                child2.setLayoutParams(layoutParams2);
-                child3.setLayoutParams(layoutParams3);
-                child4.setLayoutParams(layoutParams4);
-                child5.setLayoutParams(layoutParams5);
-                child6.setLayoutParams(layoutParams6);
-                child7.setLayoutParams(layoutParams7);
-                child8.setLayoutParams(layoutParams8);
-                child9.setLayoutParams(layoutParams9);
-            }
-        });
-
-        AnimationTestUtils.assertRunController(getInstrumentation(), mGridView, controller,
-                DEFAULT_MAX_DURATION);
-
-        assertEquals(0, controller.getDelayForView(child1));
-        assertEquals(1000, controller.getDelayForView(child2));
-        assertEquals(2000, controller.getDelayForView(child3));
-        assertEquals(1000, controller.getDelayForView(child4));
-        assertEquals(2000, controller.getDelayForView(child5));
-        assertEquals(3000, controller.getDelayForView(child6));
-        assertEquals(2000, controller.getDelayForView(child7));
-        assertEquals(3000, controller.getDelayForView(child8));
-        assertEquals(4000, controller.getDelayForView(child9));
-    }
-
-    private AbsListView.LayoutParams setAnimationParameters(int index) {
-        AnimationParameters animationParams = new AnimationParameters();
-        animationParams.index = index;
-        animationParams.count = 9;
-        final AbsListView.LayoutParams layoutParams = new AbsListView.LayoutParams(
-                LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
-        layoutParams.layoutAnimationParameters = animationParams;
-        return layoutParams;
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "getDirectionPriority",
-            args = { }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "setDirectionPriority",
-            args = {int.class }
-        )
-    })
-    public void testAccessDirectionPriority() throws InterruptedException {
-        // Before setting DirectionPriority, childAnimation7 will be later than childAnimation2,
-        // and childAnimation8 will be later than childAnimation3
-        AnimationTestUtils.assertRunController(getInstrumentation(), mGridView, mController,
-                DEFAULT_MAX_DURATION);
-        Animation childAnimation1 = mGridView.getChildAt(INDEX_OF_CHILD1).getAnimation();
-        Animation childAnimation2 = mGridView.getChildAt(INDEX_OF_CHILD2).getAnimation();
-        Animation childAnimation3 = mGridView.getChildAt(INDEX_OF_CHILD3).getAnimation();
-        Animation childAnimation7 = mGridView.getChildAt(INDEX_OF_CHILD7).getAnimation();
-        Animation childAnimation8 = mGridView.getChildAt(INDEX_OF_CHILD8).getAnimation();
-
-        long startTime = childAnimation1.getStartTime();
-        assertEquals(500, childAnimation2.getStartOffset());
-        assertEquals(1000, childAnimation3.getStartOffset());
-        assertEquals(1000, childAnimation7.getStartOffset());
-        assertEquals(1500, childAnimation8.getStartOffset());
-
-
-        Transformation transformation1 = new Transformation();
-        Transformation transformation2 = new Transformation();
-
-        childAnimation2.getTransformation(startTime + 700, transformation1);
-        childAnimation7.getTransformation(startTime + 700, transformation2);
-        assertIsRunningAnimation(transformation1.getAlpha());
-        assertEquals(0.0f, transformation2.getAlpha(), DELTA);
-
-        childAnimation3.getTransformation(startTime + 1200, transformation1);
-        childAnimation8.getTransformation(startTime + 1200, transformation2);
-        assertIsRunningAnimation(transformation1.getAlpha());
-        assertEquals(0.0f, transformation2.getAlpha(), DELTA);
-
-        // After setting DirectionPriority to PRIORITY_COLUMN, childAnimation7 will be earlier
-        // than childAnimation2, and childAnimation8 will be earlier than childAnimation3
-        mController.setDirectionPriority(GridLayoutAnimationController.PRIORITY_COLUMN);
-        assertEquals(GridLayoutAnimationController.PRIORITY_COLUMN,
-                mController.getDirectionPriority());
-        AnimationTestUtils.assertRunController(getInstrumentation(), mGridView, mController,
-                DEFAULT_MAX_DURATION);
-        childAnimation1 = mGridView.getChildAt(INDEX_OF_CHILD1).getAnimation();
-        childAnimation2 = mGridView.getChildAt(INDEX_OF_CHILD2).getAnimation();
-        childAnimation3 = mGridView.getChildAt(INDEX_OF_CHILD3).getAnimation();
-        childAnimation7 = mGridView.getChildAt(INDEX_OF_CHILD7).getAnimation();
-        childAnimation8 = mGridView.getChildAt(INDEX_OF_CHILD8).getAnimation();
-
-        startTime = childAnimation1.getStartTime();
-        assertEquals(1500, childAnimation2.getStartOffset());
-        assertEquals(3000, childAnimation3.getStartOffset());
-        assertEquals(1000, childAnimation7.getStartOffset());
-        assertEquals(2500, childAnimation8.getStartOffset());
-
-        transformation1 = new Transformation();
-        transformation2 = new Transformation();
-
-        childAnimation2.getTransformation(startTime + 1200, transformation1);
-        childAnimation7.getTransformation(startTime + 1200, transformation2);
-        assertEquals(0.0f, transformation1.getAlpha(), DELTA);
-        assertIsRunningAnimation(transformation2.getAlpha());
-
-        childAnimation3.getTransformation(startTime + 2700, transformation1);
-        childAnimation8.getTransformation(startTime + 2700, transformation2);
-        assertEquals(0.0f, transformation1.getAlpha(), DELTA);
-        assertIsRunningAnimation(transformation2.getAlpha());
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "willOverlap",
-        args = { }
-    )
-    public void testWillOverlap() {
-        GridLayoutAnimationController controller = new GridLayoutAnimationController(
-                mDefaultAnimation);
-
-        controller.setColumnDelay(0.5f);
-        controller.setRowDelay(0.5f);
-        assertTrue(controller.willOverlap());
-
-        controller.setColumnDelay(0.5f);
-        controller.setRowDelay(1.0f);
-        assertTrue(controller.willOverlap());
-
-        controller.setColumnDelay(1.0f);
-        controller.setRowDelay(0.5f);
-        assertTrue(controller.willOverlap());
-
-        controller.setColumnDelay(1.0f);
-        controller.setRowDelay(1.0f);
-        assertFalse(controller.willOverlap());
-    }
-
-    private class MyGridLayoutAnimationController extends GridLayoutAnimationController {
-        public MyGridLayoutAnimationController(Animation animation) {
-            super(animation);
-        }
-
-        protected long getDelayForView(View view) {
-            return super.getDelayForView(view);
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/GridLayoutAnimationController_AnimationParametersTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/GridLayoutAnimationController_AnimationParametersTest.java
deleted file mode 100755
index 16155dba62076836cfd429d17d2d67c7180eeae7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/GridLayoutAnimationController_AnimationParametersTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-
-import android.test.AndroidTestCase;
-import android.view.animation.GridLayoutAnimationController;
-import android.view.animation.GridLayoutAnimationController.AnimationParameters;
-
-@TestTargetClass(AnimationParameters.class)
-public class GridLayoutAnimationController_AnimationParametersTest extends AndroidTestCase {
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "GridLayoutAnimationController.AnimationParameters",
-        args = { }
-    )
-    public void testConstructor() {
-        new GridLayoutAnimationController.AnimationParameters();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/IntEvaluatorTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/IntEvaluatorTest.java
deleted file mode 100755
index 8660676af07249a4bc5590f85fb559f9338876e1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/IntEvaluatorTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import android.animation.IntEvaluator;
-import android.test.InstrumentationTestCase;
-
-public class IntEvaluatorTest extends InstrumentationTestCase {
-    public void testEvaluate() throws Throwable {
-        final int start = 0;
-        final int end = 100;
-        final float fraction = 0.5f;
-        final IntEvaluator intEvaluator = new IntEvaluator();
-        class AnimationRunnable implements Runnable {
-            int result;
-            public void run() {
-                result = intEvaluator.evaluate(fraction, start, end);
-            }
-        }
-        AnimationRunnable aRunnable = new AnimationRunnable();
-        this.runTestOnUiThread(aRunnable);
-        Thread.sleep(1);
-        int result = aRunnable.result;
-        assertTrue(result >= (fraction * start));
-        assertTrue(result <= (fraction * end));
-    }
-}
-
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/KeyframeTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/KeyframeTest.java
deleted file mode 100755
index 3926c4c7f349855ee6ffaaf2a1a188cab0aff59e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/KeyframeTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import android.animation.Keyframe;
-import android.animation.TimeInterpolator;
-import android.test.InstrumentationTestCase;
-import android.view.animation.AccelerateInterpolator;
-
-public class KeyframeTest extends InstrumentationTestCase {
-    public void testGetFraction() {
-        Keyframe keyFrame = Keyframe.ofInt(0.0f);
-        float fraction = keyFrame.getFraction();
-        assertTrue(fraction == 0.0f);
-    }
-
-    public void testSetFraction() {
-        Keyframe keyFrame = Keyframe.ofInt(0.0f);
-        keyFrame.setFraction(0.5f);
-        float fraction = keyFrame.getFraction();
-        assertTrue(fraction == 0.5f);
-    }
-
-    public void testOfFloat() {
-        Keyframe keyFrame = Keyframe.ofFloat(0.0f);
-        float fraction = keyFrame.getFraction();
-        assertEquals(fraction, 0.0f);
-    }
-
-    public void testOfIntValue() {
-        Keyframe keyFrame = Keyframe.ofInt(0.0f, 10);
-        assertTrue(keyFrame.hasValue());
-        assertEquals(keyFrame.getValue(), 10);
-    }
-
-    public void testOfFloatValue() {
-        Keyframe keyFrame = Keyframe.ofFloat(0.0f, 9.0f);
-        assertTrue(keyFrame.hasValue());
-        assertEquals(keyFrame.getValue(), 9.0f);
-    }
-
-    public void testOfObject() {
-        Keyframe keyFrame = Keyframe.ofObject(0.0f);
-        float fraction = keyFrame.getFraction();
-        assertEquals(fraction, 0.0f);
-    }
-
-    public void testOfObjectValue() {
-        String value = "test";
-        Keyframe keyFrame = Keyframe.ofObject(0.0f, value);
-        assertTrue(keyFrame.hasValue());
-        assertEquals(keyFrame.getValue(), value);
-    }
-
-    public void testGetType() {
-        Keyframe keyFrame = Keyframe.ofFloat(0.0f);
-        Class typeClass = keyFrame.getType();
-        String typeName = typeClass.getName();
-        assertEquals(typeName, "float");
-    }
-
-    public void testClone() {
-        Keyframe keyFrame = Keyframe.ofFloat(0.0f);
-        Keyframe clone = keyFrame.clone();
-        assertEquals(keyFrame.getFraction(), clone.getFraction());
-    }
-
-    public void testSetInterpolator() {
-        Keyframe keyFrame = Keyframe.ofFloat(0.0f);
-        TimeInterpolator interpolator = new AccelerateInterpolator();
-        keyFrame.setInterpolator(interpolator);
-        assertEquals(interpolator, keyFrame.getInterpolator());
-    }
-
-    public void testSetValue() {
-        Keyframe keyFrame = Keyframe.ofFloat(0.0f);
-        Float value = new Float(100.0f);
-        keyFrame.setValue(value);
-        Float actualValue = (Float) keyFrame.getValue();
-        assertEquals(value, actualValue);
-    }
-}
-
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/LayoutAnimStubActivity.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/LayoutAnimStubActivity.java
deleted file mode 100755
index 97b277e68d62c8ab72789b77d3770465479feb69..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/LayoutAnimStubActivity.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import android.app.ListActivity;
-import android.os.Bundle;
-import android.widget.ArrayAdapter;
-
-
-public class LayoutAnimStubActivity extends ListActivity {
-
-    private String[] mStrings = {
-            "Android",
-            "CTS",
-            "Test",
-    };
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setListAdapter(new ArrayAdapter<String>(this,
-                android.R.layout.simple_list_item_1, mStrings));
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/LayoutAnimationActivity.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/LayoutAnimationActivity.java
deleted file mode 100755
index 211ffcb0ec14caa332bdc5da70e4faa6b0232342..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/LayoutAnimationActivity.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mediatek.common.view.tests.animation;
-
-import com.mediatek.common.view.tests.R;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.LinearLayout;
-
-public class LayoutAnimationActivity extends Activity {
-    private int mCount = 1;
-    Button mButton;
-    private Button mLastButton;
-    @Override
-    public void onCreate(Bundle bundle) {
-        super.onCreate(bundle);
-        setContentView(R.layout.animation_two);
-        mButton = (Button) findViewById(R.id.button1);
-
-        mButton.setOnClickListener(new OnClickListener() {
-            public void onClick(View v) {
-                Button newButton = new Button(LayoutAnimationActivity.this);
-                newButton.setText("Button:" + LayoutAnimationActivity.this.mCount);
-                LinearLayout layout = (LinearLayout) findViewById(R.id.container);
-                layout.addView(newButton);
-                LayoutAnimationActivity.this.mCount++;
-                mLastButton = newButton;
-            }
-        });
-    }
-
-    public Button getLastButton() {
-        return mLastButton;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/LayoutAnimationControllerTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/LayoutAnimationControllerTest.java
deleted file mode 100755
index f928e22be8f6b2e855b5709e491d7c0c5ffb8e68..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/LayoutAnimationControllerTest.java
+++ /dev/null
@@ -1,620 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import com.mediatek.common.view.tests.R;
-
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-import dalvik.annotation.ToBeFixed;
-
-import android.app.ListActivity;
-import android.content.Context;
-import android.content.res.XmlResourceParser;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.AttributeSet;
-import android.util.Xml;
-import android.view.View;
-import android.view.ViewGroup.LayoutParams;
-import android.view.animation.AccelerateInterpolator;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.view.animation.DecelerateInterpolator;
-import android.view.animation.Interpolator;
-import android.view.animation.LayoutAnimationController;
-import android.view.animation.ScaleAnimation;
-import android.view.animation.Transformation;
-import android.view.animation.LayoutAnimationController.AnimationParameters;
-import android.widget.AbsListView;
-import android.widget.ListView;
-
-@TestTargetClass(LayoutAnimationController.class)
-public class LayoutAnimationControllerTest
-        extends ActivityInstrumentationTestCase2<LayoutAnimStubActivity> {
-
-    private ListActivity mActivity;
-    private Animation mDefaultAnimation;
-    private ListView mListView;
-    private LayoutAnimationController mController;
-    /** Duration defined in layout_anim_controller_animation.xml is 1000 */
-    private static final int DURATION = 1000;
-    private static final float DELTA = 0.1f;
-    private static final int INDEX_OF_CHILD1 = 0;
-    private static final int INDEX_OF_CHILD2 = 1;
-    private static final int INDEX_OF_CHILD3 = 2;
-    /** Default delay of LayoutAnimationController */
-    private static final float DEFAULT_DELAY = 0.5f;
-    /** Default max duration of these three children */
-    private static final long DEFAULT_MAX_DURATION = 2000;
-
-    public LayoutAnimationControllerTest() {
-        super("com.android.cts.stub", LayoutAnimStubActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        mListView = mActivity.getListView();
-        mDefaultAnimation = AnimationUtils.loadAnimation(mActivity,
-                R.anim.layout_anim_controller_animation);
-        mController = new LayoutAnimationController(mDefaultAnimation, DEFAULT_DELAY);
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "getOrder",
-            args = { }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "setOrder",
-            args = {int.class }
-        )
-    })
-    public void testAccessOrder() throws InterruptedException {
-
-        mController.setOrder(LayoutAnimationController.ORDER_NORMAL);
-        assertEquals(LayoutAnimationController.ORDER_NORMAL, mController.getOrder());
-
-        AnimationTestUtils.assertRunController(getInstrumentation(), mListView, mController,
-                DEFAULT_MAX_DURATION);
-
-        Animation childAnimation1 = mListView.getChildAt(INDEX_OF_CHILD1).getAnimation();
-        Animation childAnimation2 = mListView.getChildAt(INDEX_OF_CHILD2).getAnimation();
-        Animation childAnimation3 = mListView.getChildAt(INDEX_OF_CHILD3).getAnimation();
-
-        // Test normal order
-        long startTime = childAnimation1.getStartTime();
-        assertEquals(0, childAnimation1.getStartOffset());
-        assertEquals(500, childAnimation2.getStartOffset());
-        assertEquals(1000, childAnimation3.getStartOffset());
-
-        Transformation transformation1 = new Transformation();
-        Transformation transformation2 = new Transformation();
-        Transformation transformation3 = new Transformation();
-
-        // child1 has started animation, child2 and child3 haven't started
-        childAnimation1.getTransformation(startTime + 500, transformation1);
-        childAnimation2.getTransformation(startTime + 500, transformation2);
-        childAnimation3.getTransformation(startTime + 500, transformation3);
-        assertIsRunningAnimation(transformation1.getAlpha());
-        assertEquals(0.0f, transformation2.getAlpha(), DELTA);
-        assertEquals(0.0f, transformation3.getAlpha(), DELTA);
-
-        // child2 has started animation, child1 has finished and child3 hasn't started
-        childAnimation1.getTransformation(startTime + 1000, transformation1);
-        childAnimation2.getTransformation(startTime + 1000, transformation2);
-        childAnimation3.getTransformation(startTime + 1000, transformation3);
-        assertEquals(1.0f, transformation1.getAlpha(), DELTA);
-        assertIsRunningAnimation(transformation2.getAlpha());
-        assertEquals(0.0f, transformation3.getAlpha(), DELTA);
-
-        // child3 has started animation, child1, child2 have finished
-        childAnimation1.getTransformation(startTime + 1500, transformation1);
-        childAnimation2.getTransformation(startTime + 1500, transformation2);
-        childAnimation3.getTransformation(startTime + 1500, transformation3);
-        assertEquals(1.0f, transformation1.getAlpha(), DELTA);
-        assertEquals(1.0f, transformation2.getAlpha(), DELTA);
-        assertIsRunningAnimation(transformation3.getAlpha());
-
-        // Test reverse order
-        mController.setOrder(LayoutAnimationController.ORDER_REVERSE);
-        assertEquals(LayoutAnimationController.ORDER_REVERSE, mController.getOrder());
-        AnimationTestUtils.assertRunController(getInstrumentation(), mListView, mController,
-                DEFAULT_MAX_DURATION);
-
-        transformation1 = new Transformation();
-        transformation2 = new Transformation();
-        transformation3 = new Transformation();
-        childAnimation1 = mListView.getChildAt(INDEX_OF_CHILD1).getAnimation();
-        childAnimation2 = mListView.getChildAt(INDEX_OF_CHILD2).getAnimation();
-        childAnimation3 = mListView.getChildAt(INDEX_OF_CHILD3).getAnimation();
-        startTime = childAnimation1.getStartTime();
-        assertEquals(1000, childAnimation1.getStartOffset());
-        assertEquals(500, childAnimation2.getStartOffset());
-        assertEquals(0, childAnimation3.getStartOffset());
-
-        // child3 has started animation, child1 and child2 haven't started
-        childAnimation1.getTransformation(startTime + 500, transformation1);
-        childAnimation2.getTransformation(startTime + 500, transformation2);
-        childAnimation3.getTransformation(startTime + 500, transformation3);
-        assertEquals(0.0f, transformation1.getAlpha(), DELTA);
-        assertEquals(0.0f, transformation2.getAlpha(), DELTA);
-        assertIsRunningAnimation(transformation3.getAlpha());
-
-        // child2 has started animation, child3 has finished and child1 hasn't started
-        childAnimation1.getTransformation(startTime + 1000, transformation1);
-        childAnimation2.getTransformation(startTime + 1000, transformation2);
-        childAnimation3.getTransformation(startTime + 1000, transformation3);
-        assertEquals(0.0f, transformation1.getAlpha(), DELTA);
-        assertIsRunningAnimation(transformation2.getAlpha());
-        assertEquals(1.0f, transformation3.getAlpha(), DELTA);
-
-        // child1 has started animation, child2 and child3 has finished
-        childAnimation1.getTransformation(startTime + 1500, transformation1);
-        childAnimation2.getTransformation(startTime + 1500, transformation2);
-        childAnimation3.getTransformation(startTime + 1500, transformation3);
-        assertIsRunningAnimation(transformation1.getAlpha());
-        assertEquals(1.0f, transformation2.getAlpha(), DELTA);
-        assertEquals(1.0f, transformation3.getAlpha(), DELTA);
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "getDelay",
-            args = { }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "setDelay",
-            args = {float.class }
-        )
-    })
-    public void testAccessDelay() throws InterruptedException {
-        mController.setOrder(LayoutAnimationController.ORDER_NORMAL);
-        float delay = 1.5f;
-        mController.setDelay(delay);
-        assertEquals(delay, mController.getDelay());
-        long maxDuration = (long) (delay * INDEX_OF_CHILD3 * DURATION + DURATION);
-        AnimationTestUtils.assertRunController(getInstrumentation(), mListView, mController,
-                maxDuration);
-
-        Animation childAnimation1 = mListView.getChildAt(INDEX_OF_CHILD1).getAnimation();
-        Animation childAnimation2 = mListView.getChildAt(INDEX_OF_CHILD2).getAnimation();
-        Animation childAnimation3 = mListView.getChildAt(INDEX_OF_CHILD3).getAnimation();
-
-        long startTime = childAnimation1.getStartTime();
-        long offsetTime1 = childAnimation1.getStartOffset();
-        long offsetTime2 = childAnimation2.getStartOffset();
-        long offsetTime3 = childAnimation3.getStartOffset();
-        // child animation delay = child index * delay * animation duration
-        assertEquals(0, offsetTime1);
-        assertEquals(1500, offsetTime2);
-        assertEquals(3000, offsetTime3);
-
-        Transformation transformation1 = new Transformation();
-        Transformation transformation2 = new Transformation();
-        Transformation transformation3 = new Transformation();
-
-        // child1 has started animation, child2 and child3 haven't started
-        childAnimation1.getTransformation(startTime + 500, transformation1);
-        childAnimation2.getTransformation(startTime + 500, transformation2);
-        childAnimation3.getTransformation(startTime + 500, transformation3);
-        assertIsRunningAnimation(transformation1.getAlpha());
-        assertEquals(0.0f, transformation2.getAlpha(), DELTA);
-        assertEquals(0.0f, transformation3.getAlpha(), DELTA);
-
-        // child1 has finished, child2 and child3 haven't started
-        childAnimation1.getTransformation(startTime + 1200, transformation1);
-        childAnimation2.getTransformation(startTime + 1200, transformation2);
-        childAnimation3.getTransformation(startTime + 1200, transformation3);
-        assertEquals(1.0f, transformation1.getAlpha(), DELTA);
-        assertEquals(0.0f, transformation2.getAlpha(), DELTA);
-        assertEquals(0.0f, transformation3.getAlpha(), DELTA);
-
-        // child1 has finished, child2 has started animation, child3 hasn't started.
-        childAnimation1.getTransformation(startTime + 2000, transformation1);
-        childAnimation2.getTransformation(startTime + 2000, transformation2);
-        childAnimation3.getTransformation(startTime + 2000, transformation3);
-        assertEquals(1.0f, transformation1.getAlpha(), DELTA);
-        assertIsRunningAnimation(transformation2.getAlpha());
-        assertEquals(0.0f, transformation3.getAlpha(), DELTA);
-
-        // child1 and child2 have finished, child3 hasn't started
-        childAnimation1.getTransformation(startTime + 2700, transformation1);
-        childAnimation2.getTransformation(startTime + 2700, transformation2);
-        childAnimation3.getTransformation(startTime + 2700, transformation3);
-        assertEquals(1.0f, transformation1.getAlpha(), DELTA);
-        assertEquals(1.0f, transformation2.getAlpha(), DELTA);
-        assertEquals(0.0f, transformation3.getAlpha(), DELTA);
-
-        // child1 and child2 have finished, child3 has started animation
-        childAnimation1.getTransformation(startTime + 3500, transformation1);
-        childAnimation2.getTransformation(startTime + 3500, transformation2);
-        childAnimation3.getTransformation(startTime + 3500, transformation3);
-        assertIsRunningAnimation(transformation3.getAlpha());
-    }
-
-    private void assertIsRunningAnimation(float alpha) {
-        assertTrue(alpha > 0.0f);
-        assertTrue(alpha < 1.0f);
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "getAnimation",
-            args = { }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "setAnimation",
-            args = {Animation.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "setAnimation",
-            args = {Context.class, int.class }
-        )
-    })
-    public void testAccessAnimation() throws InterruptedException {
-        Animation animation = AnimationUtils.loadAnimation(mActivity, R.anim.decelerate_alpha);
-        animation.setFillAfter(true);
-        // duration defined in decelerate_alpha.xml is 2000
-        long duration = 2000;
-        mController.setAnimation(animation);
-        assertSame(animation, mController.getAnimation());
-        long maxDuration = (long) (DEFAULT_DELAY * INDEX_OF_CHILD3 * duration + duration);
-        AnimationTestUtils.assertRunController(getInstrumentation(), mListView, mController,
-                maxDuration);
-
-        Animation childAnimation1 = mListView.getChildAt(INDEX_OF_CHILD1).getAnimation();
-        Animation childAnimation2 = mListView.getChildAt(INDEX_OF_CHILD2).getAnimation();
-        Animation childAnimation3 = mListView.getChildAt(INDEX_OF_CHILD3).getAnimation();
-        assertAnimation(childAnimation1, false, duration);
-        assertAnimation(childAnimation2, false, duration);
-        assertAnimation(childAnimation3, false, duration);
-
-        mController.setAnimation(mActivity, R.anim.layout_anim_controller_animation);
-        Animation actualAnimation = mController.getAnimation();
-        assertEquals(DURATION, actualAnimation.getDuration());
-        assertTrue(actualAnimation.getInterpolator() instanceof AccelerateInterpolator);
-        AnimationTestUtils.assertRunController(getInstrumentation(), mListView, mController,
-                DEFAULT_MAX_DURATION);
-
-        childAnimation1 = mListView.getChildAt(INDEX_OF_CHILD1).getAnimation();
-        childAnimation2 = mListView.getChildAt(INDEX_OF_CHILD2).getAnimation();
-        childAnimation3 = mListView.getChildAt(INDEX_OF_CHILD3).getAnimation();
-        assertAnimation(childAnimation1, true, DURATION);
-        assertAnimation(childAnimation2, true, DURATION);
-        assertAnimation(childAnimation3, true, DURATION);
-    }
-
-    /**
-     * This method is used for asserting alpha of accelerate and decelerate animations to
-     * make sure their accelerate/decelerate functionalities really work.
-     * @param animation
-     * @param isAccelerate
-     * @param duration
-     */
-    private void assertAnimation(Animation animation, boolean isAccelerate, long duration) {
-        Transformation transformation = new Transformation();
-        long baseTime = animation.getStartTime() + animation.getStartOffset();
-        animation.getTransformation(baseTime, transformation);
-        long step = duration / 4;
-        float alpha1 = transformation.getAlpha();
-        animation.getTransformation(baseTime + step * 1, transformation);
-        float alpha2 = transformation.getAlpha();
-        animation.getTransformation(baseTime + step * 2, transformation);
-        float alpha3 = transformation.getAlpha();
-        animation.getTransformation(baseTime + step * 3, transformation);
-        float alpha4 = transformation.getAlpha();
-        animation.getTransformation(baseTime + step * 4, transformation);
-        float alpha5 = transformation.getAlpha();
-
-        // check decelerating delta alpha
-        float delta1 = alpha2 - alpha1;
-        float delta2 = alpha3 - alpha2;
-        float delta3 = alpha4 - alpha3;
-        float delta4 = alpha5 - alpha4;
-        if (isAccelerate) {
-            assertTrue(delta1 < delta2);
-            assertTrue(delta2 < delta3);
-            assertTrue(delta3 < delta4);
-        } else {
-            assertTrue(delta1 > delta2);
-            assertTrue(delta2 > delta3);
-            assertTrue(delta3 > delta4);
-        }
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "getInterpolator",
-            args = { }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "setInterpolator",
-            args = {Interpolator.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "setInterpolator",
-            args = {Context.class, int.class }
-        )
-    })
-    public void testAccessInterpolator() throws InterruptedException {
-        DecelerateInterpolator interpolator = new DecelerateInterpolator(1.0f);
-        mController.setInterpolator(interpolator);
-        assertSame(interpolator, mController.getInterpolator());
-        AnimationTestUtils.assertRunController(getInstrumentation(), mListView, mController,
-                DEFAULT_MAX_DURATION);
-
-        Animation childAnimation1 = mListView.getChildAt(INDEX_OF_CHILD1).getAnimation();
-        Animation childAnimation2 = mListView.getChildAt(INDEX_OF_CHILD2).getAnimation();
-        Animation childAnimation3 = mListView.getChildAt(INDEX_OF_CHILD3).getAnimation();
-
-        long delta1 = childAnimation2.getStartOffset() - childAnimation1.getStartOffset();
-        long delta2 = childAnimation3.getStartOffset() - childAnimation2.getStartOffset();
-        assertTrue(delta2 < delta1);
-
-        mController.setInterpolator(mActivity, android.R.anim.accelerate_interpolator);
-        assertTrue(mController.getInterpolator() instanceof AccelerateInterpolator);
-        AnimationTestUtils.assertRunController(getInstrumentation(), mListView, mController,
-                DEFAULT_MAX_DURATION);
-
-        childAnimation1 = mListView.getChildAt(INDEX_OF_CHILD1).getAnimation();
-        childAnimation2 = mListView.getChildAt(INDEX_OF_CHILD2).getAnimation();
-        childAnimation3 = mListView.getChildAt(INDEX_OF_CHILD3).getAnimation();
-
-        delta1 = childAnimation2.getStartOffset() - childAnimation1.getStartOffset();
-        delta2 = childAnimation3.getStartOffset() - childAnimation2.getStartOffset();
-        assertTrue(delta2 > delta1);
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "LayoutAnimationController",
-            args = {Context.class, AttributeSet.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "LayoutAnimationController",
-            args = {Animation.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "LayoutAnimationController",
-            args = {Animation.class, float.class }
-        )
-    })
-    public void testConstructor() {
-        XmlResourceParser parser = mActivity.getResources().getAnimation(
-                R.anim.accelerate_decelerate_alpha);
-        AttributeSet attrs = Xml.asAttributeSet(parser);
-        new LayoutAnimationController(mActivity, attrs);
-        new LayoutAnimationController(mDefaultAnimation, DEFAULT_DELAY);
-        LayoutAnimationController controller = new LayoutAnimationController(mDefaultAnimation);
-        assertEquals(DEFAULT_DELAY, controller.getDelay());
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "getDelayForView",
-        args = {View.class }
-    )
-    public void testGetDelayForView() throws Throwable {
-        Animation animation = AnimationUtils.loadAnimation(mActivity, R.anim.decelerate_alpha);
-        animation.setFillAfter(true);
-        MyLayoutAnimationController controller = new MyLayoutAnimationController(animation);
-
-        // child1's animationParams
-        final AbsListView.LayoutParams layoutParams1 = setAnimationParameters(0);
-        // child2's animationParams
-        final AbsListView.LayoutParams layoutParams2 = setAnimationParameters(1);
-        // child3's animationParams
-        final AbsListView.LayoutParams layoutParams3 = setAnimationParameters(2);
-
-        final View child1 = mListView.getChildAt(INDEX_OF_CHILD1);
-        final View child2 = mListView.getChildAt(INDEX_OF_CHILD2);
-        final View child3 = mListView.getChildAt(INDEX_OF_CHILD3);
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                child1.setLayoutParams(layoutParams1);
-                child2.setLayoutParams(layoutParams2);
-                child3.setLayoutParams(layoutParams3);
-            }
-        });
-
-        AnimationTestUtils.assertRunController(getInstrumentation(), mListView, controller,
-                DEFAULT_MAX_DURATION);
-
-        assertEquals(0, controller.getDelayForView(child1));
-        assertEquals(1000, controller.getDelayForView(child2));
-        assertEquals(2000, controller.getDelayForView(child3));
-    }
-
-    private AbsListView.LayoutParams setAnimationParameters(int index) {
-        AnimationParameters animationParams = new AnimationParameters();
-        animationParams.index = index;
-        animationParams.count = 3;
-        final AbsListView.LayoutParams layoutParams = new AbsListView.LayoutParams(
-                LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
-        layoutParams.layoutAnimationParameters = animationParams;
-        return layoutParams;
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "getTransformedIndex",
-        args = {AnimationParameters.class }
-    )
-    public void testGetTransformedIndex() {
-        Animation animation = AnimationUtils.loadAnimation(mActivity, R.anim.decelerate_alpha);
-        animation.setFillAfter(true);
-        MyLayoutAnimationController controller = new MyLayoutAnimationController(animation);
-        AnimationParameters animationParams = new AnimationParameters();
-        animationParams.count = 3;
-
-        // Test getTransformedIndex in ORDER_NORMAL condition, child1_index == 0, child2_index == 1,
-        // child3_index == 2
-        animationParams.index = 0;
-        assertEquals(0, controller.getTransformedIndex(animationParams));
-        animationParams.index = 1;
-        assertEquals(1, controller.getTransformedIndex(animationParams));
-        animationParams.index = 2;
-        assertEquals(2, controller.getTransformedIndex(animationParams));
-        // Test getTransformedIndex in ORDER_REVERSE condition, child1_index == 2,
-        // child2_index == 1, child3_index == 0
-        controller.setOrder(LayoutAnimationController.ORDER_REVERSE);
-        animationParams.index = 0;
-        assertEquals(2, controller.getTransformedIndex(animationParams));
-        animationParams.index = 1;
-        assertEquals(1, controller.getTransformedIndex(animationParams));
-        animationParams.index = 2;
-        assertEquals(0, controller.getTransformedIndex(animationParams));
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "start",
-        args = { }
-    )
-    public void testStart() {
-        Animation animation = new ScaleAnimation(0.0f, 10.0f, 0.0f, 20.0f);
-        animation.setStartTime(500);
-        LayoutAnimationController controller = new LayoutAnimationController(animation);
-
-        assertTrue(Animation.START_ON_FIRST_FRAME != controller.getAnimation().getStartTime());
-
-        controller.start();
-        assertEquals(Animation.START_ON_FIRST_FRAME, controller.getAnimation().getStartTime());
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "isDone",
-        args = { }
-    )
-    @ToBeFixed(bug = "1799434", explanation = "isDone() always return true")
-    public void testIsDone() throws InterruptedException {
-        AnimationTestUtils.assertRunController(getInstrumentation(), mListView, mController,
-                DEFAULT_MAX_DURATION);
-        assertTrue(mController.isDone());
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "getAnimationForView",
-        args = {View.class }
-    )
-    public void testGetAnimationForView() throws InterruptedException {
-        Animation animation = AnimationUtils.loadAnimation(mActivity, R.anim.decelerate_alpha);
-        animation.setFillAfter(true);
-        mController.setAnimation(animation);
-        AnimationTestUtils.assertRunController(getInstrumentation(), mListView, mController,
-                DEFAULT_MAX_DURATION);
-        Animation childAnimation1 = mListView.getChildAt(INDEX_OF_CHILD1).getAnimation();
-        Animation childAnimation2 = mListView.getChildAt(INDEX_OF_CHILD2).getAnimation();
-        Animation childAnimation3 = mListView.getChildAt(INDEX_OF_CHILD3).getAnimation();
-        // duration defined in decelerate_alpha.xml is 2000
-        long duration = 2000;
-        assertAnimation(childAnimation1, false, duration);
-        assertAnimation(childAnimation2, false, duration);
-        assertAnimation(childAnimation3, false, duration);
-        assertEquals(0, childAnimation1.getStartOffset());
-        assertEquals(1000, childAnimation2.getStartOffset());
-        assertEquals(2000, childAnimation3.getStartOffset());
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "willOverlap",
-        args = { }
-    )
-    public void testWillOverlap() {
-        LayoutAnimationController controller = new LayoutAnimationController(mDefaultAnimation);
-
-        controller.setDelay(0.5f);
-        assertTrue(controller.willOverlap());
-
-        controller.setDelay(1.0f);
-        assertFalse(controller.willOverlap());
-
-        controller.setDelay(1.5f);
-        assertFalse(controller.willOverlap());
-    }
-
-    private class MyLayoutAnimationController extends LayoutAnimationController {
-        public MyLayoutAnimationController(Animation animation) {
-            super(animation);
-        }
-
-        protected int getTransformedIndex(AnimationParameters params) {
-            return super.getTransformedIndex(params);
-        }
-
-        protected long getDelayForView(View view) {
-            return super.getDelayForView(view);
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/LayoutAnimationController_AnimationParametersTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/LayoutAnimationController_AnimationParametersTest.java
deleted file mode 100755
index f035039fc6c960722e498840f7ab83e9f7631378..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/LayoutAnimationController_AnimationParametersTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-
-import android.test.AndroidTestCase;
-import android.view.animation.LayoutAnimationController;
-
-@TestTargetClass(LayoutAnimationController.AnimationParameters.class)
-public class LayoutAnimationController_AnimationParametersTest extends AndroidTestCase {
-
-    @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "LayoutAnimationController.AnimationParameters",
-            args = { }
-        )
-    public void testConstructor() {
-        new LayoutAnimationController.AnimationParameters();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/LayoutAnimationTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/LayoutAnimationTest.java
deleted file mode 100755
index 352d0f95f73476d1f8d43ccf1eb11a1287ba01cd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/LayoutAnimationTest.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mediatek.common.view.tests.animation;
-
-import com.mediatek.common.view.tests.R;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import android.animation.Animator;
-import android.animation.LayoutTransition;
-import android.animation.LayoutTransition.TransitionListener;
-import android.animation.ObjectAnimator;
-import android.animation.PropertyValuesHolder;
-import android.animation.TimeInterpolator;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.TouchUtils;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.animation.AccelerateInterpolator;
-import android.widget.Button;
-import android.widget.LinearLayout;
-
-public class LayoutAnimationTest extends
-        ActivityInstrumentationTestCase2<LayoutAnimationActivity> {
-    private LayoutAnimationActivity mActivity;
-    private MyLayoutTransition mLayoutTransition;
-    private LinearLayout mView;
-    private Button mButton;
-    public LayoutAnimationTest() {
-        super(LayoutAnimationActivity.class);
-    }
-
-    public void setUp() throws Exception {
-        super.setUp();
-        setActivityInitialTouchMode(true);
-        mActivity = getActivity();
-        mView = (LinearLayout) mActivity.findViewById(R.id.container);
-        mButton = (Button) mActivity.findViewById(R.id.button1);
-        mLayoutTransition = new MyLayoutTransition();
-    }
-
-    public void testAddTransitionListener() throws Throwable {
-        MyTransitionListener listener = new MyTransitionListener();
-        assertNull(mLayoutTransition.getTransitionListeners());
-        mLayoutTransition.addTransitionListener(listener);
-
-        List<TransitionListener> layoutTransitionList = mLayoutTransition.getTransitionListeners();
-        TransitionListener actualListener = layoutTransitionList.get(0);
-        assertEquals(1, layoutTransitionList.size());
-        assertEquals(listener, actualListener);
-    }
-
-    public void testIsRunning() {
-        setDefaultTransition();
-        assertFalse(mLayoutTransition.isRunning());
-        TouchUtils.clickView(this, mButton);
-        assertTrue(mLayoutTransition.isRunning());
-    }
-
-    public void testIsChangingLayout() {
-        long duration = 2000L;
-        mView.setLayoutTransition(mLayoutTransition);
-        mLayoutTransition.setDuration(duration);
-        mLayoutTransition.setInterpolator(LayoutTransition.CHANGE_APPEARING,
-                new AccelerateInterpolator());
-
-        assertFalse(mLayoutTransition.isChangingLayout());
-        TouchUtils.clickView(this, mButton);
-        assertTrue(mLayoutTransition.isChangingLayout());
-    }
-
-    public void testSetDuration() {
-        long duration = 1000L;
-        mLayoutTransition.setDuration(duration);
-
-        assertEquals(duration, mLayoutTransition.getDuration(LayoutTransition.APPEARING));
-        assertEquals(duration, mLayoutTransition.getDuration(LayoutTransition.CHANGE_APPEARING));
-        assertEquals(duration,
-                     mLayoutTransition.getDuration(LayoutTransition.CHANGE_DISAPPEARING));
-        assertEquals(duration, mLayoutTransition.getDuration(LayoutTransition.DISAPPEARING));
-    }
-
-    public void testSetDurationForTransitionType() {
-        long duration = 1000L;
-        mLayoutTransition.setDuration(LayoutTransition.APPEARING, duration);
-        assertEquals(duration, mLayoutTransition.getDuration(LayoutTransition.APPEARING));
-    }
-
-    public void testSetInterpolator() {
-        TimeInterpolator interpolator = new AccelerateInterpolator();
-        mLayoutTransition.setInterpolator(LayoutTransition.APPEARING, interpolator);
-        assertEquals(interpolator, mLayoutTransition.getInterpolator(
-                LayoutTransition.APPEARING));
-    }
-
-    public void testSetAnimator() {
-        float startAlpha = 0.0f;
-        float endAlpha = 0.5f;
-        PropertyValuesHolder pvhAlpha = PropertyValuesHolder.ofFloat("alpha", startAlpha,
-                endAlpha);
-        ObjectAnimator appearingAnimator =  (ObjectAnimator) ObjectAnimator.ofPropertyValuesHolder(
-                (Object) null, pvhAlpha);
-        appearingAnimator.setInterpolator(new AccelerateInterpolator());
-        mLayoutTransition.setAnimator(LayoutTransition.APPEARING, appearingAnimator);
-        assertEquals(appearingAnimator, mLayoutTransition.getAnimator(LayoutTransition.APPEARING));
-    }
-
-    public void testAnimationWithAnimator() throws Throwable {
-        MyTransitionListener listener = new MyTransitionListener();
-        mLayoutTransition.addTransitionListener(listener);
-        mLayoutTransition.setAnimateParentHierarchy(false);
-        long duration = 2000;
-        mView.setLayoutTransition(mLayoutTransition);
-        mLayoutTransition.setDuration(duration);
-        float startAlpha = 0.0f;
-        float endAlpha = 0.5f;
-        PropertyValuesHolder pvhAlpha = PropertyValuesHolder.ofFloat("alpha", startAlpha,
-                endAlpha);
-        ObjectAnimator appearingAnimator =  (ObjectAnimator) ObjectAnimator.ofPropertyValuesHolder(
-                (Object) null, pvhAlpha);
-        appearingAnimator.setInterpolator(new AccelerateInterpolator());
-
-        mLayoutTransition.setAnimator(LayoutTransition.APPEARING, appearingAnimator);
-
-        List<Float> alphaList = new LinkedList<Float>();
-        TouchUtils.clickView(this, mButton);
-        while (listener.mTransition) {
-            float alpha = mActivity.getLastButton().getAlpha();
-            alphaList.add(alpha);
-            Thread.sleep(200);
-        }
-        Iterator<Float> iterator = alphaList.iterator();
-        float lastValue = 0.0f;
-        while (iterator.hasNext()) {
-            float alphaValue = iterator.next();
-            assertTrue(alphaValue >= lastValue);
-            assertTrue(alphaValue >= startAlpha);
-            assertTrue(alphaValue <= endAlpha);
-            lastValue = alphaValue;
-        }
-    }
-
-    public void testStartDelay() {
-        long delay = 100L;
-        int transitionType = LayoutTransition.APPEARING;
-        mLayoutTransition.setStartDelay(transitionType, delay);
-        assertEquals(delay, mLayoutTransition.getStartDelay(transitionType));
-    }
-
-    public void testSetStagger() {
-        long duration = 100;
-        int transitionType = LayoutTransition.CHANGE_APPEARING;
-        mLayoutTransition.setStagger(transitionType, duration);
-        assertEquals(duration, mLayoutTransition.getStagger(transitionType));
-    }
-
-    private void setDefaultTransition() {
-        long duration = 4000;
-        mView.setLayoutTransition(mLayoutTransition);
-        mLayoutTransition.setDuration(duration);
-        mLayoutTransition.setInterpolator(LayoutTransition.APPEARING,
-                new AccelerateInterpolator());
-    }
-
-    class MyTransitionListener implements LayoutTransition.TransitionListener {
-        ViewGroup mContainer;
-        View mView;
-        int mTransitionType;
-        boolean mTransition = false;
-        public void endTransition(LayoutTransition transition,
-                ViewGroup container, View view, int transitionType) {
-            this.mContainer = container;
-            this.mView = view;
-            this.mTransitionType = transitionType;
-            mTransition = false;
-        }
-
-        public void startTransition(LayoutTransition transition,
-                ViewGroup container, View view, int transitionType) {
-            this.mContainer = container;
-            this.mView = view;
-            this.mTransitionType = transitionType;
-            mTransition = true;
-        }
-    }
-
-    class MyLayoutTransition extends LayoutTransition {
-        boolean mAddChild = false;
-        boolean mHideChild = false;
-        boolean mRemoveChild = false;
-        boolean mShowChild = false;
-        boolean mSetAnimator = false;
-        boolean mRemoveListener = false;
-        boolean isChangingLayout = false;
-
-        @Override
-        public void addChild(ViewGroup parent, View child) {
-            super.addChild(parent, child);
-            mAddChild = true;
-        }
-
-        @Override
-        public void hideChild(ViewGroup parent, View child) {
-            super.hideChild(parent, child);
-            mHideChild = true;
-        }
-
-        @Override
-        public boolean isChangingLayout() {
-            return super.isChangingLayout();
-        }
-
-        @Override
-        public boolean isRunning() {
-            isChangingLayout =  true;
-            return super.isRunning();
-        }
-
-        @Override
-        public void removeChild(ViewGroup parent, View child) {
-            super.removeChild(parent, child);
-            mRemoveChild = true;
-        }
-
-        @Override
-        public void removeTransitionListener(TransitionListener listener) {
-            super.removeTransitionListener(listener);
-            mRemoveListener = true;
-        }
-
-        @Override
-        public void setAnimator(int transitionType, Animator animator) {
-            super.setAnimator(transitionType, animator);
-            mSetAnimator = true;
-        }
-
-        @Override
-        public void showChild(ViewGroup parent, View child) {
-            super.showChild(parent, child);
-            mShowChild = true;
-        }
-    }
-}
-
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/LinearInterpolatorTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/LinearInterpolatorTest.java
deleted file mode 100755
index 55a2136efb3eb9b7df8404f15ceec1528ddedeb1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/LinearInterpolatorTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-
-import android.app.Activity;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.View;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.view.animation.Interpolator;
-import android.view.animation.LinearInterpolator;
-import android.view.animation.Transformation;
-
-import com.mediatek.common.view.tests.R;
-
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-
-/**
- * Test {@link LinearInterpolator}.
- */
-@TestTargetClass(LinearInterpolator.class)
-public class LinearInterpolatorTest extends ActivityInstrumentationTestCase2<AnimationTestStubActivity> {
-
-    private Activity mActivity;
-    private static final float ALPHA_DELTA = 0.001f;
-
-    /** It is defined in R.anim.alpha */
-    private static final long LINEAR_ALPHA_DURATION = 500;
-    private static final long LINEAR_ALPHA_TIME_STEP = LINEAR_ALPHA_DURATION / 5;
-
-    public LinearInterpolatorTest() {
-        super("com.android.cts.stub", AnimationTestStubActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "LinearInterpolator",
-            args = { }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "LinearInterpolator",
-            args = {android.content.Context.class, android.util.AttributeSet.class }
-        )
-    })
-    public void testConstructor() {
-        new LinearInterpolator();
-        new LinearInterpolator(mActivity, null);
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "getInterpolation",
-        args = {float.class }
-    )
-    public void testGetInterpolation() {
-        LinearInterpolator interpolator = new LinearInterpolator();
-        final float delta1 = interpolator.getInterpolation(0.1f)
-                - interpolator.getInterpolation(0.0f);
-        final float delta2 = interpolator.getInterpolation(0.2f)
-                - interpolator.getInterpolation(0.1f);
-        final float delta3 = interpolator.getInterpolation(0.3f)
-                - interpolator.getInterpolation(0.2f);
-        assertEquals(delta1, delta2, ALPHA_DELTA);
-        assertEquals(delta2, delta3, ALPHA_DELTA);
-    }
-
-    public void testLinearInterpolator() {
-        final View animWindow = mActivity.findViewById(R.id.anim_window);
-        final Animation anim = AnimationUtils.loadAnimation(mActivity, R.anim.alpha);
-        assertEquals(LINEAR_ALPHA_DURATION, anim.getDuration());
-        assertTrue(anim instanceof AlphaAnimation);
-
-        Interpolator interpolator = new LinearInterpolator();
-        anim.setInterpolator(interpolator);
-        assertFalse(anim.hasStarted());
-
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, anim);
-
-        Transformation transformation = new Transformation();
-        final long startTime = anim.getStartTime();
-        anim.getTransformation(startTime, transformation);
-        final float alpha1 = transformation.getAlpha();
-        assertEquals(0.0f, alpha1, ALPHA_DELTA);
-
-        anim.getTransformation(startTime + LINEAR_ALPHA_TIME_STEP, transformation);
-        final float alpha2 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + LINEAR_ALPHA_TIME_STEP * 2, transformation);
-        final float alpha3 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + LINEAR_ALPHA_TIME_STEP * 3, transformation);
-        final float alpha4 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + LINEAR_ALPHA_TIME_STEP * 4, transformation);
-        final float alpha5 = transformation.getAlpha();
-
-        anim.getTransformation(startTime + LINEAR_ALPHA_DURATION, transformation);
-        final float alpha6 = transformation.getAlpha();
-        assertEquals(1.0f, alpha6, ALPHA_DELTA);
-
-        final float delta1 = alpha2 - alpha1;
-        final float delta2 = alpha3 - alpha2;
-        final float delta3 = alpha4 - alpha3;
-        final float delta4 = alpha5 - alpha4;
-        final float delta5 = alpha6 - alpha5;
-        assertEquals(delta1, delta2, ALPHA_DELTA);
-        assertEquals(delta2, delta3, ALPHA_DELTA);
-        assertEquals(delta3, delta4, ALPHA_DELTA);
-        assertEquals(delta4, delta5, ALPHA_DELTA);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ObjectAnimatorEventsTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ObjectAnimatorEventsTest.java
deleted file mode 100755
index 6b47f3eea47f50c7d9dc9dc1c11806029b1d5e94..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ObjectAnimatorEventsTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mediatek.common.view.tests.animation;
-
-import android.animation.ObjectAnimator;
-import android.widget.Button;
-
-import com.mediatek.common.view.tests.R;
-
-
-/**
- * Listener tests for ObjectAnimator.
- */
-public class ObjectAnimatorEventsTest extends EventsTest {
-
-    @Override
-    public void setUp() throws Exception {
-        final BasicAnimatorActivity activity = getActivity();
-        Button button = (Button) activity.findViewById(R.id.animatingButton);
-
-        mAnimator = ObjectAnimator.ofFloat(button, "translationX", 0, 100);
-        super.setUp();
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ObjectAnimatorTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ObjectAnimatorTest.java
deleted file mode 100755
index 7c1540a9d4251010cad05c2bbe5723f2291fa181..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ObjectAnimatorTest.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import android.animation.ArgbEvaluator;
-import android.animation.ObjectAnimator;
-import android.animation.PropertyValuesHolder;
-import android.animation.ValueAnimator;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.AccelerateInterpolator;
-import android.view.animation.Interpolator;
-
-public class ObjectAnimatorTest extends
-        ActivityInstrumentationTestCase2<AnimationActivity> {
-    private AnimationActivity mActivity;
-    private ObjectAnimator mObjectAnimator;
-    private long mDuration = 1000;
-
-    public ObjectAnimatorTest() {
-        super(AnimationActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = getActivity();
-        mObjectAnimator = (ObjectAnimator) mActivity.createAnimatorWithDuration(mDuration);
-    }
-
-    public void testDuration() throws Throwable {
-        final long duration = 2000;
-        ObjectAnimator objectAnimatorLocal = (ObjectAnimator) mActivity.createAnimatorWithDuration(
-            duration);
-        startAnimation(objectAnimatorLocal);
-        assertEquals(duration, objectAnimatorLocal.getDuration());
-    }
-    public void testOfFloat() throws Throwable {
-        Object object = mActivity.view.newBall;
-        String property = "y";
-        float startY = mActivity.mStartY;
-        float endY = mActivity.mStartY + mActivity.mDeltaY;
-        ObjectAnimator objAnimator = ObjectAnimator.ofFloat(object, property, startY, endY);
-        assertTrue(objAnimator != null);
-        objAnimator.setDuration(mDuration);
-        objAnimator.setRepeatCount(ValueAnimator.INFINITE);
-        objAnimator.setInterpolator(new AccelerateInterpolator());
-        objAnimator.setRepeatMode(ValueAnimator.REVERSE);
-        startAnimation(objAnimator);
-        assertTrue(objAnimator != null);
-        Thread.sleep(100);
-        float x = mActivity.view.newBall.getX();
-        float y = mActivity.view.newBall.getY();
-        assertTrue(y >= startY);
-        assertTrue(y <= endY);
-    }
-
-    public void testOfFloatBase() throws Throwable {
-        Object object = mActivity.view.newBall;
-        String property = "y";
-        float startY = mActivity.mStartY;
-        float endY = mActivity.mStartY + mActivity.mDeltaY;
-        ObjectAnimator animator = ObjectAnimator.ofFloat(object, property, startY, endY);
-        ObjectAnimator objAnimator = new ObjectAnimator();
-        objAnimator.setTarget(object);
-        objAnimator.setPropertyName(property);
-        assertEquals(animator.getTarget(), objAnimator.getTarget());
-        assertEquals(animator.getPropertyName(), objAnimator.getPropertyName());
-    }
-
-    public void testOfInt() throws Throwable {
-        Object object = mActivity.view.newBall;
-        String property = "backgroundColor";
-        int startColor = mActivity.view.RED;
-        int endColor = mActivity.view.BLUE;
-
-        ObjectAnimator colorAnimator = ObjectAnimator.ofInt(object, property,
-                startColor, endColor);
-        colorAnimator.setDuration(1000);
-        colorAnimator.setEvaluator(new ArgbEvaluator());
-        colorAnimator.setRepeatCount(1);
-        colorAnimator.setRepeatMode(ValueAnimator.REVERSE);
-        colorAnimator.start();
-        startAnimation(mObjectAnimator, colorAnimator);
-        Thread.sleep(100);
-        Integer i = (Integer) colorAnimator.getAnimatedValue();
-        //We are going from less negative value to a more negative value
-        assertTrue(i.intValue() <= startColor);
-        assertTrue(endColor <= i.intValue());
-    }
-
-    public void testOfObject() throws Throwable {
-        Object object = mActivity.view.newBall;
-        String property = "backgroundColor";
-        int startColor = mActivity.view.RED;
-        int endColor = mActivity.view.BLUE;
-        Object[] values = {new Integer(startColor), new Integer(endColor)};
-        ArgbEvaluator evaluator = new ArgbEvaluator();
-        ObjectAnimator colorAnimator = ObjectAnimator.ofObject(object, property,
-                evaluator, values);
-        colorAnimator.setDuration(1000);
-        colorAnimator.setRepeatCount(1);
-        colorAnimator.setRepeatMode(ValueAnimator.REVERSE);
-        colorAnimator.start();
-        startAnimation(mObjectAnimator, colorAnimator);
-        Thread.sleep(100);
-        Integer i = (Integer) colorAnimator.getAnimatedValue();
-        //We are going from less negative value to a more negative value
-        assertTrue(i.intValue() <= startColor);
-        assertTrue(endColor <= i.intValue());
-    }
-
-    public void testOfPropertyValuesHolder() throws Throwable {
-        Object object = mActivity.view.newBall;
-        String propertyName = "backgroundColor";
-        int startColor = mActivity.view.RED;
-        int endColor = mActivity.view.BLUE;
-        int values[] = {startColor, endColor};
-        ArgbEvaluator evaluator = new ArgbEvaluator();
-        PropertyValuesHolder propertyValuesHolder = PropertyValuesHolder.ofInt(propertyName, values);
-        ObjectAnimator colorAnimator = ObjectAnimator.ofPropertyValuesHolder(object,
-            propertyValuesHolder);
-        colorAnimator.setDuration(1000);
-        colorAnimator.setRepeatCount(1);
-        colorAnimator.setRepeatMode(ValueAnimator.REVERSE);
-        colorAnimator.start();
-        startAnimation(mObjectAnimator, colorAnimator);
-        Thread.sleep(100);
-        Integer i = (Integer) colorAnimator.getAnimatedValue();
-        //We are going from less negative value to a more negative value
-        assertTrue(i.intValue() <= startColor);
-        assertTrue(endColor <= i.intValue());
-    }
-
-    public void testGetPropertyName() throws Throwable {
-        Object object = mActivity.view.newBall;
-        String propertyName = "backgroundColor";
-        int startColor = mActivity.view.RED;
-        int endColor = mActivity.view.BLUE;
-        Object[] values = {new Integer(startColor), new Integer(endColor)};
-        ArgbEvaluator evaluator = new ArgbEvaluator();
-        ObjectAnimator colorAnimator = ObjectAnimator.ofObject(object, propertyName,
-                evaluator, values);
-        String actualPropertyName = colorAnimator.getPropertyName();
-        assertEquals(propertyName, actualPropertyName);
-    }
-
-    public void testSetFloatValues() throws Throwable {
-        Object object = mActivity.view.newBall;
-        String property = "y";
-        float startY = mActivity.mStartY;
-        float endY = mActivity.mStartY + mActivity.mDeltaY;
-        float[] values = {startY, endY};
-        ObjectAnimator objAnimator = new ObjectAnimator();
-        objAnimator.setTarget(object);
-        objAnimator.setPropertyName(property);
-        objAnimator.setFloatValues(values);
-        objAnimator.setDuration(mDuration);
-        objAnimator.setRepeatCount(ValueAnimator.INFINITE);
-        objAnimator.setInterpolator(new AccelerateInterpolator());
-        objAnimator.setRepeatMode(ValueAnimator.REVERSE);
-        startAnimation(objAnimator);
-        Thread.sleep(100);
-        float y = mActivity.view.newBall.getY();
-        assertTrue(y >= startY);
-        assertTrue(y <= endY);
-    }
-
-    public void testGetTarget() throws Throwable {
-        Object object = mActivity.view.newBall;
-        String propertyName = "backgroundColor";
-        int startColor = mActivity.view.RED;
-        int endColor = mActivity.view.BLUE;
-        Object[] values = {new Integer(startColor), new Integer(endColor)};
-        ArgbEvaluator evaluator = new ArgbEvaluator();
-        ObjectAnimator colorAnimator = ObjectAnimator.ofObject(object, propertyName,
-                evaluator, values);
-        Object target = colorAnimator.getTarget();
-        assertEquals(object, target);
-    }
-
-    public void testClone() throws Throwable {
-        Object object = mActivity.view.newBall;
-        String property = "y";
-        float startY = mActivity.mStartY;
-        float endY = mActivity.mStartY + mActivity.mDeltaY;
-        Interpolator interpolator = new AccelerateInterpolator();
-        ObjectAnimator objAnimator = ObjectAnimator.ofFloat(object, property, startY, endY);
-        objAnimator.setDuration(mDuration);
-        objAnimator.setRepeatCount(ValueAnimator.INFINITE);
-        objAnimator.setInterpolator(interpolator);
-        objAnimator.setRepeatMode(ValueAnimator.REVERSE);
-        ObjectAnimator cloneAnimator = objAnimator.clone();
-
-        assertEquals(mDuration, cloneAnimator.getDuration());
-        assertEquals(ValueAnimator.INFINITE, cloneAnimator.getRepeatCount());
-        assertEquals(ValueAnimator.REVERSE, cloneAnimator.getRepeatMode());
-        assertEquals(object, cloneAnimator.getTarget());
-        assertEquals(property, cloneAnimator.getPropertyName());
-        assertEquals(interpolator, cloneAnimator.getInterpolator());
-    }
-
-    public void testIsStarted() throws Throwable {
-        Object object = mActivity.view.newBall;
-        String property = "y";
-        float startY = mActivity.mStartY;
-        float endY = mActivity.mStartY + mActivity.mDeltaY;
-        Interpolator interpolator = new AccelerateInterpolator();
-        ObjectAnimator objAnimator = ObjectAnimator.ofFloat(object, property, startY, endY);
-        objAnimator.setDuration(mDuration);
-        objAnimator.setRepeatCount(ValueAnimator.INFINITE);
-        objAnimator.setInterpolator(interpolator);
-        objAnimator.setRepeatMode(ValueAnimator.REVERSE);
-        startAnimation(objAnimator);
-        Thread.sleep(100);
-        assertTrue(objAnimator.isStarted());
-        Thread.sleep(100);
-    }
-
-    private void startAnimation(final ObjectAnimator mObjectAnimator) throws Throwable {
-        Thread mAnimationRunnable = new Thread() {
-            public void run() {
-                mActivity.startAnimation(mObjectAnimator);
-            }
-        };
-        this.runTestOnUiThread(mAnimationRunnable);
-    }
-    private void startAnimation(final ObjectAnimator mObjectAnimator, final
-            ObjectAnimator colorAnimator) throws Throwable {
-        Thread mAnimationRunnable = new Thread() {
-            public void run() {
-                mActivity.startAnimation(mObjectAnimator, colorAnimator);
-            }
-        };
-        this.runTestOnUiThread(mAnimationRunnable);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/PollingCheck.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/PollingCheck.java
deleted file mode 100755
index 2a90046ab836d83fe931dd955092d5bfc1065ddd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/PollingCheck.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import java.util.concurrent.Callable;
-
-import junit.framework.Assert;
-
-public abstract class PollingCheck {
-    private static final long TIME_SLICE = 50;
-    private long mTimeout = 3000;
-
-    public PollingCheck() {
-    }
-
-    public PollingCheck(long timeout) {
-        mTimeout = timeout;
-    }
-
-    protected abstract boolean check();
-
-    public void run() {
-        if (check()) {
-            return;
-        }
-
-        long timeout = mTimeout;
-        while (timeout > 0) {
-            try {
-                Thread.sleep(TIME_SLICE);
-            } catch (InterruptedException e) {
-                Assert.fail("unexpected InterruptedException");
-            }
-
-            if (check()) {
-                return;
-            }
-
-            timeout -= TIME_SLICE;
-        }
-
-        Assert.fail("unexpected timeout");
-    }
-
-    public static void check(CharSequence message, long timeout, Callable<Boolean> condition)
-            throws Exception {
-        while (timeout > 0) {
-            if (condition.call()) {
-                return;
-            }
-
-            Thread.sleep(TIME_SLICE);
-            timeout -= TIME_SLICE;
-        }
-
-        Assert.fail(message.toString());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/PropertyValuesHolderTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/PropertyValuesHolderTest.java
deleted file mode 100755
index 45e2986c14885eda3f73d4cf4d856f2538763d37..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/PropertyValuesHolderTest.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mediatek.common.view.tests.animation;
-
-import android.animation.Animator;
-import android.animation.ArgbEvaluator;
-import android.animation.ObjectAnimator;
-import android.animation.PropertyValuesHolder;
-import android.animation.ValueAnimator;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.Property;
-import android.view.View;
-import android.view.animation.AccelerateInterpolator;
-
-public class PropertyValuesHolderTest extends
-        ActivityInstrumentationTestCase2<AnimationActivity> {
-    private AnimationActivity mActivity;
-    private Animator mAnimator;
-    private long mDuration = 1000;
-    private float mStartY;
-    private float mEndY;
-    private Object mObject;
-    private String mProperty;
-
-    public PropertyValuesHolderTest() {
-        super(AnimationActivity.class);
-    }
-
-    public void setUp() throws Exception {
-         super.setUp();
-         setActivityInitialTouchMode(false);
-         mActivity = getActivity();
-         mAnimator = mActivity.createAnimatorWithDuration(mDuration);
-         mProperty = "y";
-         mStartY = mActivity.mStartY;
-         mEndY = mActivity.mStartY + mActivity.mDeltaY;
-         mObject = mActivity.view.newBall;
-    }
-
-    public void testGetPropertyName() {
-        float[] values = {mStartY, mEndY};
-        PropertyValuesHolder pVHolder = PropertyValuesHolder.ofFloat(mProperty, values);
-        assertEquals(mProperty, pVHolder.getPropertyName());
-    }
-
-    public void testSetPropertyName() {
-        float[] values = {mStartY, mEndY};
-        PropertyValuesHolder pVHolder = PropertyValuesHolder.ofFloat("", values);
-        pVHolder.setPropertyName(mProperty);
-        assertEquals(mProperty, pVHolder.getPropertyName());
-    }
-
-    public void testClone() {
-        float[] values = {mStartY, mEndY};
-        PropertyValuesHolder pVHolder = PropertyValuesHolder.ofFloat(mProperty, values);
-        PropertyValuesHolder cloneHolder = pVHolder.clone();
-        assertEquals(pVHolder.getPropertyName(), cloneHolder.getPropertyName());
-    }
-
-    public void testSetValues() throws Throwable {
-        float[] dummyValues = {100, 150};
-        float[] values = {mStartY, mEndY};
-        PropertyValuesHolder pVHolder = PropertyValuesHolder.ofFloat(mProperty, dummyValues);
-        pVHolder.setFloatValues(values);
-
-        ObjectAnimator objAnimator = ObjectAnimator.ofPropertyValuesHolder(mObject, pVHolder);
-        assertTrue(objAnimator != null);
-        setAnimatorProperties(objAnimator);
-
-        startAnimation(objAnimator);
-        assertTrue(objAnimator != null);
-        float[] yArray = getYPosition();
-        assertResults(yArray, mStartY, mEndY);
-    }
-
-    public void testOffloat() throws Throwable {
-        float[] values = {mStartY, mEndY};
-        PropertyValuesHolder pVHolder = PropertyValuesHolder.ofFloat(mProperty, values);
-        assertNotNull(pVHolder);
-        ObjectAnimator objAnimator = ObjectAnimator.ofPropertyValuesHolder(mObject, pVHolder);
-        assertTrue(objAnimator != null);
-
-        setAnimatorProperties(objAnimator);
-        startAnimation(objAnimator);
-        assertTrue(objAnimator != null);
-        float[] yArray = getYPosition();
-        assertResults(yArray, mStartY, mEndY);
-    }
-
-    public void testOfFloat_Property() throws Throwable {
-        float[] values = {mStartY, mEndY};
-        ShapeHolderYProperty property = new ShapeHolderYProperty(ShapeHolder.class.getClass(), "y");
-        property.setObject(mObject);
-        PropertyValuesHolder pVHolder = PropertyValuesHolder.ofFloat(property, values);
-        assertNotNull(pVHolder);
-        ObjectAnimator objAnimator = ObjectAnimator.ofPropertyValuesHolder(mObject, pVHolder);
-        assertTrue(objAnimator != null);
-
-        setAnimatorProperties(objAnimator);
-        startAnimation(objAnimator);
-        assertTrue(objAnimator != null);
-        float[] yArray = getYPosition();
-        assertResults(yArray, mStartY, mEndY);
-    }
-
-    public void testOfInt() throws Throwable {
-        int start = 0;
-        int end = 10;
-        int[] values = {start, end};
-        PropertyValuesHolder pVHolder = PropertyValuesHolder.ofInt(mProperty, values);
-        assertNotNull(pVHolder);
-        final ObjectAnimator objAnimator = ObjectAnimator.ofPropertyValuesHolder(mObject, pVHolder);
-        assertTrue(objAnimator != null);
-        setAnimatorProperties(objAnimator);
-        this.runTestOnUiThread(new Runnable() {
-            public void run() {
-                objAnimator.start();
-            }
-        });
-        Thread.sleep(1000);
-        assertTrue(objAnimator.isRunning());
-        Integer animatedValue = (Integer) objAnimator.getAnimatedValue();
-        assertTrue(animatedValue >= start);
-        assertTrue(animatedValue <= end);
-    }
-
-    public void testOfInt_Property() throws Throwable {
-        Object object = mActivity.view;
-        String property = "backgroundColor";
-        int startColor = mActivity.view.RED;
-        int endColor = mActivity.view.BLUE;
-        int values[] = {startColor, endColor};
-
-        ViewColorProperty colorProperty = new ViewColorProperty(Integer.class.getClass(), property);
-        colorProperty.setObject(object);
-        PropertyValuesHolder pVHolder = PropertyValuesHolder.ofInt(colorProperty, values);
-        assertNotNull(pVHolder);
-
-        ObjectAnimator colorAnimator = ObjectAnimator.ofPropertyValuesHolder(object, pVHolder);
-        colorAnimator.setDuration(1000);
-        colorAnimator.setEvaluator(new ArgbEvaluator());
-        colorAnimator.setRepeatCount(ValueAnimator.INFINITE);
-        colorAnimator.setRepeatMode(ValueAnimator.REVERSE);
-
-        ObjectAnimator objectAnimator = (ObjectAnimator) mActivity.createAnimatorWithDuration(
-            mDuration);
-        startAnimation(objectAnimator, colorAnimator);
-        Thread.sleep(1000);
-        Integer i = (Integer) colorAnimator.getAnimatedValue();
-        //We are going from less negative value to a more negative value
-        assertTrue(i.intValue() <= startColor);
-        assertTrue(endColor <= i.intValue());
-    }
-
-    public void testSetProperty() throws Throwable {
-        float[] values = {mStartY, mEndY};
-        ShapeHolderYProperty property = new ShapeHolderYProperty(ShapeHolder.class.getClass(), "y");
-        property.setObject(mObject);
-        PropertyValuesHolder pVHolder = PropertyValuesHolder.ofFloat("", values);
-        pVHolder.setProperty(property);
-        ObjectAnimator objAnimator = ObjectAnimator.ofPropertyValuesHolder(mObject, pVHolder);
-        setAnimatorProperties(objAnimator);
-        startAnimation(objAnimator);
-        assertTrue(objAnimator != null);
-        float[] yArray = getYPosition();
-        assertResults(yArray, mStartY, mEndY);
-    }
-
-    class ShapeHolderYProperty extends Property {
-        private ShapeHolder shapeHolder ;
-        private Class type = Float.class.getClass();
-        private String name = "y";
-        @SuppressWarnings("unchecked")
-        public ShapeHolderYProperty(Class type, String name) throws Exception {
-            super(Float.class, name);
-            if (!(type.equals(this.type) || (name.equals(this.name)))) {
-                throw new Exception("Type or name provided does not match with " +
-                        this.type.getName() + " or " + this.name);
-            }
-        }
-
-        public void setObject(Object object) {
-            shapeHolder = (ShapeHolder) object;
-        }
-
-        @Override
-        public Object get(Object object) {
-            return shapeHolder;
-        }
-
-        @Override
-        public String getName() {
-            return "y";
-        }
-
-        @Override
-        public Class getType() {
-            return super.getType();
-        }
-
-        @Override
-        public boolean isReadOnly() {
-            return false;
-        }
-
-        @Override
-        public void set(Object object, Object value) {
-            shapeHolder.setY((Float) value);
-        }
-
-    }
-
-    class ViewColorProperty extends Property {
-        private View view ;
-        private Class type = Integer.class.getClass();
-        private String name = "backgroundColor";
-        @SuppressWarnings("unchecked")
-        public ViewColorProperty(Class type, String name) throws Exception {
-            super(Integer.class, name);
-            if (!(type.equals(this.type) || (name.equals(this.name)))) {
-                throw new Exception("Type or name provided does not match with " +
-                        this.type.getName() + " or " + this.name);
-            }
-        }
-
-        public void setObject(Object object) {
-            view = (View) object;
-        }
-
-        @Override
-        public Object get(Object object) {
-            return view;
-        }
-
-        @Override
-        public String getName() {
-            return name;
-        }
-
-        @Override
-        public Class getType() {
-            return super.getType();
-        }
-
-        @Override
-        public boolean isReadOnly() {
-            return false;
-        }
-
-        @Override
-        public void set(Object object, Object value) {
-            view.setBackgroundColor((Integer) value);
-        }
-    }
-
-    private void setAnimatorProperties(ObjectAnimator objAnimator) {
-        objAnimator.setDuration(mDuration);
-        objAnimator.setRepeatCount(ValueAnimator.INFINITE);
-        objAnimator.setInterpolator(new AccelerateInterpolator());
-        objAnimator.setRepeatMode(ValueAnimator.REVERSE);
-    }
-
-    public float[] getYPosition() throws Throwable {
-        float[] yArray = new float[3];
-        for (int i = 0; i < 3; i++) {
-            float y = mActivity.view.newBall.getY();
-            yArray[i] = y;
-            Thread.sleep(300);
-        }
-        return yArray;
-    }
-
-    public void assertResults(float[] yArray, float startY, float endY) {
-        for (int i = 0; i < 3; i++) {
-            float y = yArray[i];
-            assertTrue(y >= startY);
-            assertTrue(y <= endY);
-            if (i < 2) {
-                float yNext = yArray[i + 1];
-                assertTrue(y != yNext);
-            }
-        }
-    }
-
-    private void startAnimation(final Animator animator) throws Throwable {
-        this.runTestOnUiThread(new Runnable() {
-            public void run() {
-                mActivity.startAnimation(animator);
-            }
-        });
-    }
-
-    private void startAnimation(final ObjectAnimator mObjectAnimator,
-            final ObjectAnimator colorAnimator) throws Throwable {
-        Thread mAnimationRunnable = new Thread() {
-            public void run() {
-                mActivity.startAnimation(mObjectAnimator, colorAnimator);
-            }
-        };
-        this.runTestOnUiThread(mAnimationRunnable);
-    }
-}
-
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/RotateAnimationTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/RotateAnimationTest.java
deleted file mode 100755
index da967dd4fcd5e5771f3118a1a52949cbd91fcfd5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/RotateAnimationTest.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import android.app.Activity;
-import android.content.res.XmlResourceParser;
-import android.graphics.Matrix;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.AttributeSet;
-import android.util.Xml;
-import android.view.View;
-import android.view.animation.Animation;
-import android.view.animation.LinearInterpolator;
-import android.view.animation.RotateAnimation;
-import android.view.animation.Transformation;
-
-import com.mediatek.common.view.tests.R;
-
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-
-@TestTargetClass(android.view.animation.RotateAnimation.class)
-public class RotateAnimationTest
-        extends ActivityInstrumentationTestCase2<AnimationTestStubActivity> {
-
-    private Activity mActivity;
-
-    private static final long DURATION = 1000;
-    private static final float ROTATE_DELTA = 0.001f;
-    private static final float FROM_DEGREE = 0.0f;
-    private static final float TO_DEGREE = 90.0f;
-
-    public RotateAnimationTest() {
-        super("com.android.cts.stub", AnimationTestStubActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "RotateAnimation",
-            args = {android.content.Context.class, android.util.AttributeSet.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "RotateAnimation",
-            args = {float.class, float.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "RotateAnimation",
-            args = {float.class, float.class, float.class, float.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "RotateAnimation",
-            args = {float.class, float.class, int.class, float.class, int.class, float.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "RotateAnimation",
-            args = {float.class, float.class }
-        )
-    })
-    public void testConstructors() {
-
-        // Test with null AttributeSet
-        new RotateAnimation(mActivity, null);
-
-        final XmlResourceParser parser = mActivity.getResources().getAnimation(
-                R.anim.anim_rotate);
-        final AttributeSet attr = Xml.asAttributeSet(parser);
-        assertNotNull(attr);
-        // Test with real AttributeSet
-        new RotateAnimation(mActivity, attr);
-
-        // Test {@link RotateAnimation#RotateAnimation(float, float)}
-        new RotateAnimation(0.6f, 0.6f);
-        // Test negative input values
-        new RotateAnimation(-0.6f, -0.6f);
-
-        // Test {@link RotateAnimation#RotateAnimation(float, float, float, float)}
-        new RotateAnimation(0.6f, 0.6f, 0.6f, 0.6f);
-        // Test negative input values
-        new RotateAnimation(-0.6f, -0.6f, -0.6f, -0.6f);
-
-        // Test {@link RotateAnimation#RotateAnimation(float, float, int, float, int, float)}
-        new RotateAnimation(0.6f, 0.6f, Animation.ABSOLUTE, 0.6f, Animation.ABSOLUTE, 0.6f);
-        // Test negative input values
-        new RotateAnimation(-0.6f, -0.6f, Animation.ABSOLUTE, -0.6f, Animation.ABSOLUTE, -0.6f);
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "applyTransformation",
-            args = {float.class, android.view.animation.Transformation.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "initialize",
-            args = {int.class, int.class, int.class, int.class }
-        )
-    })
-    public void testRotateAgainstOrigin() {
-        final View animWindowParent = mActivity.findViewById(R.id.anim_window_parent);
-        final View animWindow = mActivity.findViewById(R.id.anim_window);
-        Transformation transformation = new Transformation();
-        // Test when mPivot x and y equal to 0.
-        MyRotateAnimation rotateAnimation = new MyRotateAnimation(FROM_DEGREE, TO_DEGREE);
-        rotateAnimation.setDuration(DURATION);
-        rotateAnimation.setInterpolator(new LinearInterpolator());
-
-        assertFalse(rotateAnimation.isInitialized());
-        rotateAnimation.initialize(animWindow.getWidth(), animWindow.getHeight(),
-                animWindowParent.getWidth(), animWindowParent.getHeight());
-        assertTrue(rotateAnimation.isInitialized());
-
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, rotateAnimation);
-        final long startTime = rotateAnimation.getStartTime();
-
-        Matrix expectedMatrix = new Matrix();
-        expectedMatrix.setRotate(FROM_DEGREE);
-        rotateAnimation.getTransformation(startTime, transformation);
-        assertMatrixEquals(expectedMatrix, transformation.getMatrix());
-        transformation.clear();
-        rotateAnimation.applyTransformation(0.0f, transformation);
-        assertMatrixEquals(expectedMatrix, transformation.getMatrix());
-
-        expectedMatrix.reset();
-        expectedMatrix.setRotate((FROM_DEGREE + TO_DEGREE) / 2);
-        rotateAnimation.getTransformation(startTime + DURATION / 2, transformation);
-        assertMatrixEquals(expectedMatrix, transformation.getMatrix());
-        transformation.clear();
-        rotateAnimation.applyTransformation(0.5f, transformation);
-        assertMatrixEquals(expectedMatrix, transformation.getMatrix());
-
-        expectedMatrix.reset();
-        expectedMatrix.setRotate(TO_DEGREE);
-        rotateAnimation.getTransformation(startTime + DURATION, transformation);
-        assertMatrixEquals(expectedMatrix, transformation.getMatrix());
-        rotateAnimation.applyTransformation(1.0f, transformation);
-        assertMatrixEquals(expectedMatrix, transformation.getMatrix());
-    }
-
-    private void assertMatrixEquals(Matrix expectedMatrix, Matrix actualMatrix) {
-        final float[] expectedMatrixValues = new float[9];
-        final float[] actualMatrixValues = new float[9];
-        expectedMatrix.getValues(expectedMatrixValues);
-        actualMatrix.getValues(actualMatrixValues);
-        for (int i = 0; i < 9; i++) {
-            assertEquals(expectedMatrixValues[i], actualMatrixValues[i], ROTATE_DELTA);
-        }
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "applyTransformation",
-            args = {float.class, android.view.animation.Transformation.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "initialize",
-            args = {int.class, int.class, int.class, int.class }
-        )
-    })
-    public void testRotateAgainstPoint() {
-        final View animWindowParent = mActivity.findViewById(R.id.anim_window_parent);
-        final View animWindow = mActivity.findViewById(R.id.anim_window);
-        Transformation transformation = new Transformation();
-        final float pivotX = 0.2f;
-        final float pivotY = 0.2f;
-        final float actualPivotX = pivotX * animWindowParent.getWidth();
-        final float actualPivotY = pivotY * animWindow.getHeight();
-        // Test when mPivot x and y are not origin
-        MyRotateAnimation rotateAnimation = new MyRotateAnimation(FROM_DEGREE, TO_DEGREE,
-                    Animation.RELATIVE_TO_PARENT, pivotX, Animation.RELATIVE_TO_SELF, pivotY);
-        rotateAnimation.setDuration(DURATION);
-        rotateAnimation.setInterpolator(new LinearInterpolator());
-
-        assertFalse(rotateAnimation.isInitialized());
-        rotateAnimation.initialize(animWindow.getWidth(), animWindow.getHeight(),
-                animWindowParent.getWidth(), animWindowParent.getHeight());
-        assertTrue(rotateAnimation.isInitialized());
-
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, rotateAnimation);
-        final long startTime = rotateAnimation.getStartTime();
-
-        Matrix expectedMatrix = new Matrix();
-        expectedMatrix.setRotate(FROM_DEGREE, actualPivotX, actualPivotY);
-        rotateAnimation.getTransformation(startTime, transformation);
-        assertMatrixEquals(expectedMatrix, transformation.getMatrix());
-        transformation.clear();
-        rotateAnimation.applyTransformation(0.0f, transformation);
-        assertMatrixEquals(expectedMatrix, transformation.getMatrix());
-
-        expectedMatrix.reset();
-        expectedMatrix.setRotate((FROM_DEGREE + TO_DEGREE) / 2, actualPivotX, actualPivotY);
-        rotateAnimation.getTransformation(startTime + DURATION / 2, transformation);
-        assertMatrixEquals(expectedMatrix, transformation.getMatrix());
-        transformation.clear();
-        rotateAnimation.applyTransformation(0.5f, transformation);
-        assertMatrixEquals(expectedMatrix, transformation.getMatrix());
-
-        expectedMatrix.reset();
-        expectedMatrix.setRotate(TO_DEGREE, actualPivotX, actualPivotY);
-        rotateAnimation.getTransformation(startTime + DURATION, transformation);
-        assertMatrixEquals(expectedMatrix, transformation.getMatrix());
-        transformation.clear();
-        rotateAnimation.applyTransformation(1.0f, transformation);
-        assertMatrixEquals(expectedMatrix, transformation.getMatrix());
-    }
-
-    private static class MyRotateAnimation extends RotateAnimation {
-
-        public MyRotateAnimation(float fromDegrees, float toDegrees) {
-            super(fromDegrees, toDegrees);
-        }
-
-        public MyRotateAnimation(float fromDegrees, float toDegrees, float pivotX, float pivotY) {
-            super(fromDegrees, toDegrees, pivotX, pivotY);
-        }
-
-        public MyRotateAnimation(float fromDegrees, float toDegrees, int pivotXType,
-                float pivotX, int pivotYType, float pivotY) {
-            super(fromDegrees, toDegrees, pivotXType, pivotX, pivotYType, pivotY);
-        }
-
-        @Override
-        protected void applyTransformation(float interpolatedTime, Transformation t) {
-            super.applyTransformation(interpolatedTime, t);
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ScaleAnimationTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ScaleAnimationTest.java
deleted file mode 100755
index 4c1caa6c8995bc486c84df83e91f404952e87e13..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ScaleAnimationTest.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import com.mediatek.common.view.tests.R;
-
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-
-import android.content.res.XmlResourceParser;
-import android.graphics.Matrix;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.AttributeSet;
-import android.util.Xml;
-import android.view.View;
-import android.view.animation.Animation;
-import android.view.animation.ScaleAnimation;
-import android.view.animation.Transformation;
-
-@TestTargetClass(android.view.animation.ScaleAnimation.class)
-public class ScaleAnimationTest
-        extends ActivityInstrumentationTestCase2<AnimationTestStubActivity> {
-    private static long DURATION = 1000;
-    private static float DELTA = 0.001f;
-    private static float FROM_X = 1.0f;
-    private static float TO_X = 0.6f;
-    private static float FROM_Y = 3.0f;
-    private static float TO_Y = 3.6f;
-    private static float PIVOT_X = 0.6f;
-    private static float PIVOT_Y = 0.6f;
-    private static float MID_X = 0.8f;
-    private static float MID_Y = 3.3f;
-    private AnimationTestStubActivity mActivity;
-
-    public ScaleAnimationTest() {
-        super("com.android.cts.stub", AnimationTestStubActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "ScaleAnimation",
-            args = {android.content.Context.class, android.util.AttributeSet.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "ScaleAnimation",
-            args = {float.class, float.class, float.class, float.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "ScaleAnimation",
-            args = {float.class, float.class, float.class, float.class, float.class, float.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "ScaleAnimation",
-            args = {float.class, float.class, float.class, float.class, int.class, float.class,
-                    int.class, float.class }
-        )
-    })
-    public void testConstructors() {
-        final XmlResourceParser parser = mActivity.getResources().getAnimation(
-                R.anim.anim_scale);
-        final AttributeSet attr = Xml.asAttributeSet(parser);
-        assertNotNull(attr);
-        new ScaleAnimation(mActivity, attr);
-
-        new ScaleAnimation(FROM_X, TO_X, FROM_Y, TO_Y);
-
-        new ScaleAnimation(FROM_X, TO_X, FROM_Y, TO_Y, Animation.RELATIVE_TO_SELF, PIVOT_X,
-                Animation.RELATIVE_TO_SELF, PIVOT_Y);
-
-        new ScaleAnimation(FROM_X, TO_X, FROM_Y, TO_Y, PIVOT_X, PIVOT_Y);
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            notes = "Use applyTransformation directly",
-            method = "applyTransformation",
-            args = {float.class, android.view.animation.Transformation.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "initialize",
-            args = {int.class, int.class, int.class, int.class }
-        )
-    })
-    public void testApplyTransformation() {
-        final Transformation transformation = new Transformation();
-        transformation.setTransformationType(Transformation.TYPE_MATRIX);
-
-        MyScaleAnimation scaleAnimation = new MyScaleAnimation(FROM_X, TO_X, FROM_Y, TO_Y,
-                PIVOT_X, PIVOT_Y);
-
-        float values[] = new float[9];
-        scaleAnimation.initialize(50, 50, 100, 100);
-        // interpolatedTime == 0.0
-        scaleAnimation.applyTransformation(0.0f, transformation);
-        transformation.getMatrix().getValues(values);
-        assertMatrixValue(FROM_X, FROM_Y, values);
-        float trans1X = values[Matrix.MTRANS_X];
-        float trans1Y = values[Matrix.MTRANS_Y];
-        // interpolatedTime == 0.5 (Default interpolation is linear)
-        scaleAnimation.applyTransformation(0.5f, transformation);
-        transformation.getMatrix().getValues(values);
-        assertMatrixValue(MID_X, MID_Y, values);
-        float trans2X = values[Matrix.MTRANS_X];
-        float trans2Y = values[Matrix.MTRANS_Y];
-        // interpolatedTime == 1.0
-        scaleAnimation.applyTransformation(1.0f, transformation);
-        transformation.getMatrix().getValues(values);
-        assertMatrixValue(TO_X, TO_Y, values);
-        float trans3X = values[Matrix.MTRANS_X];
-        float trans3Y = values[Matrix.MTRANS_Y];
-        // Transaction will be more larger when time goes by
-        assertTrue(Math.abs(trans1X) < Math.abs(trans2X));
-        assertTrue(Math.abs(trans2X) < Math.abs(trans3X));
-        assertTrue(Math.abs(trans1Y) < Math.abs(trans2Y));
-        assertTrue(Math.abs(trans2Y) < Math.abs(trans3Y));
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        notes = "Use applyTransformation indirectly with Animation#getTransformation",
-        method = "applyTransformation",
-        args = {float.class, android.view.animation.Transformation.class }
-    )
-    public void testApplyTransformationIndirectly() {
-        final View animWindow = mActivity.findViewById(R.id.anim_window);
-        final Transformation transformation = new Transformation();
-        transformation.setTransformationType(Transformation.TYPE_MATRIX);
-
-        MyScaleAnimation scaleAnimation = new MyScaleAnimation(FROM_X, TO_X, FROM_Y, TO_Y,
-                PIVOT_X, PIVOT_Y);
-        scaleAnimation.setDuration(DURATION);
-        scaleAnimation.initialize(50, 50, 100, 100);
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, scaleAnimation);
-
-        float values[] = new float[9];
-        long startTime = scaleAnimation.getStartTime();
-        // interpolatedTime == startTime
-        scaleAnimation.getTransformation(startTime, transformation);
-        assertNotNull(scaleAnimation.getInterpolator());
-        transformation.getMatrix().getValues(values);
-        // The scale value will equal to the set value in scaleAnimation's constructor
-        assertMatrixValue(FROM_X, FROM_Y, values);
-        float trans1X = values[Matrix.MTRANS_X];
-        float trans1Y = values[Matrix.MTRANS_Y];
-        // interpolatedTime == startTime + (DURATION / 2)
-        scaleAnimation.getTransformation(startTime + (DURATION / 2), transformation);
-        transformation.getMatrix().getValues(values);
-        assertMatrixValue(MID_X, MID_Y, values);
-        float trans2X = values[Matrix.MTRANS_X];
-        float trans2Y = values[Matrix.MTRANS_Y];
-        // interpolatedTime == startTime + DURATION
-        scaleAnimation.getTransformation(startTime + DURATION, transformation);
-        transformation.getMatrix().getValues(values);
-        assertMatrixValue(TO_X, TO_Y, values);
-        float trans3X = values[Matrix.MTRANS_X];
-        float trans3Y = values[Matrix.MTRANS_Y];
-        // Transaction will be more larger when time goes by
-        assertTrue(Math.abs(trans1X) < Math.abs(trans2X));
-        assertTrue(Math.abs(trans2X) < Math.abs(trans3X));
-        assertTrue(Math.abs(trans1Y) < Math.abs(trans2Y));
-        assertTrue(Math.abs(trans2Y) < Math.abs(trans3Y));
-    }
-
-    private void assertMatrixValue(float expectedX, float expectedY, float[] values) {
-        assertEquals(expectedX, values[Matrix.MSCALE_X], DELTA);
-        assertEquals(expectedY, values[Matrix.MSCALE_Y], DELTA);
-    }
-
-    private class MyScaleAnimation extends ScaleAnimation {
-
-        public MyScaleAnimation(float fromX, float toX, float fromY, float toY,
-                float pivotXValue, float pivotYValue) {
-            super(fromX, toX, fromY, toY, pivotXValue, pivotYValue);
-        }
-
-        @Override
-        protected void applyTransformation(float interpolatedTime, Transformation t) {
-            super.applyTransformation(interpolatedTime, t);
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ShapeHolder.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ShapeHolder.java
deleted file mode 100755
index d601c19b50ac379552a09be3d8b4ba5e1cdbffd0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ShapeHolder.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import android.graphics.drawable.ShapeDrawable;
-import android.graphics.drawable.shapes.Shape;
-import android.graphics.Paint;
-import android.graphics.RadialGradient;
-
-/**
- * A data structure that holds a Shape and various properties that can be used to define
- * how the shape is drawn.
- */
-public class ShapeHolder {
-    private float mX = 0, mY = 0;
-    private ShapeDrawable mShape;
-    private int mColor;
-    private RadialGradient mGradient;
-    private float mAlpha = 1f;
-    private Paint mPaint;
-
-    public void setPaint(Paint value) {
-        mPaint = value;
-    }
-
-    public Paint getPaint() {
-        return mPaint;
-    }
-
-    public void setX(float value) {
-        mX = value;
-    }
-
-    public float getX() {
-        return mX;
-    }
-
-    public void setY(float value) {
-        mY = value;
-    }
-
-    public float getY() {
-        return mY;
-    }
-
-    public void setShape(ShapeDrawable value) {
-        mShape = value;
-    }
-
-    public ShapeDrawable getShape() {
-        return mShape;
-    }
-
-    public int getColor() {
-        return mColor;
-    }
-
-    public void setColor(int value) {
-        mShape.getPaint().setColor(value);
-        mColor = value;
-    }
-
-    public void setGradient(RadialGradient value) {
-        mGradient = value;
-    }
-    public RadialGradient getGradient() {
-        return mGradient;
-    }
-
-    public void setAlpha(float alpha) {
-        this.mAlpha = alpha;
-        mShape.setAlpha((int) ((alpha * 255f) + .5f));
-    }
-
-    public float getWidth() {
-        return mShape.getShape().getWidth();
-    }
-
-    public void setWidth(float width) {
-        Shape s = mShape.getShape();
-        s.resize(width, s.getHeight());
-    }
-
-    public float getHeight() {
-        return mShape.getShape().getHeight();
-    }
-
-    public void setHeight(float height) {
-        Shape s = mShape.getShape();
-        s.resize(s.getWidth(), height);
-    }
-
-    public ShapeHolder(ShapeDrawable s) {
-        mShape = s;
-    }
-}
-
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/TransformationTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/TransformationTest.java
deleted file mode 100755
index 7a3ae7c055a8888efe3af6bdd1521f81b0bd4c25..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/TransformationTest.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import android.graphics.Matrix;
-import android.test.AndroidTestCase;
-import android.view.animation.Transformation;
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-import dalvik.annotation.ToBeFixed;
-
-@TestTargetClass(Transformation.class)
-public class TransformationTest extends AndroidTestCase {
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "Transformation",
-        args = { }
-    )
-    public void testConstructor() {
-        new Transformation();
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "compose",
-        args = {Transformation.class }
-    )
-    @ToBeFixed(bug = "1695243", explanation = "{@link Transformation#compose(Transformation t)}"
-            + "needs to update Javadoc to declare how it composed.")
-    public void testCompose() {
-        final Transformation t1 = new Transformation();
-        final Transformation t2 = new Transformation();
-        t1.setAlpha(0.5f);
-        t2.setAlpha(0.4f);
-        t1.getMatrix().setScale(3, 1);
-        t2.getMatrix().setScale(3, 1);
-        t1.setTransformationType(Transformation.TYPE_MATRIX);
-        t2.setTransformationType(Transformation.TYPE_ALPHA);
-        t2.compose(t1);
-
-        Matrix expectedMatrix = new Matrix();
-        expectedMatrix.setScale(9, 1);
-        assertEquals(expectedMatrix, t2.getMatrix());
-        assertEquals(0.4f * 0.5f, t2.getAlpha());
-        assertEquals(Transformation.TYPE_ALPHA, t2.getTransformationType());
-
-        t1.setTransformationType(Transformation.TYPE_IDENTITY);
-        t2.compose(t1);
-        expectedMatrix = new Matrix();
-        expectedMatrix.setScale(27, 1);
-        assertEquals(expectedMatrix, t2.getMatrix());
-        assertEquals(0.4f * 0.5f * 0.5f, t2.getAlpha());
-        assertEquals(Transformation.TYPE_ALPHA, t2.getTransformationType());
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "clear",
-        args = { }
-    )
-    public void testClear() {
-        final Transformation t1 = new Transformation();
-        final Transformation t2 = new Transformation();
-        t2.set(t1);
-        assertTransformationEquals(t1, t2);
-
-        // Change the t2
-        t2.setAlpha(0.0f);
-        t2.getMatrix().setScale(2, 3);
-        t2.setTransformationType(Transformation.TYPE_ALPHA);
-        assertTransformationNotSame(t1, t2);
-
-        // Clear the change
-        t2.clear();
-        assertTransformationEquals(t1, t2);
-    }
-
-    private void assertTransformationNotSame(Transformation expected, Transformation actual) {
-        assertNotSame(expected.getAlpha(), actual.getAlpha());
-        assertFalse(expected.getMatrix().equals(actual.getMatrix()));
-        assertNotSame(expected.getTransformationType(), actual.getTransformationType());
-    }
-
-    private void assertTransformationEquals(Transformation expected, Transformation actual) {
-        assertEquals(expected.getAlpha(), actual.getAlpha());
-        assertEquals(expected.getMatrix(), actual.getMatrix());
-        assertEquals(expected.getTransformationType(), actual.getTransformationType());
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "setTransformationType",
-            args = {int.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "getTransformationType",
-            args = { }
-        )
-    })
-    public void testAccessTransformationType() {
-        final Transformation transformation = new Transformation();
-
-        // From Javadoc of {@link Transformation#clear()}, we see the default type is TYPE_BOTH.
-        assertEquals(Transformation.TYPE_BOTH, transformation.getTransformationType());
-
-        transformation.setTransformationType(Transformation.TYPE_IDENTITY);
-        assertEquals(Transformation.TYPE_IDENTITY, transformation.getTransformationType());
-
-        transformation.setTransformationType(Transformation.TYPE_ALPHA);
-        assertEquals(Transformation.TYPE_ALPHA, transformation.getTransformationType());
-
-        transformation.setTransformationType(Transformation.TYPE_MATRIX);
-        assertEquals(Transformation.TYPE_MATRIX, transformation.getTransformationType());
-
-        transformation.setTransformationType(Transformation.TYPE_BOTH);
-        assertEquals(Transformation.TYPE_BOTH, transformation.getTransformationType());
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "set",
-        args = {Transformation.class }
-    )
-    public void testSet() {
-        final Transformation t1 = new Transformation();
-        t1.setAlpha(0.0f);
-        final Transformation t2 = new Transformation();
-        t2.set(t1);
-        assertTransformationEquals(t1, t2);
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "setAlpha",
-            args = {float.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "getAlpha",
-            args = { }
-        )
-    })
-    public void testAccessAlpha() {
-        final Transformation transformation = new Transformation();
-
-        transformation.setAlpha(0.0f);
-        assertEquals(0.0f, transformation.getAlpha());
-
-        transformation.setAlpha(0.5f);
-        assertEquals(0.5f, transformation.getAlpha());
-
-        transformation.setAlpha(1.0f);
-        assertEquals(1.0f, transformation.getAlpha());
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "toString",
-            args = { }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "toShortString",
-            args = { }
-        )
-    })
-    public void testToString() {
-        assertNotNull(new Transformation().toString());
-        assertNotNull(new Transformation().toShortString());
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "getMatrix",
-        args = { }
-    )
-    public void testGetMatrix() {
-        final Matrix expected = new Matrix();
-        final Transformation transformation = new Transformation();
-        assertEquals(expected, transformation.getMatrix());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/TranslateAnimationTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/TranslateAnimationTest.java
deleted file mode 100755
index cd5d21b99c3ffe8105cd8ec5eaf96a583781a3e6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/TranslateAnimationTest.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.animation;
-
-import android.app.Activity;
-import android.content.res.XmlResourceParser;
-import android.graphics.Matrix;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.AttributeSet;
-import android.util.Xml;
-import android.view.View;
-import android.view.animation.Animation;
-import android.view.animation.LinearInterpolator;
-import android.view.animation.Transformation;
-import android.view.animation.TranslateAnimation;
-
-import com.mediatek.common.view.tests.R;
-
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-
-@TestTargetClass(android.view.animation.TranslateAnimation.class)
-public class TranslateAnimationTest
-        extends ActivityInstrumentationTestCase2<AnimationTestStubActivity> {
-
-    private Activity mActivity;
-
-    private static final long DURATION = 1000;
-    private static final float POSITION_DELTA = 0.001f;
-    private static final float FROM_X_DETLTA = 0.0f;
-    private static final float TO_X_DELTA = 10.0f;
-    private static final float FROM_Y_DELTA = 0.0f;
-    private static final float TO_Y_DELTA = 20.0f;
-    private static final float RELATIVE_FROM_X_DELTA = 0.0f;
-    private static final float RELATIVE_TO_X_DELTA = 0.2f;
-    private static final float RELATIVE_FROM_Y_DELTA = 0.0f;
-    private static final float RELATIVE_TO_Y_DELTA = 0.4f;
-
-    public TranslateAnimationTest() {
-        super("com.android.cts.stub", AnimationTestStubActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "TranslateAnimation",
-            args = {android.content.Context.class, android.util.AttributeSet.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "TranslateAnimation",
-            args = {float.class, float.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "TranslateAnimation",
-            args = {float.class, float.class, float.class, float.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "TranslateAnimation",
-            args = {int.class, float.class, int.class, float.class,
-                    int.class, float.class, int.class, float.class }
-        )
-    })
-    public void testConstructors() {
-
-        // Test with null AttributeSet
-        new TranslateAnimation(mActivity, null);
-
-        final XmlResourceParser parser = mActivity.getResources().getAnimation(
-                R.anim.anim_translate);
-        final AttributeSet attr = Xml.asAttributeSet(parser);
-        assertNotNull(attr);
-        // Test with real AttributeSet
-        new TranslateAnimation(mActivity, attr);
-
-        // Test {@link TranslateAnimation#TranslateAnimation(float, float, float, float)}
-        new TranslateAnimation(0.6f, 0.6f, 0.6f, 0.6f);
-        // Test negative input values
-        new TranslateAnimation(-0.6f, -0.6f, -0.6f, -0.6f);
-
-        // Test {@link TranslateAnimation#TranslateAnimation(int, float, int, float, int, float,
-        // int, float)}
-        new TranslateAnimation(Animation.RELATIVE_TO_SELF, 0.6f, Animation.RELATIVE_TO_SELF, 0.6f,
-                Animation.RELATIVE_TO_SELF, 0.6f, Animation.RELATIVE_TO_SELF, 0.6f);
-        // Test negative input values
-        new TranslateAnimation(Animation.RELATIVE_TO_SELF, -0.6f, Animation.RELATIVE_TO_SELF, -0.6f,
-                Animation.RELATIVE_TO_SELF, -0.6f, Animation.RELATIVE_TO_SELF, -0.6f);
-    }
-
-    @TestTargets({
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            method = "applyTransformation",
-                args = {float.class, android.view.animation.Transformation.class }
-        ),
-        @TestTargetNew(
-            level = TestLevel.COMPLETE,
-            notes = "Test initialize wiht delta type Animation#ABSOLUTE",
-            method = "initialize",
-            args = {int.class, int.class, int.class, int.class }
-        )
-    })
-    public void testApplyTransformation() {
-        final View animWindow = mActivity.findViewById(R.id.anim_window);
-        final Transformation transformation = new Transformation();
-        final MyTranslateAnimation translateAnimation =
-                new MyTranslateAnimation(FROM_X_DETLTA, TO_X_DELTA, FROM_Y_DELTA, TO_Y_DELTA);
-        translateAnimation.setDuration(DURATION);
-        translateAnimation.setInterpolator(new LinearInterpolator());
-        assertFalse(translateAnimation.isInitialized());
-        translateAnimation.initialize(0, 0, 0, 0);
-        assertTrue(translateAnimation.isInitialized());
-
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, translateAnimation);
-        final long startTime = translateAnimation.getStartTime();
-
-        float values[] = new float[9];
-        // Test applyTransformation() in method getTransformation()
-        translateAnimation.getTransformation(startTime, transformation);
-        transformation.getMatrix().getValues(values);
-        assertEquals(FROM_X_DETLTA, values[Matrix.MTRANS_X], POSITION_DELTA);
-        assertEquals(FROM_Y_DELTA, values[Matrix.MTRANS_Y], POSITION_DELTA);
-
-        transformation.clear();
-        translateAnimation.getTransformation(startTime + DURATION / 2, transformation);
-        transformation.getMatrix().getValues(values);
-        assertEquals((TO_X_DELTA + FROM_X_DETLTA) / 2, values[Matrix.MTRANS_X], POSITION_DELTA);
-        assertEquals((TO_Y_DELTA + FROM_Y_DELTA) / 2, values[Matrix.MTRANS_Y], POSITION_DELTA);
-
-        transformation.clear();
-        translateAnimation.getTransformation(startTime + DURATION, transformation);
-        transformation.getMatrix().getValues(values);
-        assertEquals(TO_X_DELTA, values[Matrix.MTRANS_X], POSITION_DELTA);
-        assertEquals(TO_Y_DELTA, values[Matrix.MTRANS_Y], POSITION_DELTA);
-
-        // Test applyTransformation() directly
-        // Test time start
-        transformation.clear();
-        translateAnimation.applyTransformation(0.0f, transformation);
-        transformation.getMatrix().getValues(values);
-        assertEquals(FROM_X_DETLTA, values[Matrix.MTRANS_X], POSITION_DELTA);
-        assertEquals(FROM_Y_DELTA, values[Matrix.MTRANS_Y], POSITION_DELTA);
-
-        // Test time of middle 0.5
-        transformation.clear();
-        translateAnimation.applyTransformation(0.5f, transformation);
-        transformation.getMatrix().getValues(values);
-        assertEquals((TO_X_DELTA + FROM_X_DETLTA) / 2,
-                values[Matrix.MTRANS_X], POSITION_DELTA);
-        assertEquals((TO_Y_DELTA + FROM_Y_DELTA) / 2,
-                values[Matrix.MTRANS_Y], POSITION_DELTA);
-
-        // Test time end
-        transformation.clear();
-        translateAnimation.applyTransformation(1.0f, transformation);
-        transformation.getMatrix().getValues(values);
-        assertEquals(TO_X_DELTA, values[Matrix.MTRANS_X], POSITION_DELTA);
-        assertEquals(TO_Y_DELTA, values[Matrix.MTRANS_Y], POSITION_DELTA);
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        method = "initialize",
-        args = {int.class, int.class, int.class, int.class }
-    )
-    public void testInitialize() {
-        final View parent = mActivity.findViewById(R.id.anim_window_parent);
-        final View animWindow = mActivity.findViewById(R.id.anim_window);
-        final Transformation transformation = new Transformation();
-        final int selfWidth = animWindow.getWidth();
-        final int selfHeight = animWindow.getHeight();
-        final int parentWidth = parent.getWidth();
-        final int parentHeight = parent.getHeight();
-        final int actualWidth = selfWidth;
-        final int actualHeight = parentHeight;
-        final TranslateAnimation translateAnimation =
-                new TranslateAnimation(Animation.RELATIVE_TO_SELF, RELATIVE_FROM_X_DELTA,
-                        Animation.RELATIVE_TO_SELF, RELATIVE_TO_X_DELTA,
-                        Animation.RELATIVE_TO_PARENT, RELATIVE_FROM_Y_DELTA,
-                        Animation.RELATIVE_TO_PARENT, RELATIVE_TO_Y_DELTA);
-        assertFalse(translateAnimation.isInitialized());
-        translateAnimation.initialize(selfWidth, selfHeight, parentWidth, parentHeight);
-        assertTrue(translateAnimation.isInitialized());
-        translateAnimation.setDuration(DURATION);
-        translateAnimation.setInterpolator(new LinearInterpolator());
-
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, translateAnimation);
-        final long startTime = translateAnimation.getStartTime();
-
-        float values[] = new float[9];
-        translateAnimation.getTransformation(startTime, transformation);
-        transformation.getMatrix().getValues(values);
-        assertEquals(RELATIVE_FROM_X_DELTA * actualWidth, values[Matrix.MTRANS_X], POSITION_DELTA);
-        assertEquals(RELATIVE_FROM_Y_DELTA * actualHeight, values[Matrix.MTRANS_Y], POSITION_DELTA);
-
-        transformation.clear();
-        translateAnimation.getTransformation(startTime + DURATION / 2, transformation);
-        transformation.getMatrix().getValues(values);
-        assertEquals(((RELATIVE_TO_X_DELTA + RELATIVE_FROM_X_DELTA) / 2) * actualWidth,
-                values[Matrix.MTRANS_X], POSITION_DELTA);
-        assertEquals(((RELATIVE_TO_Y_DELTA + RELATIVE_FROM_Y_DELTA) / 2) * actualHeight,
-                values[Matrix.MTRANS_Y], POSITION_DELTA);
-
-        transformation.clear();
-        translateAnimation.getTransformation(startTime + DURATION, transformation);
-        transformation.getMatrix().getValues(values);
-        assertEquals(RELATIVE_TO_X_DELTA * actualWidth, values[Matrix.MTRANS_X], POSITION_DELTA);
-        assertEquals(RELATIVE_TO_Y_DELTA * actualHeight, values[Matrix.MTRANS_Y], POSITION_DELTA);
-    }
-
-    private static class MyTranslateAnimation extends TranslateAnimation {
-
-        public MyTranslateAnimation(float fromXDelta, float toXDelta, float fromYDelta,
-                float toYDelta) {
-            super(fromXDelta, toXDelta, fromYDelta, toYDelta);
-        }
-
-        @Override
-        protected void applyTransformation(float interpolatedTime, Transformation t) {
-            super.applyTransformation(interpolatedTime, t);
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ValueAnimatorEventsTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ValueAnimatorEventsTest.java
deleted file mode 100755
index c6e0e936806a053a594e80cc4d9c7a6d18053b1b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ValueAnimatorEventsTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mediatek.common.view.tests.animation;
-import android.animation.ValueAnimator;
-
-/**
- * Listener tests for ValueAnimator.
- */
-public class ValueAnimatorEventsTest extends EventsTest {
-
-    @Override
-    public void setUp() throws Exception {
-        mAnimator = ValueAnimator.ofFloat(0, 1);
-        super.setUp();
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ValueAnimatorTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ValueAnimatorTest.java
deleted file mode 100755
index 9b1080f76e3784aeabe90ba8eb60a77a8f77b492..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ValueAnimatorTest.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mediatek.common.view.tests.animation;
-
-import android.animation.ObjectAnimator;
-import android.animation.ValueAnimator;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.AccelerateInterpolator;
-
-public class ValueAnimatorTest extends
-        ActivityInstrumentationTestCase2<AnimationActivity> {
-    private AnimationActivity mActivity;
-    private ValueAnimator mValueAnimator;
-    private long mDuration = 2000;
-
-    public ValueAnimatorTest() {
-        super(AnimationActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = getActivity();
-        mValueAnimator = mActivity.createAnimatorWithDuration(mDuration);
-    }
-
-    public void testDuration() throws Throwable {
-        final long duration = 2000;
-        ValueAnimator valueAnimatorLocal = mActivity.createAnimatorWithDuration(duration);
-        startAnimation(valueAnimatorLocal);
-        assertEquals(duration, valueAnimatorLocal.getDuration());
-    }
-
-    public void testIsRunning() throws Throwable {
-        assertFalse(mValueAnimator.isRunning());
-        startAnimation(mValueAnimator);
-        ValueAnimator valueAnimatorReturned = mActivity.view.bounceYAnimator;
-        assertTrue(valueAnimatorReturned.isRunning());
-    }
-
-    public void testIsStarted() throws Throwable {
-        assertFalse(mValueAnimator.isRunning());
-        assertFalse(mValueAnimator.isStarted());
-        long startDelay = 10000;
-        mValueAnimator.setStartDelay(startDelay);
-        startAnimation(mValueAnimator);
-        assertFalse(mValueAnimator.isRunning());
-        assertTrue(mValueAnimator.isStarted());
-    }
-
-    public void testRepeatMode() throws Throwable {
-        ValueAnimator mValueAnimator = mActivity.createAnimatorWithRepeatMode(
-            ValueAnimator.RESTART);
-        startAnimation(mValueAnimator);
-        assertEquals(ValueAnimator.RESTART, mValueAnimator.getRepeatMode());
-    }
-
-    public void testRepeatCount() throws Throwable {
-        int repeatCount = 2;
-        ValueAnimator mValueAnimator = mActivity.createAnimatorWithRepeatCount(repeatCount);
-        startAnimation(mValueAnimator);
-        assertEquals(repeatCount, mValueAnimator.getRepeatCount());
-    }
-
-    public void testStartDelay() {
-        long startDelay = 1000;
-        mValueAnimator.setStartDelay(startDelay);
-        assertEquals(startDelay, mValueAnimator.getStartDelay());
-    }
-
-    public void testCurrentPlayTime() throws Throwable {
-        startAnimation(mValueAnimator);
-        Thread.sleep(100);
-        long currentPlayTime = mValueAnimator.getCurrentPlayTime();
-        assertTrue(currentPlayTime  >  0);
-    }
-
-    public void testGetFrameDelay() throws Throwable {
-        long frameDelay = 10;
-        mValueAnimator.setFrameDelay(frameDelay);
-        startAnimation(mValueAnimator);
-        Thread.sleep(100);
-        long actualFrameDelay = mValueAnimator.getFrameDelay();
-        assertEquals(frameDelay, actualFrameDelay);
-    }
-
-    public void testSetInterpolator() throws Throwable {
-        AccelerateInterpolator interpolator = new AccelerateInterpolator();
-        ValueAnimator mValueAnimator = mActivity.createAnimatorWithInterpolator(interpolator);
-        startAnimation(mValueAnimator);
-        assertTrue(interpolator.equals(mValueAnimator.getInterpolator()));
-    }
-
-    public void testCancel() throws Throwable {
-        startAnimation(mValueAnimator);
-        Thread.sleep(100);
-        cancelAnimation(mValueAnimator);
-        assertFalse(mValueAnimator.isRunning());
-    }
-
-    public void testEnd() throws Throwable {
-        Object object = mActivity.view.newBall;
-        String property = "y";
-        float startY = mActivity.mStartY;
-        float endY = mActivity.mStartY + mActivity.mDeltaY;
-        ObjectAnimator objAnimator = ObjectAnimator.ofFloat(object, property, startY, endY);
-        objAnimator.setDuration(mDuration);
-        objAnimator.setRepeatCount(ValueAnimator.INFINITE);
-        objAnimator.setInterpolator(new AccelerateInterpolator());
-        objAnimator.setRepeatMode(ValueAnimator.REVERSE);
-        startAnimation(objAnimator);
-        Thread.sleep(100);
-        endAnimation(objAnimator);
-        float y = mActivity.view.newBall.getY();
-        assertEquals(y, endY);
-    }
-
-    public void testGetAnimatedFraction() throws Throwable {
-        ValueAnimator objAnimator = getAnimator();
-        startAnimation(objAnimator);
-        assertNotNull(objAnimator);
-        float[] fractions = getValue(objAnimator, 10, "getAnimatedFraction()", 200L, null);
-        for (int j = 0; j < 9; j++) {
-            assertTrue(fractions[j] >= 0.0);
-            assertTrue(fractions[j] <= 1.0);
-            assertTrue(errorMessage(fractions), fractions[j + 1] >= fractions[j]);
-        }
-    }
-
-    public void testGetAnimatedValue() throws Throwable {
-        ValueAnimator objAnimator = getAnimator();
-        startAnimation(objAnimator);
-        assertNotNull(objAnimator);
-        float[] animatedValues = getValue(objAnimator, 10, "getAnimatedValue()", 200L, null);
-
-        for (int j = 0; j < 9; j++) {
-            assertTrue(errorMessage(animatedValues), animatedValues[j + 1] >= animatedValues[j]);
-        }
-    }
-    public void testGetAnimatedValue_PropertyName() throws Throwable {
-        String property = "y";
-
-        ValueAnimator objAnimator = getAnimator();
-        startAnimation(objAnimator);
-        assertNotNull(objAnimator);
-        float[] animatedValues = getValue(objAnimator, 10, "getAnimatedValue(property)", 200L,
-            property);
-        for (int j = 0; j < 9; j++) {
-            assertTrue(errorMessage(animatedValues), animatedValues[j + 1] >= animatedValues[j]);
-        }
-    }
-
-    public void testOfFloat() throws Throwable {
-        float start = 0.0f;
-        float end = 1.0f;
-        float[] values = {start, end};
-        final ValueAnimator valueAnimatorLocal = ValueAnimator.ofFloat(values);
-        valueAnimatorLocal.setDuration(mDuration);
-        valueAnimatorLocal.setRepeatCount(ValueAnimator.INFINITE);
-        valueAnimatorLocal.setInterpolator(new AccelerateInterpolator());
-        valueAnimatorLocal.setRepeatMode(ValueAnimator.RESTART);
-
-        this.runTestOnUiThread(new Runnable() {
-            public void run() {
-                valueAnimatorLocal.start();
-            }
-        });
-        Thread.sleep(100);
-        boolean isRunning = valueAnimatorLocal.isRunning();
-        assertTrue(isRunning);
-
-        Float animatedValue = (Float) valueAnimatorLocal.getAnimatedValue();
-        assertTrue(animatedValue >= start);
-        assertTrue(animatedValue <= end);
-    }
-
-    public void testOfInt() throws Throwable {
-        int start = 0;
-        int end = 10;
-        int[] values = {start, end};
-        final ValueAnimator valueAnimatorLocal = ValueAnimator.ofInt(values);
-        valueAnimatorLocal.setDuration(mDuration);
-        valueAnimatorLocal.setRepeatCount(ValueAnimator.INFINITE);
-        valueAnimatorLocal.setInterpolator(new AccelerateInterpolator());
-        valueAnimatorLocal.setRepeatMode(ValueAnimator.RESTART);
-
-        this.runTestOnUiThread(new Runnable() {
-            public void run() {
-                valueAnimatorLocal.start();
-            }
-        });
-        Thread.sleep(100);
-        boolean isRunning = valueAnimatorLocal.isRunning();
-        assertTrue(isRunning);
-
-        Integer animatedValue = (Integer) valueAnimatorLocal.getAnimatedValue();
-        assertTrue(animatedValue >= start);
-        assertTrue(animatedValue <= end);
-    }
-
-    private ValueAnimator getAnimator() {
-        Object object = mActivity.view.newBall;
-        String property = "y";
-        float startY = mActivity.mStartY;
-        float endY = mActivity.mStartY + mActivity.mDeltaY;
-        ValueAnimator objAnimator = ObjectAnimator.ofFloat(object, property, startY, endY);
-        objAnimator.setDuration(mDuration);
-        objAnimator.setRepeatCount(ValueAnimator.INFINITE);
-        objAnimator.setInterpolator(new AccelerateInterpolator());
-        objAnimator.setRepeatMode(ValueAnimator.REVERSE);
-        return objAnimator;
-    }
-
-    private float[] getValue(ValueAnimator animator, int n, String methodName,
-            long sleepTime, String property) throws InterruptedException {
-        float[] values = new float[n];
-        for (int i = 0; i < n; i++) {
-            Thread.sleep(sleepTime);
-            float value = 0.0f;
-            if (methodName.equals("getAnimatedFraction()")) {
-                value = animator.getAnimatedFraction();
-            } else if (methodName.equals("getAnimatedValue()")) {
-              value = ((Float) animator.getAnimatedValue()).floatValue();
-            } else if (methodName.equals("getAnimatedValue(property)")) {
-              value = ((Float) animator.getAnimatedValue(property)).floatValue();
-            }
-            values[i] = value;
-        }
-        return values;
-    }
-
-    private void startAnimation(final ValueAnimator animator) throws Throwable {
-        this.runTestOnUiThread(new Runnable() {
-            public void run() {
-                mActivity.startAnimation(animator);
-            }
-        });
-    }
-
-    private void endAnimation(final ValueAnimator animator) throws Throwable {
-        this.runTestOnUiThread(new Runnable() {
-            public void run() {
-                animator.end();
-            }
-        });
-    }
-
-    private void cancelAnimation(final ValueAnimator animator) throws Throwable {
-        this.runTestOnUiThread(new Runnable() {
-            public void run() {
-                animator.cancel();
-            }
-        });
-    }
-
-    private String errorMessage(float[] values) {
-        StringBuilder message = new StringBuilder();
-        for (int i = 0; i < values.length; i++) {
-            message.append(values[i]).append(" ");
-        }
-        return message.toString();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ViewPropertyAnimatorTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ViewPropertyAnimatorTest.java
deleted file mode 100755
index 6a409481714f2f9b7bd9b0cdc2208eb4accb5590..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/animation/ViewPropertyAnimatorTest.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mediatek.common.view.tests.animation;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.os.Handler;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.view.ViewPropertyAnimator;
-import android.widget.Button;
-
-import java.util.concurrent.TimeUnit;
-
-import com.mediatek.common.view.tests.R;
-
-
-/**
- * Tests for the various lifecycle events of Animators. This abstract class is subclassed by
- * concrete implementations that provide the actual Animator objects being tested. All of the
- * testing mechanisms are in this class; the subclasses are only responsible for providing
- * the mAnimator object.
- *
- * This test is more complicated than a typical synchronous test because much of the functionality
- * must happen on the UI thread. Some tests do this by using the UiThreadTest annotation to
- * automatically run the whole test on that thread. Other tests must run on the UI thread and also
- * wait for some later event to occur before ending. These tests use a combination of an
- * AbstractFuture mechanism and a delayed action to release that Future later.
- */
-public abstract class ViewPropertyAnimatorTest
-        extends ActivityInstrumentationTestCase2<BasicAnimatorActivity> {
-
-    protected static final int ANIM_DURATION = 400;
-    protected static final int ANIM_DELAY = 100;
-    protected static final int ANIM_MID_DURATION = ANIM_DURATION / 2;
-    protected static final int ANIM_MID_DELAY = ANIM_DELAY / 2;
-    protected static final int FUTURE_RELEASE_DELAY = 50;
-
-    private boolean mStarted;  // tracks whether we've received the onAnimationStart() callback
-    protected boolean mRunning;  // tracks whether we've started the animator
-    private boolean mCanceled; // trackes whether we've canceled the animator
-    protected Animator.AnimatorListener mFutureListener; // mechanism for delaying the end of the test
-    protected FutureWaiter mFuture; // Mechanism for waiting for the UI test to complete
-    private Animator.AnimatorListener mListener; // Listener that handles/tests the events
-
-    protected ViewPropertyAnimator mAnimator; // The animator used in the tests. Must be set in subclass
-                                  // setup() method prior to calling the superclass setup()
-
-    /**
-     * Cancels the given animator. Used to delay cancellation until some later time (after the
-     * animator has started playing).
-     */
-    protected static class Canceler implements Runnable {
-        ViewPropertyAnimator mAnim;
-        FutureWaiter mFuture;
-        public Canceler(ViewPropertyAnimator anim, FutureWaiter future) {
-            mAnim = anim;
-            mFuture = future;
-        }
-        @Override
-        public void run() {
-            try {
-                mAnim.cancel();
-            } catch (junit.framework.AssertionFailedError e) {
-                mFuture.setException(new RuntimeException(e));
-            }
-        }
-    };
-
-    /**
-     * Timeout length, based on when the animation should reasonably be complete.
-     */
-    protected long getTimeout() {
-        return ANIM_DURATION + ANIM_DELAY + FUTURE_RELEASE_DELAY;
-    }
-
-    /**
-     * Releases the given Future object when the listener's end() event is called. Specifically,
-     * it releases it after some further delay, to give the test time to do other things right
-     * after an animation ends.
-     */
-    protected static class FutureReleaseListener extends AnimatorListenerAdapter {
-        FutureWaiter mFuture;
-
-        public FutureReleaseListener(FutureWaiter future) {
-            mFuture = future;
-        }
-
-        /**
-         * Variant constructor that auto-releases the FutureWaiter after the specified timeout.
-         * @param future
-         * @param timeout
-         */
-        public FutureReleaseListener(FutureWaiter future, long timeout) {
-            mFuture = future;
-            Handler handler = new Handler();
-            handler.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    mFuture.release();
-                }
-            }, timeout);
-        }
-
-        @Override
-        public void onAnimationEnd(Animator animation) {
-            Handler handler = new Handler();
-            handler.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    mFuture.release();
-                }
-            }, FUTURE_RELEASE_DELAY);
-        }
-    };
-
-    public ViewPropertyAnimatorTest() {
-        super(BasicAnimatorActivity.class);
-    }
-
-    /**
-     * Sets up the fields used by each test. Subclasses must override this method to create
-     * the protected mAnimator object used in all tests. Overrides must create that animator
-     * and then call super.setup(), where further properties are set on that animator.
-     * @throws Exception
-     */
-    @Override
-    public void setUp() throws Exception {
-        final BasicAnimatorActivity activity = getActivity();
-        Button button = (Button) activity.findViewById(R.id.animatingButton);
-
-        mAnimator = button.animate().x(100).y(100);
-
-        super.setUp();
-
-        // mListener is the main testing mechanism of this file. The asserts of each test
-        // are embedded in the listener callbacks that it implements.
-        mListener = new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationStart(Animator animation) {
-                // This should only be called on an animation that has not yet been started
-                assertFalse(mStarted);
-                assertTrue(mRunning);
-                mStarted = true;
-            }
-
-            @Override
-            public void onAnimationCancel(Animator animation) {
-                // This should only be called on an animation that has been started and not
-                // yet canceled or ended
-                assertFalse(mCanceled);
-                assertTrue(mRunning);
-                assertTrue(mStarted);
-                mCanceled = true;
-            }
-
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                // This should only be called on an animation that has been started and not
-                // yet ended
-                assertTrue(mRunning);
-                assertTrue(mStarted);
-                mRunning = false;
-                mStarted = false;
-                super.onAnimationEnd(animation);
-            }
-        };
-
-        mAnimator.setListener(mListener);
-        mAnimator.setDuration(ANIM_DURATION);
-
-        mFuture = new FutureWaiter();
-
-        mRunning = false;
-        mCanceled = false;
-        mStarted = false;
-    }
-
-    /**
-     * Verify that calling cancel on an unstarted animator does nothing.
-     */
-    @UiThreadTest
-    @SmallTest
-    public void testCancel() throws Exception {
-        mAnimator.cancel();
-    }
-
-    /**
-     * Verify that calling cancel on a started animator does the right thing.
-     */
-    @UiThreadTest
-    @SmallTest
-    public void testStartCancel() throws Exception {
-        mFutureListener = new FutureReleaseListener(mFuture);
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    mRunning = true;
-                    mAnimator.start();
-                    mAnimator.cancel();
-                    mFuture.release();
-                } catch (junit.framework.AssertionFailedError e) {
-                    mFuture.setException(new RuntimeException(e));
-                }
-            }
-        });
-        mFuture.get(getTimeout(), TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Same as testStartCancel, but with a startDelayed animator
-     */
-    @SmallTest
-    public void testStartDelayedCancel() throws Exception {
-        mFutureListener = new FutureReleaseListener(mFuture);
-        mAnimator.setStartDelay(ANIM_DELAY);
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    mRunning = true;
-                    mAnimator.start();
-                    mAnimator.cancel();
-                    mFuture.release();
-                } catch (junit.framework.AssertionFailedError e) {
-                    mFuture.setException(new RuntimeException(e));
-                }
-            }
-        });
-        mFuture.get(getTimeout(), TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Verify that canceling an animator that is playing does the right thing.
-     */
-    @MediumTest
-    public void testPlayingCancel() throws Exception {
-        mFutureListener = new FutureReleaseListener(mFuture);
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    Handler handler = new Handler();
-                    mAnimator.setListener(mFutureListener);
-                    mRunning = true;
-                    mAnimator.start();
-                    handler.postDelayed(new Canceler(mAnimator, mFuture), ANIM_MID_DURATION);
-                } catch (junit.framework.AssertionFailedError e) {
-                    mFuture.setException(new RuntimeException(e));
-                }
-            }
-        });
-        mFuture.get(getTimeout(), TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Same as testPlayingCancel, but with a startDelayed animator
-     */
-    @MediumTest
-    public void testPlayingDelayedCancel() throws Exception {
-        mAnimator.setStartDelay(ANIM_DELAY);
-        mFutureListener = new FutureReleaseListener(mFuture);
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    Handler handler = new Handler();
-                    mAnimator.setListener(mFutureListener);
-                    mRunning = true;
-                    mAnimator.start();
-                    handler.postDelayed(new Canceler(mAnimator, mFuture), ANIM_MID_DURATION);
-                } catch (junit.framework.AssertionFailedError e) {
-                    mFuture.setException(new RuntimeException(e));
-                }
-            }
-        });
-        mFuture.get(getTimeout(),  TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Same as testPlayingDelayedCancel, but cancel during the startDelay period
-     */
-    @MediumTest
-    public void testPlayingDelayedCancelMidDelay() throws Exception {
-        mAnimator.setStartDelay(ANIM_DELAY);
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    // Set the listener to automatically timeout after an uncanceled animation
-                    // would have finished. This tests to make sure that we're not calling
-                    // the listeners with cancel/end callbacks since they won't be called
-                    // with the start event.
-                    mFutureListener = new FutureReleaseListener(mFuture, getTimeout());
-                    Handler handler = new Handler();
-                    mRunning = true;
-                    mAnimator.start();
-                    handler.postDelayed(new Canceler(mAnimator, mFuture), ANIM_MID_DELAY);
-                } catch (junit.framework.AssertionFailedError e) {
-                    mFuture.setException(new RuntimeException(e));
-                }
-            }
-        });
-        mFuture.get(getTimeout() + 100,  TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Verifies that canceling a started animation after it has already been canceled
-     * does nothing.
-     */
-    @MediumTest
-    public void testStartDoubleCancel() throws Exception {
-        mFutureListener = new FutureReleaseListener(mFuture);
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    mRunning = true;
-                    mAnimator.start();
-                    mAnimator.cancel();
-                    mAnimator.cancel();
-                    mFuture.release();
-                } catch (junit.framework.AssertionFailedError e) {
-                    mFuture.setException(new RuntimeException(e));
-                }
-            }
-        });
-        mFuture.get(getTimeout(), TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Same as testStartDoubleCancel, but with a startDelayed animator
-     */
-    @MediumTest
-    public void testStartDelayedDoubleCancel() throws Exception {
-        mAnimator.setStartDelay(ANIM_DELAY);
-        mFutureListener = new FutureReleaseListener(mFuture);
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    mRunning = true;
-                    mAnimator.start();
-                    mAnimator.cancel();
-                    mAnimator.cancel();
-                    mFuture.release();
-                } catch (junit.framework.AssertionFailedError e) {
-                    mFuture.setException(new RuntimeException(e));
-                }
-            }
-        });
-        mFuture.get(getTimeout(),  TimeUnit.MILLISECONDS);
-     }
-
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuLayout.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuLayout.java
deleted file mode 100755
index 73a2e10f4bd77d1ea1a791450bcbfecc6d9f42ed..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuLayout.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-package com.mediatek.common.view.tests.menu;
-
-import com.mediatek.common.view.tests.menu.MenuScenario.Params;
-
-import android.os.Bundle;
-import android.view.Menu;
-import android.widget.Button;
-
-public class MenuLayout extends MenuScenario {
-    private static final String LONG_TITLE = "Really really really really really really really really really really long title";
-    private static final String SHORT_TITLE = "Item";
-
-    private Button mButton;
-
-    @Override
-    protected void onInitParams(Params params) {
-        super.onInitParams(params);
-        params
-            .setNumItems(2)
-            .setItemTitle(0, LONG_TITLE)
-            .setItemTitle(1, LONG_TITLE);
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-
-        /*
-         * This activity is meant to try a bunch of different menu layouts. So,
-         * we recreate the menu every time it is prepared.
-         */
-        menu.clear();
-        onCreateOptionsMenu(menu);
-
-        return true;
-    }
-
-    public Button getButton() {
-        return mButton;
-    }
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        mButton  = new Button(this);
-        setContentView(mButton);
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuLayoutLandscape.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuLayoutLandscape.java
deleted file mode 100755
index fd88b092927ed12c2c429290285de5cd30bc0839..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuLayoutLandscape.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-package com.mediatek.common.view.tests.menu;
-
-/**
- * An activity (inherits from MenuLayout) that shows in landscape.
- */
-public class MenuLayoutLandscape extends MenuLayout {
-
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuLayoutLandscapeTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuLayoutLandscapeTest.java
deleted file mode 100755
index 00109047f6e60f91a3ef92587ecd23934a99fdbe..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuLayoutLandscapeTest.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/**
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-package com.mediatek.common.view.tests.menu;
-
-import com.mediatek.common.view.tests.util.KeyUtils;
-
-import android.test.ActivityInstrumentationTestCase;
-
-public class MenuLayoutLandscapeTest extends ActivityInstrumentationTestCase<MenuLayoutLandscape> {
-    private static final String LONG_TITLE = "Really really really really really really really really really really long title";
-    private static final String SHORT_TITLE = "Item";
-
-    private MenuLayout mActivity;
-
-    public MenuLayoutLandscapeTest() {
-        super("com.mediatek.common.view.tests", MenuLayoutLandscape.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-    }
-
-    private void toggleMenu() {
-        getInstrumentation().waitForIdleSync();
-        KeyUtils.tapMenuKey(this);
-        getInstrumentation().waitForIdleSync();
-    }
-
-    /**
-     * Asserts the layout of the menu.
-     *
-     * @param expectedLayout The number of parameters is the number of rows, and
-     *            each parameter is how many items on that row (the first
-     *            parameter is the top-most row).
-     */
-    private void assertLayout(Integer... expectedLayout) {
-        toggleMenu();
-
-        /* TODO These need to be rewritten to account for presenters that an activity
-         * does not have access to.
-        IconMenuView iconMenuView = ((IconMenuView) mActivity.getMenuView(MenuBuilder.TYPE_ICON));
-        int[] layout = iconMenuView.getLayout();
-        int layoutNumRows = iconMenuView.getLayoutNumRows();
-
-        int expectedRows = expectedLayout.length;
-        assertEquals("Row mismatch", expectedRows, layoutNumRows);
-
-        for (int row = 0; row < expectedRows; row++) {
-            assertEquals("Col mismatch on row " + row, expectedLayout[row].intValue(),
-                    layout[row]);
-        }
-         */
-    }
-
-    public void test1ShortItem() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(1)
-                .setItemTitle(0, SHORT_TITLE));
-        assertLayout(1);
-    }
-
-    public void test1LongItem() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(1)
-                .setItemTitle(0, LONG_TITLE));
-        assertLayout(1);
-    }
-
-    public void test2LongItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(2)
-                .setItemTitle(0, LONG_TITLE)
-                .setItemTitle(1, LONG_TITLE));
-        assertLayout(1, 1);
-    }
-
-    public void test2ShortItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(2)
-                .setItemTitle(0, SHORT_TITLE)
-                .setItemTitle(1, SHORT_TITLE));
-        assertLayout(2);
-    }
-
-    public void test3ShortItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(3)
-                .setItemTitle(0, SHORT_TITLE)
-                .setItemTitle(1, SHORT_TITLE)
-                .setItemTitle(2, SHORT_TITLE));
-        assertLayout(3);
-    }
-
-    public void test3VarietyItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(3)
-                .setItemTitle(0, SHORT_TITLE)
-                .setItemTitle(1, LONG_TITLE)
-                .setItemTitle(2, SHORT_TITLE));
-        assertLayout(1, 2);
-    }
-
-    public void test3VarietyItems2() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(3)
-                .setItemTitle(0, LONG_TITLE)
-                .setItemTitle(1, SHORT_TITLE)
-                .setItemTitle(2, SHORT_TITLE));
-        assertLayout(1, 2);
-    }
-
-    public void test4LongItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(4)
-                .setItemTitle(0, LONG_TITLE)
-                .setItemTitle(1, LONG_TITLE)
-                .setItemTitle(2, LONG_TITLE)
-                .setItemTitle(3, LONG_TITLE));
-        assertLayout(2, 2);
-    }
-
-    public void test4ShortItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(4)
-                .setItemTitle(0, SHORT_TITLE)
-                .setItemTitle(1, SHORT_TITLE)
-                .setItemTitle(2, SHORT_TITLE)
-                .setItemTitle(3, SHORT_TITLE));
-        assertLayout(4);
-    }
-
-    public void test4VarietyItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(4)
-                .setItemTitle(0, LONG_TITLE)
-                .setItemTitle(1, SHORT_TITLE)
-                .setItemTitle(2, SHORT_TITLE)
-                .setItemTitle(3, SHORT_TITLE));
-        assertLayout(2, 2);
-    }
-
-    public void test5ShortItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(5)
-                .setItemTitle(0, SHORT_TITLE)
-                .setItemTitle(1, SHORT_TITLE)
-                .setItemTitle(2, SHORT_TITLE)
-                .setItemTitle(3, SHORT_TITLE)
-                .setItemTitle(4, SHORT_TITLE));
-        assertLayout(5);
-    }
-
-    public void test5LongItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(5)
-                .setItemTitle(0, LONG_TITLE)
-                .setItemTitle(1, LONG_TITLE)
-                .setItemTitle(2, LONG_TITLE)
-                .setItemTitle(3, LONG_TITLE)
-                .setItemTitle(4, LONG_TITLE));
-        assertLayout(2, 3);
-    }
-
-    public void test5VarietyItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(5)
-                .setItemTitle(0, LONG_TITLE)
-                .setItemTitle(1, SHORT_TITLE)
-                .setItemTitle(2, LONG_TITLE)
-                .setItemTitle(3, SHORT_TITLE)
-                .setItemTitle(4, LONG_TITLE));
-        assertLayout(2, 3);
-    }
-
-    public void test6LongItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(6)
-                .setItemTitle(0, LONG_TITLE)
-                .setItemTitle(1, LONG_TITLE)
-                .setItemTitle(2, LONG_TITLE)
-                .setItemTitle(3, LONG_TITLE)
-                .setItemTitle(4, LONG_TITLE)
-                .setItemTitle(5, LONG_TITLE));
-        assertLayout(3, 3);
-    }
-
-    public void test6ShortItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(6)
-                .setItemTitle(0, SHORT_TITLE)
-                .setItemTitle(1, SHORT_TITLE)
-                .setItemTitle(2, SHORT_TITLE)
-                .setItemTitle(3, SHORT_TITLE)
-                .setItemTitle(4, SHORT_TITLE)
-                .setItemTitle(5, SHORT_TITLE));
-        assertLayout(6);
-    }
-
-    public void test6VarietyItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(6)
-                .setItemTitle(0, SHORT_TITLE)
-                .setItemTitle(1, LONG_TITLE)
-                .setItemTitle(2, SHORT_TITLE)
-                .setItemTitle(3, LONG_TITLE)
-                .setItemTitle(4, SHORT_TITLE)
-                .setItemTitle(5, SHORT_TITLE));
-        assertLayout(3, 3);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuLayoutPortrait.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuLayoutPortrait.java
deleted file mode 100755
index 6b4fa6a8ce5fb2f4153e5b9cb5184d60b9260697..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuLayoutPortrait.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-package com.mediatek.common.view.tests.menu;
-
-/**
- * An activity (inherits from MenuLayout) that shows in portrait.
- */
-public class MenuLayoutPortrait extends MenuLayout {
-
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuLayoutPortraitTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuLayoutPortraitTest.java
deleted file mode 100755
index 53f58befd5f222ca73500bcd67c1cc536ccd1df3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuLayoutPortraitTest.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/**
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-package com.mediatek.common.view.tests.menu;
-
-import com.mediatek.common.view.tests.util.KeyUtils;
-
-import android.test.ActivityInstrumentationTestCase;
-
-public class MenuLayoutPortraitTest extends ActivityInstrumentationTestCase<MenuLayoutPortrait> {
-    private static final String LONG_TITLE = "Really really really really really really really really really really long title";
-    private static final String SHORT_TITLE = "Item";
-
-    private MenuLayout mActivity;
-
-    public MenuLayoutPortraitTest() {
-        super("com.mediatek.common.view.tests", MenuLayoutPortrait.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-    }
-
-    private void toggleMenu() {
-        getInstrumentation().waitForIdleSync();
-        KeyUtils.tapMenuKey(this);
-        getInstrumentation().waitForIdleSync();
-    }
-
-    /**
-     * Asserts the layout of the menu.
-     *
-     * @param expectedLayout The number of parameters is the number of rows, and
-     *            each parameter is how many items on that row.
-     */
-    private void assertLayout(Integer... expectedLayout) {
-        toggleMenu();
-
-        /* TODO These need to be rewritten to account for presenters that an activity
-         * does not have access to.
-        IconMenuView iconMenuView = ((IconMenuView) mActivity.getMenuView(MenuBuilder.TYPE_ICON));
-        int[] layout = iconMenuView.getLayout();
-        int layoutNumRows = iconMenuView.getLayoutNumRows();
-
-        int expectedRows = expectedLayout.length;
-        assertEquals("Row mismatch", expectedRows, layoutNumRows);
-
-        for (int row = 0; row < expectedRows; row++) {
-            assertEquals("Col mismatch on row " + row, expectedLayout[row].intValue(),
-                    layout[row]);
-        }
-         */
-    }
-
-    public void test1ShortItem() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(1)
-                .setItemTitle(0, SHORT_TITLE));
-        assertLayout(1);
-    }
-
-    public void test1LongItem() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(1)
-                .setItemTitle(0, LONG_TITLE));
-        assertLayout(1);
-    }
-
-    public void test2LongItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(2)
-                .setItemTitle(0, LONG_TITLE)
-                .setItemTitle(1, LONG_TITLE));
-        assertLayout(1, 1);
-    }
-
-    public void test2ShortItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(2)
-                .setItemTitle(0, SHORT_TITLE)
-                .setItemTitle(1, SHORT_TITLE));
-        assertLayout(2);
-    }
-
-    public void test3ShortItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(3)
-                .setItemTitle(0, SHORT_TITLE)
-                .setItemTitle(1, SHORT_TITLE)
-                .setItemTitle(2, SHORT_TITLE));
-        assertLayout(3);
-    }
-
-    public void test3VarietyItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(3)
-                .setItemTitle(0, SHORT_TITLE)
-                .setItemTitle(1, LONG_TITLE)
-                .setItemTitle(2, SHORT_TITLE));
-        // We maintain the order added, so there must be 3 rows
-        assertLayout(1, 1, 1);
-    }
-
-    public void test3VarietyItems2() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(3)
-                .setItemTitle(0, LONG_TITLE)
-                .setItemTitle(1, SHORT_TITLE)
-                .setItemTitle(2, SHORT_TITLE));
-        // The long can fit in first row, and two shorts in second
-        assertLayout(1, 2);
-    }
-
-    public void test4LongItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(4)
-                .setItemTitle(0, LONG_TITLE)
-                .setItemTitle(1, LONG_TITLE)
-                .setItemTitle(2, LONG_TITLE)
-                .setItemTitle(3, LONG_TITLE));
-        assertLayout(1, 1, 2);
-    }
-
-    public void test4ShortItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(4)
-                .setItemTitle(0, SHORT_TITLE)
-                .setItemTitle(1, SHORT_TITLE)
-                .setItemTitle(2, SHORT_TITLE)
-                .setItemTitle(3, SHORT_TITLE));
-        assertLayout(2, 2);
-    }
-
-    public void test4VarietyItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(4)
-                .setItemTitle(0, LONG_TITLE)
-                .setItemTitle(1, SHORT_TITLE)
-                .setItemTitle(2, SHORT_TITLE)
-                .setItemTitle(3, SHORT_TITLE));
-        assertLayout(1, 1, 2);
-    }
-
-    public void test5ShortItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(5)
-                .setItemTitle(0, SHORT_TITLE)
-                .setItemTitle(1, SHORT_TITLE)
-                .setItemTitle(2, SHORT_TITLE)
-                .setItemTitle(3, SHORT_TITLE)
-                .setItemTitle(4, SHORT_TITLE));
-        assertLayout(2, 3);
-    }
-
-    public void test5LongItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(5)
-                .setItemTitle(0, LONG_TITLE)
-                .setItemTitle(1, LONG_TITLE)
-                .setItemTitle(2, LONG_TITLE)
-                .setItemTitle(3, LONG_TITLE)
-                .setItemTitle(4, LONG_TITLE));
-        assertLayout(1, 2, 2);
-    }
-
-    public void test5VarietyItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(5)
-                .setItemTitle(0, LONG_TITLE)
-                .setItemTitle(1, SHORT_TITLE)
-                .setItemTitle(2, LONG_TITLE)
-                .setItemTitle(3, SHORT_TITLE)
-                .setItemTitle(4, LONG_TITLE));
-        assertLayout(1, 2, 2);
-    }
-
-    public void test6LongItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(6)
-                .setItemTitle(0, LONG_TITLE)
-                .setItemTitle(1, LONG_TITLE)
-                .setItemTitle(2, LONG_TITLE)
-                .setItemTitle(3, LONG_TITLE)
-                .setItemTitle(4, LONG_TITLE)
-                .setItemTitle(5, LONG_TITLE));
-        assertLayout(2, 2, 2);
-    }
-
-    public void test6ShortItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(6)
-                .setItemTitle(0, SHORT_TITLE)
-                .setItemTitle(1, SHORT_TITLE)
-                .setItemTitle(2, SHORT_TITLE)
-                .setItemTitle(3, SHORT_TITLE)
-                .setItemTitle(4, SHORT_TITLE)
-                .setItemTitle(5, SHORT_TITLE));
-        assertLayout(3, 3);
-    }
-
-    public void test6VarietyItems() {
-        mActivity.setParams(new MenuScenario.Params()
-                .setNumItems(6)
-                .setItemTitle(0, SHORT_TITLE)
-                .setItemTitle(1, LONG_TITLE)
-                .setItemTitle(2, SHORT_TITLE)
-                .setItemTitle(3, LONG_TITLE)
-                .setItemTitle(4, SHORT_TITLE)
-                .setItemTitle(5, SHORT_TITLE));
-        assertLayout(2, 2, 2);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuScenario.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuScenario.java
deleted file mode 100755
index daf9e317ed55201ac21929f61bfe5295fa2461b5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuScenario.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.menu;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.util.SparseArray;
-import android.view.Menu;
-import android.view.MenuItem;
-
-/**
- * Utility base class for creating various Menu scenarios. Configurable by the
- * number of menu items. Used @link {@link ListScenario} as a reference.
- */
-public class MenuScenario extends Activity implements MenuItem.OnMenuItemClickListener {
-    private Params mParams = new Params();
-    private Menu mMenu;
-    private MenuItem[] mItems;
-    private boolean[] mWasItemClicked;
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        dispatchInitParams();
-    }
-
-    private void dispatchInitParams() {
-        onInitParams(mParams);
-        onParamsChanged();
-    }
-
-    public void setParams(Params params) {
-        mParams = params;
-        onParamsChanged();
-    }
-
-    public void onParamsChanged() {
-        mItems = new MenuItem[mParams.numItems];
-        mWasItemClicked = new boolean[mParams.numItems];
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Safe to hold on to
-        mMenu = menu;
-
-        if (!mParams.shouldShowMenu) return false;
-
-        MenuItem item;
-        for (int i = 0; i < mParams.numItems; i++) {
-            if ((item = onAddMenuItem(menu, i)) == null) {
-                // Add a default item for this position if the subclasses
-                // haven't
-                CharSequence givenTitle = mParams.itemTitles.get(i);
-                item = menu.add(0, 0, 0, (givenTitle != null) ? givenTitle : ("Item " + i));
-            }
-
-            if (item != null) {
-                mItems[i] = item;
-
-                if (mParams.listenForClicks) {
-                    item.setOnMenuItemClickListener(this);
-                }
-            }
-
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        // Safe to hold on to
-        mMenu = menu;
-
-        return mParams.shouldShowMenu;
-    }
-
-    /**
-     * Override this to add an item to the menu.
-     *
-     * @param itemPosition The position of the item to add (only for your
-     *            reference).
-     * @return The item that was added to the menu, or null if nothing was
-     *         added.
-     */
-    protected MenuItem onAddMenuItem(Menu menu, int itemPosition) {
-        return null;
-    }
-
-    /**
-     * Override this to set the parameters for the scenario. Call through to super first.
-     *
-     * @param params
-     */
-    protected void onInitParams(Params params) {
-    }
-
-    public Menu getMenu() {
-        return mMenu;
-    }
-
-    public boolean onMenuItemClick(MenuItem item) {
-        final int position = findItemPosition(item);
-        if (position < 0) return false;
-
-        mWasItemClicked[position] = true;
-
-        return true;
-    }
-
-    public boolean wasItemClicked(int position) {
-        return mWasItemClicked[position];
-    }
-
-    /**
-     * Finds the position for a given Item.
-     *
-     * @param item The item to find.
-     * @return The position, or -1 if not found.
-     */
-    public int findItemPosition(MenuItem item) {
-        // Could create reverse mapping, but optimizations aren't important (yet :P)
-        for (int i = 0; i < mParams.numItems; i++) {
-            if (mItems[i] == item) return i;
-        }
-
-        return -1;
-    }
-
-    public static class Params {
-        // Using as data structure, so no m prefix
-        private boolean shouldShowMenu = true;
-        private int numItems = 10;
-        private boolean listenForClicks = true;
-        private SparseArray<CharSequence> itemTitles = new SparseArray<CharSequence>();
-
-        public Params setShouldShowMenu(boolean shouldShowMenu) {
-            this.shouldShowMenu = shouldShowMenu;
-            return this;
-        }
-
-        public Params setNumItems(int numItems) {
-            this.numItems = numItems;
-            return this;
-        }
-
-        public Params setListenForClicks(boolean listenForClicks) {
-            this.listenForClicks = listenForClicks;
-            return this;
-        }
-
-        public Params setItemTitle(int itemPos, CharSequence title) {
-            itemTitles.put(itemPos, title);
-            return this;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuWith1Item.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuWith1Item.java
deleted file mode 100755
index f7c6e4452a82a3923d4de1c9e7b7de1b6e195c13..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuWith1Item.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.menu;
-
-import android.os.Bundle;
-import android.widget.Button;
-
-public class MenuWith1Item extends MenuScenario {
-
-    private Button mButton;
-
-    @Override
-    protected void onInitParams(Params params) {
-        super.onInitParams(params);
-
-        params.setNumItems(1);
-    }
-
-    public Button getButton() {
-        return mButton;
-    }
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        mButton  = new Button(this);
-        setContentView(mButton);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuWith1ItemTest.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuWith1ItemTest.java
deleted file mode 100755
index 91ca493c5f24aec9841c0fc65a2387a42a61a5e7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/menu/MenuWith1ItemTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.menu;
-
-import com.mediatek.common.view.tests.util.KeyUtils;
-
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.view.KeyEvent;
-
-public class MenuWith1ItemTest extends ActivityInstrumentationTestCase<MenuWith1Item> {
-    private MenuWith1Item mActivity;
-
-    public MenuWith1ItemTest() {
-        super("com.mediatek.common.view.tests", MenuWith1Item.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertFalse(mActivity.getButton().isInTouchMode());
-    }
-
-    @MediumTest
-    public void testItemClick() {
-
-        // Open menu, click on an item
-        KeyUtils.tapMenuKey(this);
-        getInstrumentation().waitForIdleSync();
-        assertFalse("Item seems to have been clicked before we clicked on it", mActivity
-                .wasItemClicked(0));
-        sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
-        assertTrue("Item doesn't seem to have registered our click", mActivity.wasItemClicked(0));
-    }
-
-    @LargeTest
-    public void testTouchModeTransfersRemovesFocus() throws Exception {
-        /* TODO These need to be rewritten to account for presenters that an activity
-         * does not have access to.
-
-        // open menu, move around to give it focus
-        sendKeys(KeyEvent.KEYCODE_MENU, KeyEvent.KEYCODE_DPAD_LEFT);
-        final View menuItem = mActivity.getItemView(MenuBuilder.TYPE_ICON, 0);
-        assertTrue("menuItem.isFocused()", menuItem.isFocused());
-
-        // close the menu
-        sendKeys(KeyEvent.KEYCODE_MENU);
-        Thread.sleep(500);
-
-        // touch the screen
-        TouchUtils.clickView(this, mActivity.getButton());
-        assertTrue("should be in touch mode after touching button",
-                mActivity.getButton().isInTouchMode());
-
-        // open the menu, menu item shouldn't be focused, because we are not
-        // in touch mode
-        sendKeys(KeyEvent.KEYCODE_MENU);
-        assertTrue("menuItem.isInTouchMode()", menuItem.isInTouchMode());
-        assertFalse("menuItem.isFocused()", menuItem.isFocused());
-         */
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/util/KeyUtils.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/util/KeyUtils.java
deleted file mode 100755
index 7dd045d54a1e7f632511a6a4ec6dec037b2b8c08..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/util/KeyUtils.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.util;
-
-import android.app.Instrumentation;
-import android.test.ActivityInstrumentationTestCase;
-import android.view.KeyCharacterMap;
-import android.view.KeyEvent;
-import android.view.ViewConfiguration;
-
-/**
- * Reusable methods for generating key events.
- * <p>
- * Definitions:
- * <li> Tap refers to pushing and releasing a button (down and up event).
- * <li> Chord refers to pushing a modifier key, tapping a regular key, and
- * releasing the modifier key.
- */
-public class KeyUtils {
-    /**
-     * Simulates tapping the menu key.
-     *
-     * @param test The test case that is being run.
-     */
-    public static void tapMenuKey(ActivityInstrumentationTestCase test) {
-        final Instrumentation inst = test.getInstrumentation();
-
-        inst.sendKeySync(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MENU));
-        inst.sendKeySync(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MENU));
-    }
-
-    /**
-     * Simulates chording the menu key.
-     *
-     * @param test The test case that is being run.
-     * @param shortcutKey The shortcut key to tap while chording the menu key.
-     */
-    public static void chordMenuKey(ActivityInstrumentationTestCase test, char shortcutKey) {
-        final Instrumentation inst = test.getInstrumentation();
-
-        final KeyEvent pushMenuKey = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MENU);
-        final KeyCharacterMap keyCharMap = KeyCharacterMap.load(pushMenuKey.getDeviceId());
-        final KeyEvent shortcutKeyEvent = keyCharMap.getEvents(new char[] { shortcutKey })[0];
-        final int shortcutKeyCode = shortcutKeyEvent.getKeyCode();
-
-        inst.sendKeySync(pushMenuKey);
-        inst.sendKeySync(new KeyEvent(KeyEvent.ACTION_DOWN, shortcutKeyCode));
-        inst.sendKeySync(new KeyEvent(KeyEvent.ACTION_UP, shortcutKeyCode));
-        inst.sendKeySync(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MENU));
-    }
-
-    /**
-     * Simulates a long click via the keyboard.
-     *
-     * @param test The test case that is being run.
-     */
-    public static void longClick(ActivityInstrumentationTestCase test) {
-        final Instrumentation inst = test.getInstrumentation();
-
-        inst.sendKeySync(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_CENTER));
-        try {
-            Thread.sleep((long) (ViewConfiguration.getLongPressTimeout() * 1.5f));
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        inst.sendKeySync(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DPAD_CENTER));
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/util/ListItemFactory.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/util/ListItemFactory.java
deleted file mode 100755
index bce03d98b82997a266b8e8f0ec2257c8717b3a9e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/util/ListItemFactory.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.util;
-
-import android.content.Context;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AbsListView;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-/**
- * Reusable methods for creating more complex list items.
- */
-public class ListItemFactory {
-
-    /**
-     * Create a view with a button at the top and bottom, with filler in between.
-     * The filler is sized to take up any space left over within desiredHeight.
-     *
-     * @param position      The position within the list.
-     * @param context       The context.
-     * @param desiredHeight The desired height of the entire view.
-     * @return The created view.
-     */
-    public static View twoButtonsSeparatedByFiller(int position, Context context, int desiredHeight) {
-        if (desiredHeight < 90) {
-            throw new IllegalArgumentException("need at least 90 pixels of height " +
-                    "to create the two buttons and leave 10 pixels for the filler");
-        }
-
-        final LinearLayout ll = new LinearLayout(context);
-        ll.setOrientation(LinearLayout.VERTICAL);
-
-        final LinearLayout.LayoutParams buttonLp =
-                new LinearLayout.LayoutParams(
-                        ViewGroup.LayoutParams.MATCH_PARENT,
-                        50);
-
-        final Button topButton = new Button(context);
-        topButton.setLayoutParams(
-                buttonLp);
-        topButton.setText("top (position " + position + ")");
-        ll.addView(topButton);
-
-        final TextView middleFiller = new TextView(context);
-        middleFiller.setLayoutParams(new LinearLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                desiredHeight - 100));
-        middleFiller.setText("filler");
-        ll.addView(middleFiller);
-
-        final Button bottomButton = new Button(context);
-        bottomButton.setLayoutParams(buttonLp);
-        bottomButton.setText("bottom (position " + position + ")");
-        ll.addView(bottomButton);
-        ll.setTag("twoButtons");
-        return ll;
-    }
-
-    public enum Slot {
-        Left,
-        Middle,
-        Right
-    }
-
-    /**
-     * Create a horizontal linear layout divided into thirds (with some margins
-     * separating the thirds), filled with buttons into some slots.
-     * @param context The context.
-     * @param desiredHeight The height of the LL.
-     * @param slots Which slots to fill with buttons.
-     * @return The linear layout.
-     */
-    public static View horizontalButtonSlots(Context context, int desiredHeight, Slot... slots) {
-
-        final LinearLayout ll = new LinearLayout(context);
-        ll.setOrientation(LinearLayout.HORIZONTAL);
-
-        final LinearLayout.LayoutParams lp
-                = new LinearLayout.LayoutParams(0, desiredHeight);
-        lp.setMargins(10, 0, 10, 0);
-        lp.weight = 0.33f;
-
-        boolean left = false;
-        boolean middle = false;
-        boolean right = false;
-        for (Slot slot : slots) {
-            switch (slot) {
-                case Left:
-                    left = true;
-                    break;
-                case Middle:
-                    middle = true;
-                    break;
-                case Right:
-                    right = true;
-                    break;
-            }
-        }
-
-        if (left) {
-            final Button button = new Button(context);
-            button.setText("left");
-            ll.addView(button, lp);
-        } else {
-           ll.addView(new View(context), lp);
-        }
-
-        if (middle) {
-            final Button button = new Button(context);
-            button.setText("center");
-            ll.addView(button, lp);
-        } else {
-           ll.addView(new View(context), lp);
-        }
-
-        if (right) {
-            final Button button = new Button(context);
-            button.setText("right");
-            ll.addView(button, lp);
-        } else {
-           ll.addView(new View(context), lp);
-        }
-
-        return ll;
-    }
-
-
-    /**
-     * Create a button ready to be a list item.
-     *
-     * @param position      The position within the list.
-     * @param context       The context.
-     * @param text          The text of the button
-     * @param desiredHeight The desired height of the button
-     * @return The created view.
-     */
-    public static View button(int position, Context context, String text, int desiredHeight) {
-        TextView result = new Button(context);
-        result.setHeight(desiredHeight);
-        result.setText(text);
-        final ViewGroup.LayoutParams lp = new AbsListView.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT);
-        result.setLayoutParams(lp);
-        result.setId(position);
-        result.setTag("button");
-        return result;
-    }
-
-    /**
-     * Convert an existing button view to display the data at a new position.
-     *
-     * @param convertView Non-null Button created by {@link #button}
-     * @param text The text of the button
-     * @param position The position withion the list
-     * @return The converted view
-     */
-    public static View convertButton(View convertView, String text, int position) {
-        if (((String) convertView.getTag()).equals("button")) {
-            ((Button) convertView).setText(text);
-            convertView.setId(position);
-            return convertView;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Create a text view ready to be a list item.
-     *
-     * @param position      The position within the list.
-     * @param context       The context.
-     * @param text          The text to display
-     * @param desiredHeight The desired height of the text view
-     * @return The created view.
-     */
-    public static View text(int position, Context context, String text, int desiredHeight) {
-        TextView result = new TextView(context);
-        result.setHeight(desiredHeight);
-        result.setText(text);
-        final ViewGroup.LayoutParams lp = new AbsListView.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT);
-        result.setLayoutParams(lp);
-        result.setId(position);
-        result.setTag("text");
-        return result;
-    }
-
-    /**
-     * Convert an existing text view to display the data at a new position.
-     *
-     * @param convertView Non-null TextView created by {@link #text}
-     * @param text The text to display
-     * @param position The position withion the list
-     * @return The converted view
-     */
-    public static View convertText(View convertView, String text, int position) {
-        if (convertView.getTag() != null && ((String) convertView.getTag()).equals("text")) {
-            ((TextView) convertView).setText(text);
-            convertView.setId(position);
-            return convertView;
-
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Create a text view ready to be a list item.
-     *
-     * @param position      The position within the list.
-     * @param context       The context.
-     * @param text          The text of the button
-     * @param desiredHeight The desired height of the button
-     * @return The created view.
-     */
-    public static View doubleText(int position, Context context, String text, int desiredHeight) {
-        final LinearLayout ll = new LinearLayout(context);
-        ll.setOrientation(LinearLayout.HORIZONTAL);
-
-        final AbsListView.LayoutParams lp =
-                new AbsListView.LayoutParams(
-                        ViewGroup.LayoutParams.MATCH_PARENT,
-                        desiredHeight);
-        ll.setLayoutParams(lp);
-        ll.setId(position);
-
-        TextView t1 = new TextView(context);
-        t1.setHeight(desiredHeight);
-        t1.setText(text);
-        t1.setGravity(Gravity.LEFT | Gravity.CENTER_VERTICAL);
-        final ViewGroup.LayoutParams lp1 = new LinearLayout.LayoutParams(
-                0,
-                ViewGroup.LayoutParams.WRAP_CONTENT, 1.0f);
-        ll.addView(t1, lp1);
-
-        TextView t2 = new TextView(context);
-        t2.setHeight(desiredHeight);
-        t2.setText(text);
-        t2.setGravity(Gravity.RIGHT | Gravity.CENTER_VERTICAL);
-        final ViewGroup.LayoutParams lp2 = new LinearLayout.LayoutParams(
-                0,
-                ViewGroup.LayoutParams.WRAP_CONTENT,
-                1.0f);
-
-        ll.addView(t2, lp2);
-        ll.setTag("double");
-        return ll;
-    }
-
-
-    /**
-     * Convert an existing button view to display the data at a new position.
-     *
-     * @param convertView Non-null view created by {@link #doubleText}
-     * @param text The text of the button
-     * @param position The position withion the list
-     * @return The converted view
-     */
-    public static View convertDoubleText(View convertView, String text, int position) {
-        if (((String) convertView.getTag()).equals("double")) {
-            TextView t1 = (TextView) ((LinearLayout) convertView).getChildAt(0);
-            TextView t2 = (TextView) ((LinearLayout) convertView).getChildAt(1);
-            t1.setText(text);
-            t2.setText(text);
-            convertView.setId(position);
-            return convertView;
-        } else {
-            return null;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/util/ListScenario.java b/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/util/ListScenario.java
deleted file mode 100755
index 124ed9fa2ae07464392239fed8ff15913a354ad4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/view/src/com/mediatek/common/view/tests/util/ListScenario.java
+++ /dev/null
@@ -1,671 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.view.tests.util;
-
-import android.app.Activity;
-import android.graphics.Rect;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.ListView;
-import android.widget.TextView;
-import com.google.android.collect.Maps;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Utility base class for creating various List scenarios.  Configurable by the number
- * of items, how tall each item should be (in relation to the screen height), and
- * what item should start with selection.
- */
-public abstract class ListScenario extends Activity {
-
-    private ListView mListView;
-    private TextView mHeaderTextView;
-
-    private int mNumItems;
-    protected boolean mItemsFocusable;
-
-    private int mStartingSelectionPosition;
-    private double mItemScreenSizeFactor;
-    private Map<Integer, Double> mOverrideItemScreenSizeFactors = Maps.newHashMap();
-
-    private int mScreenHeight;
-
-    // whether to include a text view above the list
-    private boolean mIncludeHeader;
-
-    // separators
-    private Set<Integer> mUnselectableItems = new HashSet<Integer>();
-
-    private boolean mStackFromBottom;
-
-    private int mClickedPosition = -1;
-
-    private int mLongClickedPosition = -1;
-
-    private int mConvertMisses = 0;
-
-    private int mHeaderViewCount;
-    private boolean mHeadersFocusable;
-
-    private int mFooterViewCount;
-    private LinearLayout mLinearLayout;
-
-    public ListView getListView() {
-        return mListView;
-    }
-
-    protected int getScreenHeight() {
-        return mScreenHeight;
-    }
-
-    /**
-     * Return whether the item at position is selectable (i.e is a separator).
-     * (external users can access this info using the adapter)
-     */
-    private boolean isItemAtPositionSelectable(int position) {
-        return !mUnselectableItems.contains(position);
-    }
-
-    /**
-     * Better way to pass in optional params than a honkin' paramater list :)
-     */
-    public static class Params {
-        private int mNumItems = 4;
-        private boolean mItemsFocusable = false;
-        private int mStartingSelectionPosition = 0;
-        private double mItemScreenSizeFactor = 1 / 5;
-        private Double mFadingEdgeScreenSizeFactor = null;
-
-        private Map<Integer, Double> mOverrideItemScreenSizeFactors = Maps.newHashMap();
-
-        // separators
-        private List<Integer> mUnselectableItems = new ArrayList<Integer>(8);
-        // whether to include a text view above the list
-        private boolean mIncludeHeader = false;
-        private boolean mStackFromBottom = false;
-        public boolean mMustFillScreen = true;
-        private int mHeaderViewCount;
-        private boolean mHeaderFocusable = false;
-        private int mFooterViewCount;
-
-        private boolean mConnectAdapter = true;
-
-        /**
-         * Set the number of items in the list.
-         */
-        public Params setNumItems(int numItems) {
-            mNumItems = numItems;
-            return this;
-        }
-
-        /**
-         * Set whether the items are focusable.
-         */
-        public Params setItemsFocusable(boolean itemsFocusable) {
-            mItemsFocusable = itemsFocusable;
-            return this;
-        }
-
-        /**
-         * Set the position that starts selected.
-         *
-         * @param startingSelectionPosition The selected position within the adapter's data set.
-         * Pass -1 if you do not want to force a selection.
-         * @return
-         */
-        public Params setStartingSelectionPosition(int startingSelectionPosition) {
-            mStartingSelectionPosition = startingSelectionPosition;
-            return this;
-        }
-
-        /**
-         * Set the factor that determines how tall each item is in relation to the
-         * screen height.
-         */
-        public Params setItemScreenSizeFactor(double itemScreenSizeFactor) {
-            mItemScreenSizeFactor = itemScreenSizeFactor;
-            return this;
-        }
-
-        /**
-         * Override the item screen size factor for a particular item.  Useful for
-         * creating lists with non-uniform item height.
-         * @param position The position in the list.
-         * @param itemScreenSizeFactor The screen size factor to use for the height.
-         */
-        public Params setPositionScreenSizeFactorOverride(
-                int position, double itemScreenSizeFactor) {
-            mOverrideItemScreenSizeFactors.put(position, itemScreenSizeFactor);
-            return this;
-        }
-
-        /**
-         * Set a position as unselectable (a.k.a a separator)
-         * @param position
-         * @return
-         */
-        public Params setPositionUnselectable(int position) {
-            mUnselectableItems.add(position);
-            return this;
-        }
-
-        /**
-         * Set positions as unselectable (a.k.a a separator)
-         */
-        public Params setPositionsUnselectable(int ...positions) {
-            for (int pos : positions) {
-                setPositionUnselectable(pos);
-            }
-            return this;
-        }
-
-        /**
-         * Include a header text view above the list.
-         * @param includeHeader
-         * @return
-         */
-        public Params includeHeaderAboveList(boolean includeHeader) {
-            mIncludeHeader = includeHeader;
-            return this;
-        }
-
-        /**
-         * Sets the stacking direction
-         * @param stackFromBottom
-         * @return
-         */
-        public Params setStackFromBottom(boolean stackFromBottom) {
-            mStackFromBottom = stackFromBottom;
-            return this;
-        }
-
-        /**
-         * Sets whether the sum of the height of the list items must be at least the
-         * height of the list view.
-         */
-        public Params setMustFillScreen(boolean fillScreen) {
-            mMustFillScreen = fillScreen;
-            return this;
-        }
-
-        /**
-         * Set the factor for the fading edge length.
-         */
-        public Params setFadingEdgeScreenSizeFactor(double fadingEdgeScreenSizeFactor) {
-            mFadingEdgeScreenSizeFactor = fadingEdgeScreenSizeFactor;
-            return this;
-        }
-
-        /**
-         * Set the number of header views to appear within the list
-         */
-        public Params setHeaderViewCount(int headerViewCount) {
-            mHeaderViewCount = headerViewCount;
-            return this;
-        }
-
-        /**
-         * Set whether the headers should be focusable.
-         * @param headerFocusable Whether the headers should be focusable (i.e
-         *   created as edit texts rather than text views).
-         */
-        public Params setHeaderFocusable(boolean headerFocusable) {
-            mHeaderFocusable = headerFocusable;
-            return this;
-        }
-
-        /**
-         * Set the number of footer views to appear within the list
-         */
-        public Params setFooterViewCount(int footerViewCount) {
-            mFooterViewCount = footerViewCount;
-            return this;
-        }
-
-        /**
-         * Sets whether the {@link ListScenario} will automatically set the
-         * adapter on the list view. If this is false, the client MUST set it
-         * manually (this is useful when adding headers to the list view, which
-         * must be done before the adapter is set).
-         */
-        public Params setConnectAdapter(boolean connectAdapter) {
-            mConnectAdapter = connectAdapter;
-            return this;
-        }
-    }
-
-    /**
-     * How each scenario customizes its behavior.
-     * @param params
-     */
-    protected abstract void init(Params params);
-
-    /**
-     * Override this if you want to know when something has been selected (perhaps
-     * more importantly, that {@link android.widget.AdapterView.OnItemSelectedListener} has
-     * been triggered).
-     */
-    protected void positionSelected(int positon) {
-    }
-
-    /**
-     * Override this if you want to know that nothing is selected.
-     */
-    protected void nothingSelected() {
-    }
-
-    /**
-     * Override this if you want to know when something has been clicked (perhaps
-     * more importantly, that {@link android.widget.AdapterView.OnItemClickListener} has
-     * been triggered).
-     */
-    protected void positionClicked(int position) {
-        setClickedPosition(position);
-    }
-
-    /**
-     * Override this if you want to know when something has been long clicked (perhaps
-     * more importantly, that {@link android.widget.AdapterView.OnItemLongClickListener} has
-     * been triggered).
-     */
-    protected void positionLongClicked(int position) {
-        setLongClickedPosition(position);
-    }
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        // for test stability, turn off title bar
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-
-
-        mScreenHeight = getWindowManager().getDefaultDisplay().getHeight();
-
-        final Params params = createParams();
-        init(params);
-
-        readAndValidateParams(params);
-
-
-        mListView = createListView();
-        mListView.setLayoutParams(new ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT));
-        mListView.setDrawSelectorOnTop(false);
-
-        for (int i = 0; i < mHeaderViewCount; i++) {
-            TextView header = mHeadersFocusable ?
-                    new EditText(this) :
-                    new TextView(this);
-            header.setText("Header: " + i);
-            mListView.addHeaderView(header);
-        }
-
-        for (int i = 0; i < mFooterViewCount; i++) {
-            TextView header = new TextView(this);
-            header.setText("Footer: " + i);
-            mListView.addFooterView(header);
-        }
-
-        if (params.mConnectAdapter) {
-            setAdapter(mListView);
-        }
-
-        mListView.setItemsCanFocus(mItemsFocusable);
-        if (mStartingSelectionPosition >= 0) {
-            mListView.setSelection(mStartingSelectionPosition);
-        }
-        mListView.setPadding(0, 0, 0, 0);
-        mListView.setStackFromBottom(mStackFromBottom);
-        mListView.setDivider(null);
-
-        mListView.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            public void onItemSelected(AdapterView parent, View v, int position, long id) {
-                positionSelected(position);
-            }
-
-            public void onNothingSelected(AdapterView parent) {
-                nothingSelected();
-            }
-        });
-
-        mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            public void onItemClick(AdapterView parent, View v, int position, long id) {
-                positionClicked(position);
-            }
-        });
-
-        // set the fading edge length porportionally to the screen
-        // height for test stability
-        if (params.mFadingEdgeScreenSizeFactor != null) {
-            mListView.setFadingEdgeLength((int) (params.mFadingEdgeScreenSizeFactor * mScreenHeight));
-        } else {
-            mListView.setFadingEdgeLength((int) ((64.0 / 480) * mScreenHeight));
-        }
-
-        /**
-         * M: [ALPS00428138] 1. enable fading edge, otherwise setting fading edge length is unmeaning
-         * 2. set small velocity scale to disable fling @{
-         */
-        mListView.setVerticalFadingEdgeEnabled(true);
-        mListView.setVelocityScale(0.0f);
-        /** @} */
-
-
-        if (mIncludeHeader) {
-            mLinearLayout = new LinearLayout(this);
-
-            mHeaderTextView = new TextView(this);
-            mHeaderTextView.setText("hi");
-            mHeaderTextView.setLayoutParams(new LinearLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.WRAP_CONTENT));
-            mLinearLayout.addView(mHeaderTextView);
-
-            mLinearLayout.setOrientation(LinearLayout.VERTICAL);
-            mLinearLayout.setLayoutParams(new ViewGroup.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.MATCH_PARENT));
-            mListView.setLayoutParams((new LinearLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    0,
-                    1f)));
-
-            mLinearLayout.addView(mListView);
-            setContentView(mLinearLayout);
-        } else {
-            mLinearLayout = new LinearLayout(this);
-            mLinearLayout.setOrientation(LinearLayout.VERTICAL);
-            mLinearLayout.setLayoutParams(new ViewGroup.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.MATCH_PARENT));
-            mListView.setLayoutParams((new LinearLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    0,
-                    1f)));
-            mLinearLayout.addView(mListView);
-            setContentView(mLinearLayout);
-        }
-    }
-
-    /**
-     * Returns the LinearLayout containing the ListView in this scenario.
-     *
-     * @return The LinearLayout in which the ListView is held.
-     */
-    protected LinearLayout getListViewContainer() {
-        return mLinearLayout;
-    }
-
-    /**
-     * Attaches a long press listener. You can find out which views were clicked by calling
-     * {@link #getLongClickedPosition()}.
-     */
-    public void enableLongPress() {
-        mListView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
-            public boolean onItemLongClick(AdapterView parent, View v, int position, long id) {
-                positionLongClicked(position);
-                return true;
-            }
-        });
-    }
-
-    /**
-     * @return The newly created ListView widget.
-     */
-    protected ListView createListView() {
-        return new ListView(this);
-    }
-
-    /**
-     * @return The newly created Params object.
-     */
-    protected Params createParams() {
-        return new Params();
-    }
-
-    /**
-     * Sets an adapter on a ListView.
-     *
-     * @param listView The ListView to set the adapter on.
-     */
-    protected void setAdapter(ListView listView) {
-        listView.setAdapter(new MyAdapter());
-    }
-
-    /**
-     * Read in and validate all of the params passed in by the scenario.
-     * @param params
-     */
-    protected void readAndValidateParams(Params params) {
-        if (params.mMustFillScreen) {
-            double totalFactor = 0.0;
-            for (int i = 0; i < params.mNumItems; i++) {
-                if (params.mOverrideItemScreenSizeFactors.containsKey(i)) {
-                    totalFactor += params.mOverrideItemScreenSizeFactors.get(i);
-                } else {
-                    totalFactor += params.mItemScreenSizeFactor;
-                }
-            }
-            if (totalFactor < 1.0) {
-                throw new IllegalArgumentException("list items must combine to be at least " +
-                        "the height of the screen.  this is not the case with " + params.mNumItems
-                        + " items and " + params.mItemScreenSizeFactor + " screen factor and " +
-                        "screen height of " + mScreenHeight);
-            }
-        }
-
-        mNumItems = params.mNumItems;
-        mItemsFocusable = params.mItemsFocusable;
-        mStartingSelectionPosition = params.mStartingSelectionPosition;
-        mItemScreenSizeFactor = params.mItemScreenSizeFactor;
-
-        mOverrideItemScreenSizeFactors.putAll(params.mOverrideItemScreenSizeFactors);
-
-        mUnselectableItems.addAll(params.mUnselectableItems);
-        mIncludeHeader = params.mIncludeHeader;
-        mStackFromBottom = params.mStackFromBottom;
-        mHeaderViewCount = params.mHeaderViewCount;
-        mHeadersFocusable = params.mHeaderFocusable;
-        mFooterViewCount = params.mFooterViewCount;
-    }
-
-    public final String getValueAtPosition(int position) {
-        return isItemAtPositionSelectable(position)
-                ?
-                "position " + position :
-                "------- " + position;
-    }
-
-    /**
-     * @return The height that will be set for a particular position.
-     */
-    public int getHeightForPosition(int position) {
-        int desiredHeight = (int) (mScreenHeight * mItemScreenSizeFactor);
-        if (mOverrideItemScreenSizeFactors.containsKey(position)) {
-            desiredHeight = (int) (mScreenHeight * mOverrideItemScreenSizeFactors.get(position));
-        }
-        return desiredHeight;
-    }
-
-
-    /**
-     * @return The contents of the header above the list.
-     * @throws IllegalArgumentException if there is no header.
-     */
-    public final String getHeaderValue() {
-        if (!mIncludeHeader) {
-            throw new IllegalArgumentException("no header above list");
-        }
-        return mHeaderTextView.getText().toString();
-    }
-
-    /**
-     * @param value What to put in the header text view
-     * @throws IllegalArgumentException if there is no header.
-     */
-    protected final void setHeaderValue(String value) {
-        if (!mIncludeHeader) {
-            throw new IllegalArgumentException("no header above list");
-        }
-        mHeaderTextView.setText(value);
-    }
-
-    /**
-     * Create a view for a list item.  Override this to create a custom view beyond
-     * the simple focusable / unfocusable text view.
-     * @param position The position.
-     * @param parent The parent
-     * @param desiredHeight The height the view should be to respect the desired item
-     *   to screen height ratio.
-     * @return a view for the list.
-     */
-    protected View createView(int position, ViewGroup parent, int desiredHeight) {
-        return ListItemFactory.text(position, parent.getContext(), getValueAtPosition(position),
-                desiredHeight);
-    }
-
-    /**
-     * Convert a non-null view.
-     */
-    public View convertView(int position, View convertView, ViewGroup parent) {
-        return ListItemFactory.convertText(convertView, getValueAtPosition(position), position);
-    }
-
-    public void setClickedPosition(int clickedPosition) {
-        mClickedPosition = clickedPosition;
-    }
-
-    public int getClickedPosition() {
-        return mClickedPosition;
-    }
-
-    public void setLongClickedPosition(int longClickedPosition) {
-        mLongClickedPosition = longClickedPosition;
-    }
-
-    public int getLongClickedPosition() {
-        return mLongClickedPosition;
-    }
-
-    /**
-     * Have a child of the list view call {@link View#requestRectangleOnScreen(android.graphics.Rect)}.
-     * @param childIndex The index into the viewgroup children (i.e the children that are
-     *   currently visible).
-     * @param rect The rectangle, in the child's coordinates.
-     */
-    public void requestRectangleOnScreen(int childIndex, final Rect rect) {
-        final View child = getListView().getChildAt(childIndex);
-
-        child.post(new Runnable() {
-            public void run() {
-                child.requestRectangleOnScreen(rect);
-            }
-        });
-    }
-
-    /**
-     * Return an item type for the specified position in the adapter. Override if your
-     * adapter creates more than one type.
-     */
-    public int getItemViewType(int position) {
-        return 0;
-    }
-
-    /**
-     * Return the number of types created by the adapter. Override if your
-     * adapter creates more than one type.
-     */
-    public int getViewTypeCount() {
-        return 1;
-    }
-
-    /**
-     * @return The number of times convertView failed
-     */
-    public int getConvertMisses() {
-        return mConvertMisses;
-    }
-
-    private class MyAdapter extends BaseAdapter {
-
-        public int getCount() {
-            return mNumItems;
-        }
-
-        public Object getItem(int position) {
-            return getValueAtPosition(position);
-        }
-
-        public long getItemId(int position) {
-            return position;
-        }
-
-        @Override
-        public boolean areAllItemsEnabled() {
-            return mUnselectableItems.isEmpty();
-        }
-
-        @Override
-        public boolean isEnabled(int position) {
-            return isItemAtPositionSelectable(position);
-        }
-
-        public View getView(int position, View convertView, ViewGroup parent) {
-            View result = null;
-            if (position >= mNumItems || position < 0) {
-                throw new IllegalStateException("position out of range for adapter!");
-            }
-
-            if (convertView != null) {
-                result = convertView(position, convertView, parent);
-                if (result == null) {
-                    mConvertMisses++;
-                }
-            }
-
-            if (result == null) {
-                int desiredHeight = getHeightForPosition(position);
-                result = createView(position, parent, desiredHeight);
-            }
-            return result;
-        }
-
-        @Override
-        public int getItemViewType(int position) {
-            return ListScenario.this.getItemViewType(position);
-        }
-
-        @Override
-        public int getViewTypeCount() {
-            return ListScenario.this.getViewTypeCount();
-        }
-
-    }
-}
diff --git a/proprietary/frameworks/base/tests/voip/Android.mk b/proprietary/frameworks/base/tests/voip/Android.mk
deleted file mode 100755
index c12e887bf150e289c43452abba8525992dc21c77..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/voip/Android.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := tests
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner voip-common
-
-# include CtsTestServer as a temporary hack to free net.cts from cts.stub.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MtkVoipTestCases
-
-
-# uncomment when dalvik.annotation.Test* are removed or part of SDK
-LOCAL_SDK_VERSION := 14 
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/frameworks/base/tests/voip/Android.mk_ b/proprietary/frameworks/base/tests/voip/Android.mk_
deleted file mode 100755
index c12e887bf150e289c43452abba8525992dc21c77..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/voip/Android.mk_
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := tests
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner voip-common
-
-# include CtsTestServer as a temporary hack to free net.cts from cts.stub.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MtkVoipTestCases
-
-
-# uncomment when dalvik.annotation.Test* are removed or part of SDK
-LOCAL_SDK_VERSION := 14 
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/frameworks/base/tests/voip/AndroidManifest.xml b/proprietary/frameworks/base/tests/voip/AndroidManifest.xml
deleted file mode 100755
index 9fbb21c7dfefbc48c221e0840345da452b42df8e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/voip/AndroidManifest.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mediatek.cts.voip">
-
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />   
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />    
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.mediatek.cts.voip"
-                     android:label="Tests of mediatek voip"/>
-
-</manifest>
-
diff --git a/proprietary/frameworks/base/tests/voip/NOTICE b/proprietary/frameworks/base/tests/voip/NOTICE
deleted file mode 100755
index 12dba8e815d7cdcefb2e97456086863618173d4c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/voip/NOTICE
+++ /dev/null
@@ -1,22 +0,0 @@
-* Copyright (C) 2012 The Android Open Source Project:
-
-
-
-/*
-* Copyright (C) 2011-2014 MediaTek Inc.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-:
- 
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/voip/README b/proprietary/frameworks/base/tests/voip/README
deleted file mode 100755
index 53e5d6235517c559164762c62959d13a022596f1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/voip/README
+++ /dev/null
@@ -1,15 +0,0 @@
-WHAT IT DOES?
-=============
-This is a CTS test APK for voip related testing.
-The moudle tag is tests.
-
-HOW IT WAS BUILT?
-==================
-[Build Method]
-make MtkVoipTestCases
-or
-mmm vendor/mediatek/proprietary/frameworks/base/tests/voip
-
-HOW TO USE IT?
-==============
-adb shell am instrument -w com.mediatek.cts.voip/android.test.InstrumentationTestRunner
diff --git a/proprietary/frameworks/base/tests/voip/src/mediatek/net/rtp/cts/AudioCodecTest.java b/proprietary/frameworks/base/tests/voip/src/mediatek/net/rtp/cts/AudioCodecTest.java
deleted file mode 100755
index cf850022978e63e0d72bffa58ebfc84449f98555..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/voip/src/mediatek/net/rtp/cts/AudioCodecTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package mediatek.net.rtp.cts;
-
-import android.net.rtp.AudioCodec;
-import android.test.AndroidTestCase;
-
-public class AudioCodecTest extends AndroidTestCase {
-
-    private void assertEquals(AudioCodec codec, int type, String rtpmap, String fmtp) {
-        if (type >= 0) {
-            assertEquals(codec.type, type);
-        } else {
-            assertTrue(codec.type >= 96 && codec.type <= 127);
-        }
-        assertEquals(codec.rtpmap.compareToIgnoreCase(rtpmap), 0);
-        assertEquals(codec.fmtp, fmtp);
-    }
-
-    public void testConstants() throws Exception {
-        assertEquals(AudioCodec.PCMU, 0, "PCMU/8000", null);
-        assertEquals(AudioCodec.PCMA, 8, "PCMA/8000", null);
-        assertEquals(AudioCodec.GSM, 3, "GSM/8000", null);
-        assertEquals(AudioCodec.GSM_EFR, -1, "GSM-EFR/8000", null);
-        assertEquals(AudioCodec.AMR, -1, "AMR/8000", null);
-
-        assertFalse(AudioCodec.AMR.type == AudioCodec.GSM_EFR.type);
-    }
-
-    public void testGetCodec() throws Exception {
-        // Bad types.
-        assertNull(AudioCodec.getCodec(128, "PCMU/8000", null));
-        assertNull(AudioCodec.getCodec(-1, "PCMU/8000", null));
-        assertNull(AudioCodec.getCodec(96, null, null));
-
-        // Fixed types.
-        assertEquals(AudioCodec.getCodec(0, null, null), 0, "PCMU/8000", null);
-        assertEquals(AudioCodec.getCodec(8, null, null), 8, "PCMA/8000", null);
-        assertEquals(AudioCodec.getCodec(3, null, null), 3, "GSM/8000", null);
-
-        // Dynamic types.
-        assertEquals(AudioCodec.getCodec(96, "pcmu/8000", null), 96, "PCMU/8000", null);
-        assertEquals(AudioCodec.getCodec(97, "pcma/8000", null), 97, "PCMA/8000", null);
-        assertEquals(AudioCodec.getCodec(98, "gsm/8000", null), 98, "GSM/8000", null);
-        assertEquals(AudioCodec.getCodec(99, "gsm-efr/8000", null), 99, "GSM-EFR/8000", null);
-        assertEquals(AudioCodec.getCodec(100, "amr/8000", null), 100, "AMR/8000", null);
-    }
-
-    public void testGetCodecs() throws Exception {
-        AudioCodec[] codecs = AudioCodec.getCodecs();
-        assertTrue(codecs.length >= 5);
-
-        // The types of the codecs should be different.
-        boolean[] types = new boolean[128];
-        for (AudioCodec codec : codecs) {
-            assertFalse(types[codec.type]);
-            types[codec.type] = true;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/voip/src/mediatek/net/rtp/cts/AudioGroupTest.java b/proprietary/frameworks/base/tests/voip/src/mediatek/net/rtp/cts/AudioGroupTest.java
deleted file mode 100755
index 899f49ec938b5202f5dc4fdbec12362be852ac1b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/voip/src/mediatek/net/rtp/cts/AudioGroupTest.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package mediatek.net.rtp.cts;
-
-import android.content.Context;
-import android.media.AudioManager;
-import android.net.rtp.AudioCodec;
-import android.net.rtp.AudioGroup;
-import android.net.rtp.AudioStream;
-import android.net.rtp.RtpStream;
-import android.test.AndroidTestCase;
-
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-
-public class AudioGroupTest extends AndroidTestCase {
-
-    private static final String TAG = AudioGroupTest.class.getSimpleName();
-
-    private AudioManager mAudioManager;
-
-    private AudioStream mStreamA;
-    private DatagramSocket mSocketA;
-    private AudioStream mStreamB;
-    private DatagramSocket mSocketB;
-    private AudioGroup mGroup;
-
-    @Override
-    public void setUp() throws Exception {
-        mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
-        mAudioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
-
-        InetAddress local = InetAddress.getByName("::1");
-
-        mStreamA = new AudioStream(local);
-        mStreamA.setMode(RtpStream.MODE_NORMAL);
-        mStreamA.setCodec(AudioCodec.PCMU);
-        mSocketA = new DatagramSocket();
-        mSocketA.connect(mStreamA.getLocalAddress(), mStreamA.getLocalPort());
-        mStreamA.associate(mSocketA.getLocalAddress(), mSocketA.getLocalPort());
-
-        mStreamB = new AudioStream(local);
-        mStreamB.setMode(RtpStream.MODE_NORMAL);
-        mStreamB.setCodec(AudioCodec.PCMU);
-        mSocketB = new DatagramSocket();
-        mSocketB.connect(mStreamB.getLocalAddress(), mStreamB.getLocalPort());
-        mStreamB.associate(mSocketB.getLocalAddress(), mSocketB.getLocalPort());
-
-        mGroup = new AudioGroup();
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        mGroup.clear();
-        mStreamA.release();
-        mSocketA.close();
-        mStreamB.release();
-        mSocketB.close();
-        mAudioManager.setMode(AudioManager.MODE_NORMAL);
-    }
-
-    private void assertPacket(DatagramSocket socket, int length) throws Exception {
-        DatagramPacket packet = new DatagramPacket(new byte[length + 1], length + 1);
-        socket.setSoTimeout(3000);
-        socket.receive(packet);
-        assertEquals(packet.getLength(), length);
-    }
-
-    private void drain(DatagramSocket socket) throws Exception {
-        DatagramPacket packet = new DatagramPacket(new byte[1], 1);
-        socket.setSoTimeout(1);
-        try {
-            // Drain the socket by retrieving all the packets queued on it.
-            // A SocketTimeoutException will be thrown when it becomes empty.
-            while (true) {
-                socket.receive(packet);
-            }
-        } catch (Exception e) {
-            // ignore.
-        }
-    }
-
-    public void testTraffic() throws Exception {
-        mStreamA.join(mGroup);
-        assertPacket(mSocketA, 12 + 160);
-
-        mStreamB.join(mGroup);
-        assertPacket(mSocketB, 12 + 160);
-
-        mStreamA.join(null);
-        drain(mSocketA);
-
-        drain(mSocketB);
-        assertPacket(mSocketB, 12 + 160);
-
-        mStreamA.join(mGroup);
-        assertPacket(mSocketA, 12 + 160);
-    }
-
-    public void testSetMode() throws Exception {
-        mGroup.setMode(AudioGroup.MODE_NORMAL);
-        assertEquals(mGroup.getMode(), AudioGroup.MODE_NORMAL);
-
-        mGroup.setMode(AudioGroup.MODE_MUTED);
-        assertEquals(mGroup.getMode(), AudioGroup.MODE_MUTED);
-
-        mStreamA.join(mGroup);
-        mStreamB.join(mGroup);
-
-        mGroup.setMode(AudioGroup.MODE_NORMAL);
-        assertEquals(mGroup.getMode(), AudioGroup.MODE_NORMAL);
-
-        mGroup.setMode(AudioGroup.MODE_MUTED);
-        assertEquals(mGroup.getMode(), AudioGroup.MODE_MUTED);
-    }
-
-    public void testAdd() throws Exception {
-        mStreamA.join(mGroup);
-        assertEquals(mGroup.getStreams().length, 1);
-
-        mStreamB.join(mGroup);
-        assertEquals(mGroup.getStreams().length, 2);
-
-        mStreamA.join(mGroup);
-        assertEquals(mGroup.getStreams().length, 2);
-    }
-
-    public void testRemove() throws Exception {
-        mStreamA.join(mGroup);
-        assertEquals(mGroup.getStreams().length, 1);
-
-        mStreamA.join(null);
-        assertEquals(mGroup.getStreams().length, 0);
-
-        mStreamA.join(mGroup);
-        assertEquals(mGroup.getStreams().length, 1);
-    }
-
-    public void testClear() throws Exception {
-        mStreamA.join(mGroup);
-        mStreamB.join(mGroup);
-        mGroup.clear();
-
-        assertEquals(mGroup.getStreams().length, 0);
-        assertFalse(mStreamA.isBusy());
-        assertFalse(mStreamB.isBusy());
-    }
-
-    public void testDoubleClear() throws Exception {
-        mStreamA.join(mGroup);
-        mStreamB.join(mGroup);
-        mGroup.clear();
-        mGroup.clear();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/voip/src/mediatek/net/rtp/cts/AudioStreamTest.java b/proprietary/frameworks/base/tests/voip/src/mediatek/net/rtp/cts/AudioStreamTest.java
deleted file mode 100755
index c446ff030719d71e687f7678f4f7e9fd0292e04b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/voip/src/mediatek/net/rtp/cts/AudioStreamTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package mediatek.net.rtp.cts;
-
-import android.net.rtp.AudioCodec;
-import android.net.rtp.AudioStream;
-import android.test.AndroidTestCase;
-
-import java.net.InetAddress;
-
-public class AudioStreamTest extends AndroidTestCase {
-
-    private void testRtpStream(InetAddress address) throws Exception {
-        AudioStream stream = new AudioStream(address);
-        assertEquals(stream.getLocalAddress(), address);
-        assertEquals(stream.getLocalPort() % 2, 0);
-
-        assertNull(stream.getRemoteAddress());
-        assertEquals(stream.getRemotePort(), -1);
-        stream.associate(address, 1000);
-        assertEquals(stream.getRemoteAddress(), address);
-        assertEquals(stream.getRemotePort(), 1000);
-
-        assertFalse(stream.isBusy());
-        stream.release();
-    }
-
-    public void testV4Stream() throws Exception {
-        testRtpStream(InetAddress.getByName("127.0.0.1"));
-    }
-
-    public void testV6Stream() throws Exception {
-        testRtpStream(InetAddress.getByName("::1"));
-    }
-
-    public void testSetDtmfType() throws Exception {
-        AudioStream stream = new AudioStream(InetAddress.getByName("::1"));
-
-        assertEquals(stream.getDtmfType(), -1);
-        try {
-            stream.setDtmfType(0);
-            fail("Expecting IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            // ignore
-        }
-        stream.setDtmfType(96);
-        assertEquals(stream.getDtmfType(), 96);
-
-        stream.setCodec(AudioCodec.getCodec(97, "PCMU/8000", null));
-        try {
-            stream.setDtmfType(97);
-            fail("Expecting IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            // ignore
-        }
-        stream.release();
-    }
-
-    public void testSetCodec() throws Exception {
-        AudioStream stream = new AudioStream(InetAddress.getByName("::1"));
-
-        assertNull(stream.getCodec());
-        stream.setCodec(AudioCodec.getCodec(97, "PCMU/8000", null));
-        assertNotNull(stream.getCodec());
-
-        stream.setDtmfType(96);
-        try {
-            stream.setCodec(AudioCodec.getCodec(96, "PCMU/8000", null));
-            fail("Expecting IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            // ignore
-        }
-        stream.release();
-    }
-
-    public void testDoubleRelease() throws Exception {
-        AudioStream stream = new AudioStream(InetAddress.getByName("::1"));
-        stream.release();
-        stream.release();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/wfd/Android.mk b/proprietary/frameworks/base/tests/wfd/Android.mk
deleted file mode 100755
index 196f6b9e57bf9dc5f0a3eaf244c46917809ed7e3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wfd/Android.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := tests
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner wifi-service
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MediaTekWifidisplayTestCases
-LOCAL_CERTIFICATE := platform
-
-# uncomment when dalvik.annotation.Test* are removed or part of SDK
-#LOCAL_SDK_VERSION := current
-
-include $(BUILD_PACKAGE)
-
-# Build the test APK using its own makefile, and any other CTS-related packages
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
diff --git a/proprietary/frameworks/base/tests/wfd/Android.mk_ b/proprietary/frameworks/base/tests/wfd/Android.mk_
deleted file mode 100755
index 196f6b9e57bf9dc5f0a3eaf244c46917809ed7e3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wfd/Android.mk_
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := tests
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner wifi-service
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MediaTekWifidisplayTestCases
-LOCAL_CERTIFICATE := platform
-
-# uncomment when dalvik.annotation.Test* are removed or part of SDK
-#LOCAL_SDK_VERSION := current
-
-include $(BUILD_PACKAGE)
-
-# Build the test APK using its own makefile, and any other CTS-related packages
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
diff --git a/proprietary/frameworks/base/tests/wfd/AndroidManifest.xml b/proprietary/frameworks/base/tests/wfd/AndroidManifest.xml
deleted file mode 100755
index 1e98a1f65cc561e0147d201e8d5a5d0b4d88f8df..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wfd/AndroidManifest.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mediatek.net.wfd"
-    coreApp="true">
-
-    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.CONFIGURE_WIFI_DISPLAY" />
-    <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL"/>
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.mediatek.net.wfd"
-                     android:label="Mediatek tests of hardware.display.WifiDisplay"/>
-
-</manifest>
-
diff --git a/proprietary/frameworks/base/tests/wfd/NOTICE b/proprietary/frameworks/base/tests/wfd/NOTICE
deleted file mode 100755
index 50fa6a12f1ee322a8a4257c1a53991706490551e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wfd/NOTICE
+++ /dev/null
@@ -1,21 +0,0 @@
- * Copyright (C) 2008 The Android Open Source Project:
-
-
-
-/*
-* Copyright (C) 2011-2014 MediaTek Inc.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-:
diff --git a/proprietary/frameworks/base/tests/wfd/README b/proprietary/frameworks/base/tests/wfd/README
deleted file mode 100755
index 9926c71cc41b336b51cc4517c4db831616903e28..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wfd/README
+++ /dev/null
@@ -1,22 +0,0 @@
-WiFi display auto unit test program, including completely WiFi display
- feature test cases. 
-
-This should be built separately for test propose.
-
-
-WHAT IT DOES?
-=============
-MediaTekWifidisplayTestCases.apk contains WiFi display related unit test cases.
-This program helps developer to maintain WiFi display feature.
-
-
-HOW IT WAS BUILT?
-==================
-Use AOPS mmm command with this folder path to build the apk file.
-
-HOW TO USE IT?
-==============
-Install the apk file via adb install command.
-Run adb am instrumentation command to execute the unit test.
-
-All the source code of this program were written by MediaTek co..
diff --git a/proprietary/frameworks/base/tests/wfd/src/mediatek/net/wfd/WifidisplayFwkTest.java b/proprietary/frameworks/base/tests/wfd/src/mediatek/net/wfd/WifidisplayFwkTest.java
deleted file mode 100755
index d9797266e1502f3f15544f19a3855ef2b59e1875..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wfd/src/mediatek/net/wfd/WifidisplayFwkTest.java
+++ /dev/null
@@ -1,419 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package mediatek.net.wfd;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.hardware.display.DisplayManager;
-import android.hardware.display.WifiDisplay;
-import android.hardware.display.WifiDisplayStatus;
-import android.net.wifi.WifiManager;
-import android.net.wifi.p2p.*;
-import android.provider.Settings;
-import android.test.AndroidTestCase;
-import android.util.Log;
-import android.os.Messenger;
-import android.os.Message;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.SystemProperties;
-
-import com.android.server.wifi.WifiMonitor;
-import com.mediatek.hdmi.IMtkHdmiManager;
-
-
-
-public class WifidisplayFwkTest extends AndroidTestCase {
-    private static final String TAG = "WifidisplayFwkTest";
-
-    private static class MySync {
-        int expectedState = STATE_NULL;
-    }
-
-    private static class MySyncWfd {
-        int expectedWfdState = STATE_NULL;
-    }
-
-    private WifiP2pManager mWifiP2pManager;
-    private WifiManager mWifiManager;
-    //for wifi enable/disable only
-    private static MySync mMySync;
-    private static MySyncWfd mMySyncWfd;
-
-    private IntentFilter mIntentFilter;
-    private WifiP2pManager.Channel mChannel;
-    private Messenger messenger;
-    private WifidisplayFwkTest mWmtThis;
-
-    private DisplayManager mDisplayManager;
-    private WifiDisplayStatus mWifiDisplayStatus;
-    private IMtkHdmiManager mHdmiManager;
-
-    // state enum
-    private static final int STATE_NULL = 0;
-    private static final int STATE_WIFIP2P_CHANGING = 1;
-    private static final int STATE_WIFIP2P_CHANGED = 2;
-    private static final int STATE_DISCOVERING = 3;
-    private static final int STATE_DISCOVER_PEERS_AVAILABLE = 4;
-    private static final int STATE_NOT_GOT_PEERS_INFO = 5;
-    private static final int STATE_GOT_PEERS_INFO = 6;
-    private static final int STATE_STOPPING_DISCOVER = 7;
-    private static final int STATE_DISCOVER_STOPPED = 8;
-
-    private static final int STATE_CONNECT_NULL = 9;
-    private static final int STATE_CONNECTED = 10;
-    private static final int STATE_GOT_CONNECYEDINFO = 11;
-    private static final int STATE_GROUPINFO = 12;
-    private static final int STATE_THIS_CHANGED = 13;
-    private static final int STATE_INVITE_SUCCESS = 14;
-    private static final int STATE_CANCEL_CONNECT_SUCCESS = 15;
-
-    private static final int STATE_CREATING_GROUP = 16;
-    private static final int STATE_CREATE_GROUP_OK = 17;
-    private static final int STATE_REMOVING_GROUP = 18;
-    private static final int STATE_REMOVE_GROUP_OK = 19;
-
-    private static final int STATE_CLEARING_ALL_SERVICE = 20;
-    private static final int STATE_CLEAR_ALL_SERVICE_OK = 21;
-    private static final int STATE_SET_SERVICE_LISTENER_OK = 22;
-    private static final int STATE_SET_DNS_LISTENER_OK = 23;
-    private static final int STATE_SET_UPNP_LISTENER_OK = 24;
-
-    private static final int STATE_REQUESTING = 25;
-    private static final int STATE_REQUEST_PPER_OK = 26;
-    private static final int STATE_REQUEST_CONNECTION_INFO_OK = 27;
-    private static final int STATE_REQUEST_GROUP_INFO_OK = 28;
-
-    private static final int STATE_SETTING_DEV_NAME = 29;
-    private static final int STATE_SET_DEV_NAME_OK = 30;
-
-
-    private static final int TIMEOUT_MSEC = 5000;
-    private static final int WAIT_MSEC = 60;
-    private static final int DURATION = 2000;
-
-    private static final String mWfdPeerString = "P2P-DEVICE-FOUND 99:88:77:66:55:44 p2p_dev_addr=99:88:77:66:55:44 pri_dev_type=8-0050F204-2 name='WFD_DONGLE_KENPING' config_methods=0x188 dev_capab=0x24 group_capab=0x58 wfd_dev_info=0x0111022a0064";
-    private static final String mWfdGroupCreatedString = "P2P-GROUP-STARTED p2p0 client ssid=\"DIRECT-BwWFD_DONGLE_KENPING\" freq=2437 psk=8781123cf06b534bb1ebebd386bc0bea0256e1532048d15ca07f276588353e2b go_dev_addr=99:88:77:66:55:44";
-    //private static final String mGroupCreatedString = "P2P-GROUP-STARTED p2p0 GO ssid=\"DIRECT-vj-B\" freq=2462 passphrase=\"OsCn2cFd\" go_dev_addr=96:db:c9:7c:f5:ee [PERSISTENT]";
-    //private static final String mApStaConnectedString = "AP-STA-DISCONNECTED 96:db:c9:7c:f1:e8";
-
-
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            final String action = intent.getAction();
-
-            if (action.equals(DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED)) {
-                Log.d(TAG, "onReceive(): ACTION_WIFI_DISPLAY_STATUS_CHANGED");
-
-                synchronized (mMySyncWfd) {
-                    //Log.d(TAG, "DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED");
-                    WifiDisplayStatus status = (WifiDisplayStatus) intent.getParcelableExtra(
-                            DisplayManager.EXTRA_WIFI_DISPLAY_STATUS);
-                    mWifiDisplayStatus = status;
-
-                    final WifiDisplay[] displays = mWifiDisplayStatus.getDisplays();
-
-                    for (WifiDisplay d : displays) {
-                        //scan then found!
-                        if (d.isAvailable()) {
-                            Log.d(TAG, "available device is " + d.getFriendlyDisplayName());
-                            if (d.getDeviceAddress().equals("99:88:77:66:55:44")) {
-                                if (STATE_DISCOVERING == mMySyncWfd.expectedWfdState) {
-                                    mMySyncWfd.expectedWfdState = STATE_DISCOVER_PEERS_AVAILABLE;
-                                    mMySyncWfd.notify();
-                                }
-                            }
-                        }
-
-                        //do connect then connected
-                        if (d.isRemembered()) {
-                            Log.d(TAG, "paired device is " + d.getFriendlyDisplayName());
-                            if (d.getDeviceAddress().equals("99:88:77:66:55:44")) {
-                                mMySyncWfd.expectedWfdState = STATE_CONNECTED;
-                                mMySyncWfd.notify();
-                            }
-                        }
-
-                    }
-
-                }
-
-            } // end of DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED
-        }
-    };
-
-    @Override
-    protected void setUp() throws Exception {
-        Log.d(TAG, "setUp()");
-        super.setUp();
-        mWmtThis = this;
-        mMySync = new MySync();
-        mMySyncWfd = new MySyncWfd();
-        mIntentFilter = new IntentFilter();
-
-        mIntentFilter.addAction(DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED);
-
-        mContext.registerReceiver(mReceiver, mIntentFilter);
-        mWifiP2pManager = (WifiP2pManager) getContext().getSystemService(Context.WIFI_P2P_SERVICE);
-        mWifiManager = (WifiManager) getContext().getSystemService(Context.WIFI_SERVICE);
-        mDisplayManager = (DisplayManager) getContext().getSystemService(Context.DISPLAY_SERVICE);
-        mHdmiManager = IMtkHdmiManager.Stub.asInterface(ServiceManager.getService(Context.HDMI_SERVICE));
-
-
-        messenger = mWifiP2pManager.getP2pStateMachineMessenger();
-        assertNotNull("Failed to get WiFi P2P service!", mWifiP2pManager);
-        assertNotNull("Failed to get WiFi service!", mWifiP2pManager);
-        mChannel = mWifiP2pManager.initializeInternal(mContext, mContext.getMainLooper(), null);
-        assertNotNull("Failed to get wifi p2p channel!", mChannel);
-        if (!mWifiManager.isWifiEnabled()) {
-            Log.d(TAG, "setWifiEnabled(): true");
-            setWifiEnabled(true);
-            Thread.sleep(DURATION);
-        }
-        assertTrue(mWifiManager.isWifiEnabled());
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        Log.d(TAG, "tearDown()");
-        mContext.unregisterReceiver(mReceiver);
-        if (mWifiManager.isWifiEnabled()) {
-            Log.d(TAG, "setWifiEnabled(): false");
-            setWifiEnabled(false);
-            Thread.sleep(DURATION);
-        }
-        super.tearDown();
-    }
-
-
-    private void setWifiEnabled(boolean enable) throws Exception {
-        if (enable == true) {
-            synchronized (mMySync) {
-                mMySync.expectedState = STATE_WIFIP2P_CHANGING;
-                assertTrue(mWifiManager.setWifiEnabled(enable));
-                long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-                while (System.currentTimeMillis() < timeout
-                        && mMySync.expectedState == STATE_WIFIP2P_CHANGING)
-                    mMySync.wait(WAIT_MSEC);
-            }
-        }
-        else {
-            synchronized (mMySync) {
-                mMySync.expectedState = STATE_WIFIP2P_CHANGING;
-                assertTrue(mWifiManager.setWifiEnabled(enable));
-                long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-                while (System.currentTimeMillis() < timeout
-                        && mMySync.expectedState == STATE_WIFIP2P_CHANGING)
-                    mMySync.wait(WAIT_MSEC);
-            }
-        }
-
-    }
-
-    private void sendMessage(int what, Object obj) {
-        Message msg = Message.obtain();
-        msg.what = what;
-        msg.obj = obj;
-        assertNotNull("Failed to Messenger!", messenger);
-        try {
-            messenger.send(msg);
-        } catch (RemoteException e) {
-            Log.e(TAG, "Send message error:" + e);
-        }
-
-    }
-
-    private void startWfdSearch()throws Exception {
-        Log.d(TAG, "startWfdSearch()");
-        synchronized (mMySyncWfd) {
-            mMySyncWfd.expectedWfdState = STATE_DISCOVERING;
-            mDisplayManager.startWifiDisplayScan();
-
-            createPeer(mWfdPeerString);
-            long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-            while (System.currentTimeMillis() < timeout
-                    && mMySyncWfd.expectedWfdState == STATE_DISCOVERING)
-                mMySyncWfd.wait(WAIT_MSEC);
-        }
-    }
-
-    private void createPeer(String peerStr) {
-        WifiP2pDevice peer = new WifiP2pDevice(peerStr);
-        sendMessage(WifiMonitor.P2P_DEVICE_FOUND_EVENT, peer);
-
-    }
-
-    private void connectWfdPeer()throws Exception {
-        Log.d(TAG, "connectWfdPeer()");
-        synchronized (mMySyncWfd) {
-            mMySyncWfd.expectedWfdState = STATE_CONNECT_NULL;
-
-            mDisplayManager.connectWifiDisplay("99:88:77:66:55:44");
-            Log.d(TAG, "dongle MAC is " + "99:88:77:66:55:44");
-
-            long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-            while (System.currentTimeMillis() < timeout
-                    && mMySyncWfd.expectedWfdState == STATE_CONNECT_NULL) {
-                mMySyncWfd.wait(DURATION);
-                //do fake Connected
-                Log.e(TAG, "do fake Connected");
-                mMySyncWfd.expectedWfdState = STATE_CONNECTED;
-            }
-        }
-    }
-
-    private void connectWfdPeerDone()throws Exception {
-        //disconnect when this case is done
-        mDisplayManager.disconnectWifiDisplay();
-    }
-
-    private void disConnectWfdPeer()throws Exception {
-        Log.d(TAG, "disConnectWfdPeer()");
-        synchronized (mMySyncWfd) {
-            mMySyncWfd.expectedWfdState = STATE_CONNECTED;
-
-            mDisplayManager.disconnectWifiDisplay();
-
-            long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-            while (System.currentTimeMillis() < timeout
-                    && mMySyncWfd.expectedWfdState == STATE_CONNECTED) {
-                mMySyncWfd.wait(DURATION);
-                //do fake DisConnected
-                Log.e(TAG, "do fake DisConnected");
-                mMySyncWfd.expectedWfdState = STATE_CONNECT_NULL;
-            }
-        }
-
-    }
-
-//=======================================================
-//==========TEST CASE START==============================
-//=======================================================
-
-    public void test001Enable() throws Exception {
-        Log.d(TAG, "test001Enable()");
-        mMySyncWfd.expectedWfdState = STATE_NULL;
-
-        //enable wfd
-        enableWfd();
-        assertTrue("Enable failed",
-            WifiDisplayStatus.FEATURE_STATE_ON == mDisplayManager.getWifiDisplayStatus().getFeatureState());
-    }
-
-    public void test002Search() throws Exception {
-        Log.d(TAG, "test002Search()");
-        mMySyncWfd.expectedWfdState = STATE_NULL;
-
-        //enable wfd
-        enableWfd();
-
-        //search and get peers
-        assertNotNull("mDisplayManager is null!", mDisplayManager);
-        startWfdSearch();
-
-        assertTrue("Search failed", mMySyncWfd.expectedWfdState == STATE_DISCOVER_PEERS_AVAILABLE);
-    }
-
-    public void test003Connect() throws Exception {
-        Log.d(TAG, "test003Connect()");
-        mMySyncWfd.expectedWfdState = STATE_NULL;
-
-        //enable wfd
-        enableWfd();
-
-        //search and get peers
-        //assertNotNull("mDisplayManager is null!", mDisplayManager);
-        //startWfdSearch();
-        //Log.d(TAG, "mMySyncWfd.expectedWfdState:" + mMySyncWfd.expectedWfdState);
-
-        //connect peer
-        connectWfdPeer();
-        Log.d(TAG, "expectedWfdState is " + mMySyncWfd.expectedWfdState);
-
-        assertTrue("Timeout, failed to connect peers", mMySyncWfd.expectedWfdState == STATE_CONNECTED);
-        connectWfdPeerDone();
-    }
-
-    public void test004DisConnect() throws Exception {
-        Log.d(TAG, "test004DisConnect()");
-        mMySyncWfd.expectedWfdState = STATE_NULL;
-
-        //enable wfd
-        enableWfd();
-
-        //search and get peers
-        //assertNotNull("mDisplayManager is null!", mDisplayManager);
-        //startWfdSearch();
-
-        //connect peer
-        connectWfdPeer();
-        Log.d(TAG, "after connectWfdPeer(), expectedWfdState is " + mMySyncWfd.expectedWfdState);
-        assertTrue("Timeout, failed to connect peers", mMySyncWfd.expectedWfdState == STATE_CONNECTED);
-
-        //disconnect peer
-        disConnectWfdPeer();
-        Log.d(TAG, "after disConnectWfdPeer(), expectedWfdState is " + mMySyncWfd.expectedWfdState);
-        assertTrue("Timeout, failed to disconnect peers", mMySyncWfd.expectedWfdState == STATE_CONNECT_NULL);
-    }
-
-    public void test005Disable() throws Exception {
-        Log.d(TAG, "test005Disable()");
-        mMySyncWfd.expectedWfdState = STATE_NULL;
-
-        //enable wfd
-        enableWfd();
-
-        //disable wfd
-        if (WifiDisplayStatus.FEATURE_STATE_ON == mDisplayManager.getWifiDisplayStatus().getFeatureState()) {
-            Settings.Global.putInt(mContext.getContentResolver(),
-                    Settings.Global.WIFI_DISPLAY_ON, 0);
-            Thread.sleep(DURATION);
-        }
-        assertTrue("Disable failed",
-            WifiDisplayStatus.FEATURE_STATE_ON != mDisplayManager.getWifiDisplayStatus().getFeatureState());
-    }
-
-    private void enableWfd() throws Exception {
-
-        if (SystemProperties.get("ro.mtk_hdmi_support").equals("1")) {
-            boolean hdmiOn = Settings.System.getInt(mContext.getContentResolver(),
-                Settings.System.HDMI_ENABLE_STATUS, 1) != 0;
-
-            if (hdmiOn) {
-                if (null != mHdmiManager) {
-                    try {
-                        mHdmiManager.enableHdmi(false);
-                    } catch (RemoteException e) {
-                        Log.d(TAG, "hdmi manager RemoteException: " + e.getMessage());
-                    }
-                }
-            }
-        }
-
-        //enable wfd
-        if (WifiDisplayStatus.FEATURE_STATE_ON != mDisplayManager.getWifiDisplayStatus().getFeatureState()) {
-            Settings.Global.putInt(mContext.getContentResolver(),
-                    Settings.Global.WIFI_DISPLAY_ON, 1);
-            Thread.sleep(DURATION);
-        }
-    }
-
-
-} //end of class
-
diff --git a/proprietary/frameworks/base/tests/widget/Android.mk b/proprietary/frameworks/base/tests/widget/Android.mk
deleted file mode 100755
index 6ddfe0db7a395dd8dfb66e93d43e002b5abab72e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-# Include all test java files.
-LOCAL_SRC_FILES := \
-	$(call all-java-files-under, src)
-
-LOCAL_DX_FLAGS := --core-library
-# add "librobotium junit-report" when test zutubi
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 guava littlemock
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_PACKAGE_NAME := CommonWidgetTests
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/frameworks/base/tests/widget/Android.mk_ b/proprietary/frameworks/base/tests/widget/Android.mk_
deleted file mode 100755
index 6ddfe0db7a395dd8dfb66e93d43e002b5abab72e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/Android.mk_
+++ /dev/null
@@ -1,20 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-# Include all test java files.
-LOCAL_SRC_FILES := \
-	$(call all-java-files-under, src)
-
-LOCAL_DX_FLAGS := --core-library
-# add "librobotium junit-report" when test zutubi
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 guava littlemock
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_PACKAGE_NAME := CommonWidgetTests
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/frameworks/base/tests/widget/AndroidManifest.xml b/proprietary/frameworks/base/tests/widget/AndroidManifest.xml
deleted file mode 100755
index 4188962bda419b70dbc963378829ea41f7879012..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/AndroidManifest.xml
+++ /dev/null
@@ -1,1065 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mediatek.common.widget.tests"
-    android:versionCode="1"
-    android:versionName="1.0"
-    android:sharedUserId="com.android.uid.test" >
-
-    <uses-sdk android:minSdkVersion="14" />
-    
-    <uses-permission android:name="android.permission.ACCESS_CACHE_FILESYSTEM" />
-    <uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER" />
-    <uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER_ADVANCED" />
-    <uses-permission android:name="android.permission.DOWNLOAD_CACHE_NON_PURGEABLE" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CLEAR_APP_CACHE" />
-    <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.DOWNLOAD_CACHE_NON_PURGEABLE" />
-    <uses-permission android:name="android.permission.GET_PACKAGE_SIZE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.READ_LOGS"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.READ_SMS"/>
-    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SMS"/>
-    <uses-permission android:name="android.permission.TEST_GRANTED" />
-    <uses-permission android:name="com.google.android.googleapps.permission.ACCESS_GOOGLE_PASSWORD" />
-    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
-    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.ALL_SERVICES" />
-
-    <uses-permission android:name="android.permission.MANAGE_USERS" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
-
-    <uses-permission android:name="android.permission.RECEIVE_SMS"/>
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
-    <uses-permission android:name="android.permission.WRITE_APN_SETTINGS" />
-    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-
-    <!-- location test permissions -->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.HARDWARE_TEST" />
-
-    <!-- package manager test permissions -->
-    <uses-permission android:name="android.permission.INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.DELETE_PACKAGES" />
-    <uses-permission android:name="android.permission.MOVE_PACKAGE" />
-    <uses-permission android:name="android.permission.PACKAGE_VERIFICATION_AGENT" />
-
-    <!--os storage test permissions -->
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
-    <uses-permission android:name="android.permission.ASEC_ACCESS" />
-    <uses-permission android:name="android.permission.ASEC_CREATE" />
-    <uses-permission android:name="android.permission.ASEC_DESTROY" />
-    <uses-permission android:name="android.permission.ASEC_MOUNT_UNMOUNT" />
-    <uses-permission android:name="android.permission.ASEC_RENAME" />
-    <uses-permission android:name="android.permission.SHUTDOWN" />
-
-    <!-- accessibility test permissions -->
-    <uses-permission android:name="android.permission.RETRIEVE_WINDOW_CONTENT" />
-
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.AUTOFOCUS" />
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.INJECT_EVENTS" />
-    <application android:theme="@style/Theme">
-        <uses-library android:name="android.test.runner" />
-        
-        <activity android:name="com.mediatek.common.widget.tests.ActionBarNormalActivity" android:label="ActionBarNormalActivity" android:theme="@android:style/Theme.Holo.Light">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        <activity android:name="com.mediatek.common.widget.tests.ActionBarOrientationChangedActivity" android:label="ActionBarOrientationChangedActivity" android:theme="@android:style/Theme.Holo.Light" android:configChanges="orientation|screenSize">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        <activity android:name="com.mediatek.common.widget.tests.ActionBarActionModeListActivity" android:label="ActionBarActionModeListActivity" android:theme="@android:style/Theme.Holo.Light">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        <activity android:name="com.mediatek.common.widget.tests.ActionBarActionProviderActivity" android:label="ActionBarActionProviderActivity" android:theme="@android:style/Theme.Holo.Light">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        <activity android:name="com.mediatek.common.widget.tests.ActionBarActionViewActivity" android:label="ActionBarActionViewActivity" android:theme="@android:style/Theme.Holo.Light">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        <activity android:name="com.mediatek.common.widget.tests.ActionBarListActivity" android:label="ActionBarListActivity" android:theme="@android:style/Theme.Holo.Light">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        <activity android:name="com.mediatek.common.widget.tests.ActionBarSplitActionBarActivity" android:label="ActionBarSplitActionBarActivity" android:theme="@android:style/Theme.Holo.Light">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        <activity android:name="com.mediatek.common.widget.tests.ActionBarTabActivity" android:label="ActionBarTabActivity" android:theme="@android:style/Theme.Holo.Light">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        <activity android:name="com.mediatek.common.widget.tests.DialogFragmentActivity" android:label="DialogFragmentActivity" android:theme="@android:style/Theme.Holo.Light">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        <activity android:name="com.mediatek.common.widget.tests.PreferenceFragmentActivity" android:label="PreferenceFragmentActivity" android:theme="@android:style/Theme.Holo.Light">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        <activity android:name="com.mediatek.common.widget.tests.SetPreferenceActivity" android:label="SetPreferenceActivity" android:theme="@android:style/Theme.Holo.Light">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        <activity android:name="com.mediatek.common.widget.tests.SharedActivity" android:label="SharedActivity" android:theme="@android:style/Theme.Holo.Light">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        <activity android:name="com.mediatek.common.widget.tests.SurfaceViewActivity" android:label="SurfaceViewActivity" android:theme="@android:style/Theme.Holo.Light">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        <activity android:name="com.mediatek.common.widget.tests.TextureViewActivity" android:label="TextureViewActivity" android:theme="@android:style/Theme.Holo.Light">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        <activity android:name="com.mediatek.common.widget.tests.GestureDetectorActivity" android:label="GestureDetectorActivity" android:theme="@android:style/Theme.Holo.Light">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        <activity android:name="com.mediatek.common.widget.tests.ScaleGestureDetectorActivity" android:label="ScaleGestureDetectorActivity" android:theme="@android:style/Theme.Holo.Light">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        <activity android:name="com.mediatek.common.widget.tests.VolumePanelActivity" android:label="VolumePanelActivity" android:theme="@android:style/Theme.Holo.Light">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        
-        
-        
-        <activity android:name="com.mediatek.common.widget.tests.ProgressBarActivity" android:label="ProgressBarActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.NumberPickerActivity" android:label="NumberPickerActivity" android:theme="@android:style/Theme.Holo.Light">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.DatePickerDialogActivity" android:theme="@android:style/Theme.Holo.Light">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.TimePickerDialogActivity" android:theme="@android:style/Theme.Holo.Light">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.focus.DescendantFocusability" android:label="DescendantFocusability">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.focus.FocusAfterRemoval" android:label="FocusAfterRemoval">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.focus.RequestFocus" android:label="RequestFocus">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.focus.ListOfButtons" android:label="ListOfButtons">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.focus.LinearLayoutGrid" android:label="LinearLayoutGrid">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.focus.ListOfEditTexts" android:label="ListOfEditTexts">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.focus.ListOfInternalSelectionViews" android:label="ListOfInternalSelectionViews">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.focus.ListWithFooterViewAndNewLabels" android:label="FocusListWithFooter">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.focus.ListWithMailMessages" android:label="ListWithMailMessages">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.focus.HorizontalFocusSearch" android:label="HorizontalFocusSearch">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.focus.VerticalFocusSearch" android:label="VerticalFocusSearch">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.focus.AdjacentVerticalRectLists" android:label="AdjacentVerticalRectLists">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.focus.GoneParentFocusedChild" android:label="GoneParentFocusedChild">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.layout.frame.FrameLayoutGravity" android:label="FrameLayoutGravity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.layout.frame.FrameLayoutMargin" android:label="FrameLayoutMargin">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.layout.linear.BaselineAlignmentCenterGravity" android:label="BaselineAlignmentCenterGravity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.layout.linear.BaselineButtons" android:label="BaselineButtons">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        <activity android:name="com.mediatek.common.widget.tests.layout.linear.ExceptionTextView" android:label="ExceptionTextView">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.layout.linear.FillInWrap" android:label="FillInWrap">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.layout.linear.BaselineAlignmentZeroWidthAndWeight" android:label="Baseline0WidthAndWeight">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.layout.linear.HorizontalOrientationVerticalAlignment" android:label="HorizontalOrientationVerticalAlignment">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.layout.linear.LLEditTextThenButton" android:label="LLEditTextThenButton">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.layout.linear.LLOfButtons1" android:label="LLOfButtons1">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.layout.linear.LinearLayoutEditTexts" android:label="LinearLayoutEditTexts">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.layout.linear.LLOfButtons2" android:label="LLOfButtons2">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.layout.linear.LLOfTwoFocusableInTouchMode" android:label="LLOfTwoFocusableInTouchMode">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.layout.linear.Weight" android:label="Weight">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.layout.linear.WeightSum" android:label="WeightSum">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.AdjacentListsWithAdjacentISVsInside" android:label="AdjacentListsWithAdjacentISVsInside">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListDividers" android:label="ListDividers">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListViewHeight" android:label="ListViewHeight">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.layout.table.FixedWidth" android:label="CellFixedWidth">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.layout.table.Weight" android:label="CellWeight">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.layout.table.HorizontalGravity" android:label="CellHorizontalGravity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.layout.table.VerticalGravity" android:label="CellVerticalGravity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.layout.table.AddColumn" android:label="AddColumnInTable">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.layout.table.CellSpan" android:label="CellSpan">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.scroll.ButtonAboveTallInternalSelectionView" android:label="ButtonAboveTallInternalSelectionView">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.scroll.ButtonsWithTallTextViewInBetween" android:label="scrollButtonsWithTallTextViewInBetween">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.scroll.RequestRectangleVisible" android:label="ScrollToChildRect">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.scroll.RequestRectangleVisibleWithInternalScroll" android:label="ScrollToChildRectWithInternalScroll">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.scroll.ScrollViewButtonsAndLabels" android:label="ScrollViewButtonsAndLabels">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.scroll.ShortButtons" android:label="scrollShortButtons">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.scroll.TallTextAboveButton" android:label="scrollTallTextAboveButton">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.scroll.arrowscroll.MultiPageTextWithPadding" android:label="arrowscrollMultiPageTextWithPadding">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        
-        
-        
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListSetSelection" android:label="ListSetSelection">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListSimple" android:label="ListSimple">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListFilter" android:label="ListFilter">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListScrollListener" android:label="ListScrollListener">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListThrasher" android:label="ListThrasher">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListTakeFocusFromSide" android:label="ListTakeFocusFromSide">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListBottomGravity" android:label="ListBottomGravity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListBottomGravityMany" android:label="ListBottomGravityMany">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListButtonsDiagonalAcrossItems" android:label="ListButtonsDiagonalAcrossItems">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListTopGravity" android:label="ListTopGravity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListTopGravityMany" android:label="ListTopGravityMany">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListEndingWithMultipleSeparators" android:label="ListEndingWithMultipleSeparators">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListGetSelectedView" android:label="ListGetSelectedView">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListInHorizontal" android:label="ListInHorizontal">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListInVertical" android:label="ListInVertical">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListInterleaveFocusables" android:label="ListInterleaveFocusables">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-             <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-         </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListOfItemsShorterThanScreen" android:label="ListOfItemsShorterThanScreen">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListOfItemsTallerThanScreen" android:label="ListOfItemsTallerThanScreen">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListOfThinItems" android:label="ListOfThinItems">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListOfShortTallShort" android:label="ListOfShortTallShort">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListOfShortShortTallShortShort" android:label="ListOfShortShortTallShortShort">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListWithOffScreenNextSelectable" android:label="ListWithOffScreenNextSelectable">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListWithFirstScreenUnSelectable" android:label="ListWithFirstScreenUnSelectable">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListWithSeparators" android:label="ListWithSeparators">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListWithHeaders" android:label="ListWithHeaders">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListWithEditTextHeader" android:label="ListWithEditTextHeader">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListWithNoFadingEdge" android:label="ListWithNoFadingEdge">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListWithScreenOfNoSelectables" android:label="ListWithScreenOfNoSelectables">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListItemFocusablesFarApart" android:label="ListItemFocusablesFarApart">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListItemFocusableAboveUnfocusable" android:label="ListItemFocusableAboveUnfocusable">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListItemFocusablesClose" android:label="ListItemFocusablesClose">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListLastItemPartiallyVisible" android:label="ListLastItemPartiallyVisible">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListItemsExpandOnSelection" android:label="ListItemsExpandOnSelection">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListWithOnItemSelectedAction" android:label="ListWithOnItemSelectedAction">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListItemISVAndButton" android:label="ListItemISVAndButton">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListOfTouchables" android:label="ListOfTouchables">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListRecyclerProfiling" android:label="ListRecyclerProfiling">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListHeterogeneous" android:label="ListHeterogeneous">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListHorizontalFocusWithinItemWins" android:label="ListHorizontalFocusWithinItemWins">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-	    <activity android:name="com.mediatek.common.widget.tests.listview.ListManagedCursor" android:label="ListManagedCursor">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-	    <activity android:name="com.mediatek.common.widget.tests.listview.ListWithEmptyView" android:label="ListWithEmptyView">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.gridview.GridInHorizontal" android:label="GridInHorizontal">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.gridview.GridPadding" android:label="GridPadding">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.gridview.GridInVertical" android:label="GridInVertical">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.gridview.GridScrollListener" android:label="GridScrollListener">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-         <activity android:name="com.mediatek.common.widget.tests.gridview.GridThrasher" android:label="GridThrasher">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.gridview.GridSimple" android:label="GridSimple">
-           <intent-filter>
-               <action android:name="android.intent.action.MAIN" />
-               <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-           </intent-filter>
-       </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.gridview.GridDelete" android:label="GridDelete">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-         <activity android:name="com.mediatek.common.widget.tests.gridview.GridSetSelection" android:label="GridSetSelection">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.gridview.GridSetSelectionMany" android:label="GridSetSelectionMany">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.gridview.GridSetSelectionStackFromBottom" android:label="GridSetSelectionStackFromBottom">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.gridview.GridSetSelectionStackFromBottomMany" android:label="GridSetSelectionStackFromBottomMany">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.gridview.GridStackFromBottom" android:label="GridStackFromBottom">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.gridview.GridStackFromBottomMany" android:label="GridStackFromBottomMany">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.gridview.GridVerticalSpacing" android:label="GridVerticalSpacing">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.gridview.GridVerticalSpacingStackFromBottom" android:label="GridVerticalSpacingStackFromBottom">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.gridview.GridSingleColumn" android:label="GridSingleColumn">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        
-        
-        
-        <activity android:name="com.mediatek.common.widget.tests.expandablelistview.ExpandableListWithHeaders" android:label="ExpandableListWithHeaders">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.listview.ListWithDisappearingItemBug" android:label="ListWithDisappearingItemBug">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        
-        
-        
-        <activity android:name="com.mediatek.common.widget.tests.expandablelistview.InflatedExpandableListView" android:label="ExpandableListView Inflated">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.expandablelistview.ExpandableListSimple" android:label="ExpandableListSimple">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        
-        
-        
-        <activity android:name="com.mediatek.common.widget.tests.AutoCompleteTextViewSimple"
-                  android:label="AutoCompleteTextViewSimple">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        
-        
-        
-        <activity android:name="com.mediatek.common.widget.tests.RadioGroupActivity" android:label="RadioGroupActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.mediatek.common.widget.tests.TextViewTestActivity" android:label="TextViewTestActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-        
-        
-        
-        /// M: [ALPS00428138] add new activities for scrollable widget testing @{ 
-        <activity android:name="com.mediatek.common.widget.tests.SpinnerOnGlobalLayout" android:label="SpinnerOnGlobalLayout"
-                  android:configChanges="keyboardHidden|orientation|screenSize">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>       
-        
-         <activity android:name="com.mediatek.common.widget.tests.listview.ListWithFastScroller" android:label="ListWithFastScroller">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-         <activity android:name="com.mediatek.common.widget.tests.StackViewActivity" android:label="StackViewActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        
-         <activity android:name="com.mediatek.common.widget.tests.scroll.HorizontalScrollViewActivity" android:label="HorizontalScrollViewActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
-        /// @}
-        
-    </application>
-    
-    <instrumentation android:name="com.zutubi.android.junitreport.JUnitReportTestRunner"
-            android:targetPackage="com.mediatek.common.widget.tests"
-            android:label="Common Widget Tests" />
-    
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
-                        android:targetPackage="com.mediatek.common.widget.tests"
-            android:label="Common Widget Tests" />
-
-</manifest>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/widget/NOTICE b/proprietary/frameworks/base/tests/widget/NOTICE
deleted file mode 100755
index 8202b125c04bad09c94fbdef40e37ef9ace6dde2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/NOTICE
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- Copyright (C) 2006 The Android Open Source Project:
-<!-- Copyright (C) 2007 The Android Open Source Project:
-<!-- Copyright (C) 2008 The Android Open Source Project:
-<!-- Copyright (C) 2009 The Android Open Source Project:
-** Copyright 2007, The Android Open Source Project:
-** Copyright 2008, The Android Open Source Project:
-* Copyright (C) 2006 The Android Open Source Project:
-* Copyright (C) 2007 The Android Open Source Project:
-* Copyright (C) 2008 The Android Open Source Project:
-* Copyright (C) 2008 Google Inc.:
-* Copyright (C) 2010 The Android Open Source Project:
-* Copyright (C) 2011 The Android Open Source Project:
-* Copyright (C) 2011 Sony Ericsson Mobile Communications AB.:
-
-
-
-/*
-* Copyright (C) 2011-2014 MediaTek Inc.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-:
- 
diff --git a/proprietary/frameworks/base/tests/widget/README b/proprietary/frameworks/base/tests/widget/README
deleted file mode 100755
index 4d872442ab831fead893762de84180eb103dcc63..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/README
+++ /dev/null
@@ -1,27 +0,0 @@
-WHAT IT DOES?
-=============
-This test package is used to test Android widgets. It's based on Android's
-widget test cases with additional test cases developed by MediaTek.
-
-
-HOW IT WAS BUILT?
-==================
-$ mmm vendor/mediatek/proprietary/frameworks/base/tests/widget
-
-
-HOW TO USE IT?
-==============
-After installing this test package, run the test cases by using ADB.
-
-To run all of the test cases in this test package, execute:
-
-$ adb shell am instrument -w com.mediatek.common.widget.tests/android.test.InstrumentationTestRunner
-
-To run all of the test cases in the class ActionBarActionModeListTest, execute:
-
-$ adb shell am instrument --no-window-animation -w -e class com.mediatek.common.widget.tests.ActionBarActionModeListTest com.mediatek.common.widget.tests/android.test.InstrumentationTestRunner
-
-For more information about how to run test cases by using ADB, please refer to 
-
-http://developer.android.com/tools/testing/testing_otheride.html#RunTestsCommand
-
diff --git a/proprietary/frameworks/base/tests/widget/res/anim/push_left_in.xml b/proprietary/frameworks/base/tests/widget/res/anim/push_left_in.xml
deleted file mode 100755
index 5fe2879ac0a4d00629f70a93f192c921c9501e9b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/anim/push_left_in.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>  
-<set xmlns:android="http://schemas.android.com/apk/res/android">  
-    <translate android:fromXDelta="-100%p"   
-               android:toXDelta="0"   
-               android:duration="1000"/>  
-    <alpha android:fromAlpha="0.0" android:toAlpha="1.0" android:duration="100" />  
-</set>  
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/widget/res/anim/push_left_out.xml b/proprietary/frameworks/base/tests/widget/res/anim/push_left_out.xml
deleted file mode 100755
index 81163d54f4a4a9909161c60509632c545277bd76..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/anim/push_left_out.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>  
-<set xmlns:android="http://schemas.android.com/apk/res/android">  
-    <translate android:fromXDelta="0" android:toXDelta="-100%p"  
-        android:duration="1000" />  
-    <alpha android:fromAlpha="1.0" android:toAlpha="1.0"  
-        android:duration="400" />  
-</set>  
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/widget/res/anim/push_right_in.xml b/proprietary/frameworks/base/tests/widget/res/anim/push_right_in.xml
deleted file mode 100755
index bebb02270208c3b15ecfe313e6a50c6fe9d9fab4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/anim/push_right_in.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>  
-<set xmlns:android="http://schemas.android.com/apk/res/android">  
-    <translate android:fromXDelta="100%p"   
-               android:toXDelta="0"   
-               android:duration="1000"/>  
-    <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="400" />  
-</set>  
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/widget/res/anim/push_right_out.xml b/proprietary/frameworks/base/tests/widget/res/anim/push_right_out.xml
deleted file mode 100755
index 777597a54387d50031c8703b5fd246624ed6d1da..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/anim/push_right_out.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>  
-<set xmlns:android="http://schemas.android.com/apk/res/android">  
-    <translate android:fromXDelta="0"   
-               android:toXDelta="100%p"   
-               android:duration="1000"/>  
-    <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="400" />  
-</set>  
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/widget/res/drawable-hdpi/gray.png b/proprietary/frameworks/base/tests/widget/res/drawable-hdpi/gray.png
deleted file mode 100755
index 67de12decbd60613f6716de113daae46dc7d6ff9..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/widget/res/drawable-hdpi/gray.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/widget/res/drawable-hdpi/one.png b/proprietary/frameworks/base/tests/widget/res/drawable-hdpi/one.png
deleted file mode 100755
index a301d5795aaa4bc1d6b829815ca4515f44f4b394..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/widget/res/drawable-hdpi/one.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/widget/res/drawable-hdpi/sym_now_playing_pause_1.png b/proprietary/frameworks/base/tests/widget/res/drawable-hdpi/sym_now_playing_pause_1.png
deleted file mode 100755
index 9edb064cfd326ae36bfcf01d1df756123911ade1..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/widget/res/drawable-hdpi/sym_now_playing_pause_1.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/widget/res/drawable-hdpi/sym_now_playing_skip_backward_1.png b/proprietary/frameworks/base/tests/widget/res/drawable-hdpi/sym_now_playing_skip_backward_1.png
deleted file mode 100755
index c4b6b92eb69c5a5e2b646f66fad2270d2e4b3b8d..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/widget/res/drawable-hdpi/sym_now_playing_skip_backward_1.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/widget/res/drawable-hdpi/sym_now_playing_skip_forward_1.png b/proprietary/frameworks/base/tests/widget/res/drawable-hdpi/sym_now_playing_skip_forward_1.png
deleted file mode 100755
index 03140f54bbaa019237715d29041d8017b4da900b..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/widget/res/drawable-hdpi/sym_now_playing_skip_forward_1.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/widget/res/drawable-hdpi/three.png b/proprietary/frameworks/base/tests/widget/res/drawable-hdpi/three.png
deleted file mode 100755
index 67de12decbd60613f6716de113daae46dc7d6ff9..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/widget/res/drawable-hdpi/three.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/widget/res/drawable-mdpi/sym_now_playing_pause_1.png b/proprietary/frameworks/base/tests/widget/res/drawable-mdpi/sym_now_playing_pause_1.png
deleted file mode 100755
index 2f19d082b689dcf092e104cbe6159abdbecce1b5..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/widget/res/drawable-mdpi/sym_now_playing_pause_1.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/widget/res/drawable-mdpi/sym_now_playing_skip_backward_1.png b/proprietary/frameworks/base/tests/widget/res/drawable-mdpi/sym_now_playing_skip_backward_1.png
deleted file mode 100755
index f945a8190c8d368d94a2fef6ecf4569ec9b8b311..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/widget/res/drawable-mdpi/sym_now_playing_skip_backward_1.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/widget/res/drawable-mdpi/sym_now_playing_skip_forward_1.png b/proprietary/frameworks/base/tests/widget/res/drawable-mdpi/sym_now_playing_skip_forward_1.png
deleted file mode 100755
index da9361a34bd5bf660890c4dc42b733c4a0463be3..0000000000000000000000000000000000000000
Binary files a/proprietary/frameworks/base/tests/widget/res/drawable-mdpi/sym_now_playing_skip_forward_1.png and /dev/null differ
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/acion_mode_list_main.xml b/proprietary/frameworks/base/tests/widget/res/layout/acion_mode_list_main.xml
deleted file mode 100755
index 8f4c7f801f27a60dbec0d8e8a887697e49273c8a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/acion_mode_list_main.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:text="@string/hello_world"
-        tools:context=".MainActivity" />
-
-</RelativeLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/action_bar_display_options_custom.xml b/proprietary/frameworks/base/tests/widget/res/layout/action_bar_display_options_custom.xml
deleted file mode 100755
index d8af4617aedefdf1de5972aec4ecda4924bd0d80..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/action_bar_display_options_custom.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
-        android:text="@string/display_options_custom_button" />
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/action_bar_tab_content.xml b/proprietary/frameworks/base/tests/widget/res/layout/action_bar_tab_content.xml
deleted file mode 100755
index 37289563250273ee70ccf9a5fbbe5a4a9667c83e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/action_bar_tab_content.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/text"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content" />
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/action_bar_tabs.xml b/proprietary/frameworks/base/tests/widget/res/layout/action_bar_tabs.xml
deleted file mode 100755
index 74e93860fbe03decfa8d5515a906fb30a4b2fb2c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/action_bar_tabs.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-    <FrameLayout android:id="@+id/fragment_content"
-	    android:layout_width="match_parent"
-	    android:layout_height="0dip"
-	    android:layout_weight="1" />
-    <LinearLayout android:layout_width="match_parent"
-
-	    android:layout_height="0dip"
-	    android:layout_weight="2"
-	    android:orientation="vertical">
-	    <Button android:id="@+id/btn_add_tab"
-	    android:layout_width="wrap_content"
-	    android:layout_height="wrap_content"
-	    android:text="@string/btn_add_tab"
-	    android:onClick="onAddTab" />
-	    <Button android:id="@+id/btn_remove_tab"
-
-	    android:layout_width="wrap_content"
-	    android:layout_height="wrap_content"
-	    android:text="@string/btn_remove_tab"
-	    android:onClick="onRemoveTab" />
-	    <Button android:id="@+id/btn_toggle_tabs"
-	    android:layout_width="wrap_content"
-	    android:layout_height="wrap_content"
-	    android:text="@string/btn_toggle_tabs"
-	    android:onClick="onToggleTabs" />
-	    <Button android:id="@+id/btn_remove_all_tabs"
-	    android:layout_width="wrap_content"
-	    android:layout_height="wrap_content"
-	    android:text="@string/btn_remove_all_tabs"
-	    android:onClick="onRemoveAllTabs" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/action_provider_main.xml b/proprietary/frameworks/base/tests/widget/res/layout/action_provider_main.xml
deleted file mode 100755
index df3995755a31f8a88e045707dfe3878e55fc6433..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/action_provider_main.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:text="@string/hello_world"
-        tools:context=".MainActivity" />
-
-</RelativeLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/action_view_main.xml b/proprietary/frameworks/base/tests/widget/res/layout/action_view_main.xml
deleted file mode 100755
index df3995755a31f8a88e045707dfe3878e55fc6433..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/action_view_main.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:text="@string/hello_world"
-        tools:context=".MainActivity" />
-
-</RelativeLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/add_column_in_table.xml b/proprietary/frameworks/base/tests/widget/res/layout/add_column_in_table.xml
deleted file mode 100755
index 05f55a8b360e5b37de73c6cdac41be8552c42e0c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/add_column_in_table.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TableLayout android:id="@+id/table"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1.0">
-
-        <TableRow>
-            <TextView
-              android:text="@string/table_layout_a"
-                android:padding="3dip" />
-            <TextView
-                android:text="@string/table_layout_b"
-                android:padding="3dip" />
-            <TextView
-                android:text="@string/table_layout_c"
-                android:padding="3dip" />
-        </TableRow>
-
-    </TableLayout>
-
-    <Button android:id="@+id/add_row_button"
-        android:text="@string/add_row_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/autocompletetextview_simple.xml b/proprietary/frameworks/base/tests/widget/res/layout/autocompletetextview_simple.xml
deleted file mode 100755
index 1a2007640e94dc9571b9e8d41de52503ca3fe8c4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/autocompletetextview_simple.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/samples/SampleCode/res/layout/baseline_1.xml
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <AutoCompleteTextView
-        android:id="@+id/autocompletetextview1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputType="text|textAutoComplete"
-        android:completionThreshold="1" />
-        />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/baseline_0width_and_weight.xml b/proprietary/frameworks/base/tests/widget/res/layout/baseline_0width_and_weight.xml
deleted file mode 100755
index f44f8890ad9ed13d3c9cf118485a3536fe80b92d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/baseline_0width_and_weight.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <LinearLayout android:id="@+id/layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:visibility="gone">
-        <com.mediatek.common.widget.tests.layout.linear.ExceptionTextView
-             android:id="@+id/routeToField"
-             android:textSize="16sp"
-             android:layout_width="0dip"
-             android:layout_weight="1"
-             android:layout_height="wrap_content"
-             android:lines="2"
-             android:autoText="false"
-             android:capitalize="none"
-             android:maxLines="1" />
-         <Button
-             android:layout_height="wrap_content"
-             android:layout_width="wrap_content"
-             android:layout_gravity="fill_vertical"
-             android:text="@string/side_button_label" />
-    </LinearLayout>
-    <Button android:id="@+id/show"
-         android:layout_height="wrap_content"
-         android:layout_width="wrap_content"
-         android:text="@string/show" />
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/baseline_buttons.xml b/proprietary/frameworks/base/tests/widget/res/layout/baseline_buttons.xml
deleted file mode 100755
index 3e364bdfd0f13ffdfd45d83b5cebe3f7a26b72ee..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/baseline_buttons.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/layout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
-
-    <TextView android:id="@+id/currenttime"
-    	android:text="@string/time"
-        android:textSize="12sp"
-        android:textStyle="bold"
-        android:layout_gravity="bottom"
-        android:layout_weight="1"
-        android:layout_width="0dip"
-        android:layout_height="wrap_content" />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center">
-
-        <ImageButton android:id="@+id/prev"
-            android:src="@drawable/sym_now_playing_skip_backward_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <ImageButton android:id="@+id/pause"
-            android:src="@drawable/sym_now_playing_pause_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <ImageButton android:id="@+id/next"
-            android:src="@drawable/sym_now_playing_skip_forward_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-    </LinearLayout>
-
-    <TextView android:id="@+id/totaltime"
-        android:textSize="12sp"
-        android:textStyle="bold"
-        android:gravity="right"
-        android:text="@string/time"
-        android:layout_gravity="bottom"
-        android:layout_weight="1"
-        android:layout_width="0dip"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/baseline_center_gravity.xml b/proprietary/frameworks/base/tests/widget/res/layout/baseline_center_gravity.xml
deleted file mode 100755
index dd1318d310dc1d770c81abfa4f00cb2cbfd82fba..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/baseline_center_gravity.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-    <Button android:id="@+id/button1"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/side_button_label" />
-    <Button android:id="@+id/button2"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/side_button_label" />
-    <Button android:id="@+id/button3"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/side_button_label" />
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/descendant_focusability.xml b/proprietary/frameworks/base/tests/widget/res/layout/descendant_focusability.xml
deleted file mode 100755
index 0cb75fdb6a0650d036c881b9d385a63876513d18..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/descendant_focusability.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-        >
-
-    <LinearLayout
-        android:id="@+id/beforeDescendants"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:descendantFocusability="beforeDescendants"
-            >
-        <Button
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-                />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/afterDescendants"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:descendantFocusability="afterDescendants"
-            >
-        <Button
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-                />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/blocksDescendants"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:descendantFocusability="blocksDescendants"
-            >
-        <Button
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-                />
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/dialog_fragment_main.xml b/proprietary/frameworks/base/tests/widget/res/layout/dialog_fragment_main.xml
deleted file mode 100755
index df3995755a31f8a88e045707dfe3878e55fc6433..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/dialog_fragment_main.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:text="@string/hello_world"
-        tools:context=".MainActivity" />
-
-</RelativeLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/fill_in_wrap.xml b/proprietary/frameworks/base/tests/widget/res/layout/fill_in_wrap.xml
deleted file mode 100755
index 1c3f8110f5b5029575fef9431165155a2c5a9c82..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/fill_in_wrap.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:orientation="horizontal"
-    android:baselineAligned="false"
-    android:gravity="center_vertical">
-
-    <Button
-        android:layout_width="100dip"
-        android:layout_height="wrap_content"
-        android:gravity="left|center_vertical"
-    />
-
-    <LinearLayout android:id="@+id/layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="0dip"
-        android:paddingRight="0dip"
-        android:paddingTop="2dip"
-        android:paddingBottom="2dip"    
-        android:orientation="horizontal"
-        android:baselineAligned="false"
-        android:addStatesFromChildren="true"
-        android:background="@android:drawable/edit_text"
-        android:gravity="center_vertical">
-
-        <EditText android:id="@+id/data"
-            android:layout_width="0dip"
-            android:layout_weight="1"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="8dip"
-            android:paddingBottom="4dip"
-            android:layout_gravity="center_vertical"
-            android:background="@null"
-        />
-
-        <ImageButton
-            style="@android:style/Widget.Button.Inset"
-            android:src="@android:drawable/ic_delete"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="2dip"
-            android:gravity="center"
-        />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/focus_after_removal.xml b/proprietary/frameworks/base/tests/widget/res/layout/focus_after_removal.xml
deleted file mode 100755
index f4e388d695c95a0a79e3643861132e2ce4c3d73c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/focus_after_removal.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/samples/SampleCode/res/layout/baseline_1.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <LinearLayout android:id="@+id/leftLayout"
-        android:orientation="vertical"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <Button android:id="@+id/topLeftButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="3dip"
-            android:text="@string/left_top" />
-        <Button android:id="@+id/bottomLeftButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="3dip"
-            android:text="@string/left_bottom" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <Button android:id="@+id/topRightButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="3dip"
-            android:text="@string/right_top" />
-        <Button android:id="@+id/bottomRightButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="3dip"
-            android:text="@string/right_bottom" />
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/fragment_edit_name.xml b/proprietary/frameworks/base/tests/widget/res/layout/fragment_edit_name.xml
deleted file mode 100755
index d54068bfb01882e14024181ab5446bbd3b02a47a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/fragment_edit_name.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/edit_name"
-    android:layout_width="wrap_content" android:layout_height="wrap_content"
-    android:layout_gravity="center" android:orientation="vertical"  >
-
-    <TextView
-        android:id="@+id/lbl_your_name" android:text="Your name" 
-        android:layout_width="wrap_content" android:layout_height="wrap_content" />
-      
-    <EditText
-        android:id="@+id/txt_your_name"
-        android:layout_width="match_parent"  android:layout_height="wrap_content" 
-        android:inputType="text"
-        android:imeOptions="actionDone" />
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/framelayout_gravity.xml b/proprietary/frameworks/base/tests/widget/res/layout/framelayout_gravity.xml
deleted file mode 100755
index e89fce596935e182ead0baca1455d49899b4ec04..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/framelayout_gravity.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/parent"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Button android:id="@+id/left"
-        android:layout_gravity="left"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/right"
-        android:layout_gravity="right"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/center_horizontal"
-        android:layout_gravity="center_horizontal"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/left_center_vertical"
-        android:layout_gravity="center_vertical|left"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/right_center_vertical"
-        android:layout_gravity="center_vertical|right"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/center"
-        android:layout_gravity="center"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/left_bottom"
-        android:layout_gravity="bottom|left"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/right_bottom"
-        android:layout_gravity="bottom|right"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/center_horizontal_bottom"
-        android:layout_gravity="bottom|center_horizontal"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</FrameLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/framelayout_margin.xml b/proprietary/frameworks/base/tests/widget/res/layout/framelayout_margin.xml
deleted file mode 100755
index 9120bcb52a4e68256dbdc5143962a5dd2bfa617f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/framelayout_margin.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/parent"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Button android:id="@+id/left"
-        android:layout_gravity="left"
-        android:layout_marginLeft="12dip"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/right"
-        android:layout_gravity="right"
-        android:layout_marginRight="12dip"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/top"
-        android:layout_gravity="top|center_horizontal"
-        android:layout_marginTop="12dip"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <Button android:id="@+id/bottom"
-        android:layout_gravity="bottom|center_horizontal"
-        android:layout_marginBottom="12dip"
-        android:text="@string/view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</FrameLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/gesture_detector_main.xml b/proprietary/frameworks/base/tests/widget/res/layout/gesture_detector_main.xml
deleted file mode 100755
index 6e7230240d0429334c1173d6e5b30ddd0a4e44c6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/gesture_detector_main.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>  
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"  
-    android:layout_width="fill_parent" android:layout_height="fill_parent"  
-    android:id="@+id/container">  
-  
-    <RelativeLayout android:layout_width="fill_parent"  
-        android:id="@+id/container1" android:layout_height="fill_parent"  
-        android:visibility="visible">  
-        <ImageView android:layout_width="fill_parent"  
-            android:layout_height="fill_parent" android:background="@drawable/one" />  
-    </RelativeLayout>  
-  
-    <RelativeLayout android:layout_width="fill_parent"  
-        android:background="@drawable/gray" android:id="@+id/container2"  
-        android:visibility="gone" android:layout_height="fill_parent">  
-        <ImageView android:layout_width="fill_parent"  
-            android:layout_height="fill_parent" android:background="@drawable/three" />  
-    </RelativeLayout>  
-  
-</RelativeLayout>  
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/grid_in_horizontal.xml b/proprietary/frameworks/base/tests/widget/res/layout/grid_in_horizontal.xml
deleted file mode 100755
index 62d7bcb5302176ab3932301a55a80eeab4d2816c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/grid_in_horizontal.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="horizontal"
-	android:layout_width="match_parent" 
-    android:layout_height="match_parent">
-	
-	<GridView android:id="@+id/grid"
-	    android:layout_width="0dip" 
-	    android:layout_height="match_parent"
-	    android:layout_weight="1"
-	    android:padding="10dip"
-	    android:verticalSpacing="10dp"    
-	    android:horizontalSpacing="10dp"
-	    android:numColumns="auto_fit"
-	    android:columnWidth="60dp"
-	    android:stretchMode="columnWidth" />
-	    
-    <ImageButton
-        android:src="@drawable/sym_now_playing_pause_1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-    	
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/grid_in_vertical.xml b/proprietary/frameworks/base/tests/widget/res/layout/grid_in_vertical.xml
deleted file mode 100755
index fea459aa1319cb04cbae716a1c1ef8bf2cd47f6a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/grid_in_vertical.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="match_parent" 
-    android:layout_height="match_parent">
-	
-	<GridView android:id="@+id/grid"
-	    android:layout_width="wrap_content" 
-	    android:layout_height="wrap_content"
-	    android:numColumns="auto_fit" />
-	    
-    <ImageButton
-        android:src="@drawable/sym_now_playing_pause_1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-   
-	<ImageButton
-        android:src="@drawable/sym_now_playing_pause_1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-        
-	<ImageButton
-        android:src="@drawable/sym_now_playing_pause_1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-         	
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/grid_padding.xml b/proprietary/frameworks/base/tests/widget/res/layout/grid_padding.xml
deleted file mode 100755
index bd666e1ae048f4a12c2769d03f08ca55c7f269bb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/grid_padding.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<GridView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/grid"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:padding="10dip"
-	android:verticalSpacing="10dp"
-	android:horizontalSpacing="10dp"
-	android:numColumns="auto_fit"
-	android:columnWidth="50dp" />
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/grid_scroll_listener.xml b/proprietary/frameworks/base/tests/widget/res/layout/grid_scroll_listener.xml
deleted file mode 100755
index 82b1058a8edac64d4dbbedddf5ccbc7794ba39a5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/grid_scroll_listener.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="match_parent" 
-    android:layout_height="match_parent">
-	
-	<GridView android:id="@+id/grid"
-	    android:layout_width="match_parent" 
-	    android:layout_height="0dip"
-	    android:layout_weight="1"
-	    android:padding="10dip"
-	    android:verticalSpacing="10dp"    
-	    android:horizontalSpacing="10dp"
-	    android:numColumns="auto_fit"
-	    android:columnWidth="60dp"
-	    android:stretchMode="columnWidth"
-	    android:gravity="center"/>
-	    
-    <TextView android:id="@+id/text"
-    	android:layout_width="match_parent" 
-    	android:layout_height="wrap_content"
-    	android:gravity="center_horizontal"/>
-    	
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/grid_thrasher.xml b/proprietary/frameworks/base/tests/widget/res/layout/grid_thrasher.xml
deleted file mode 100755
index 346acff9f9c3a0d957b5ea724bd27ec420a85a8c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/grid_thrasher.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="match_parent" 
-    android:layout_height="match_parent">
-	
-	<GridView android:id="@+id/grid"
-	    android:layout_width="match_parent" 
-		android:layout_height="match_parent"
-	    android:padding="10dip"
-	    android:verticalSpacing="10dp"    
-	    android:horizontalSpacing="10dp"
-	    android:numColumns="auto_fit"
-	    android:columnWidth="60dp"
-	    android:stretchMode="columnWidth"
-	    android:gravity="center"/>
-	    
-    <TextView android:id="@+id/text"
-    	android:layout_width="match_parent" 
-    	android:layout_height="wrap_content"
-    	android:gravity="center_horizontal"/>
-    	
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/horizontal_scroll_view.xml b/proprietary/frameworks/base/tests/widget/res/layout/horizontal_scroll_view.xml
deleted file mode 100755
index 4925016297621ef8dfc99d1c5c77423445cded08..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/horizontal_scroll_view.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<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:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="HorizontalScrollView Testing" />
-
-    <HorizontalScrollView
-        android:id="@+id/hsv"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" >
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal" >
-
-            <Button
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Button 1" />
-
-            <Button
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Button 2" />
-
-            <Button
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Button 3" />
-
-            <Button
-                android:id="@+id/button4"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Button 4" />
-
-            <Button                
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Button 5" />
-
-            <Button
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Button 6" />
-
-            <Button
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Button 7" />
-        </LinearLayout>
-    </HorizontalScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/linear_layout_buttons.xml b/proprietary/frameworks/base/tests/widget/res/layout/linear_layout_buttons.xml
deleted file mode 100755
index bcb28e7df03a60c15e5a4f17d686a64eb5657013..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/linear_layout_buttons.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/samples/SampleCode/res/layout/baseline_1.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Button
-        android:id="@+id/button1"
-        android:layout_width="match_parent"
-        android:layout_height="0sp"
-        android:layout_weight="1"
-        android:text="@string/keypad_one"/>
-
-    <Button
-        android:id="@+id/button2"
-        android:layout_width="match_parent"
-        android:layout_height="0sp"
-        android:layout_weight="1"
-        android:text="@string/keypad_two"/>
-
-    <Button
-        android:id="@+id/button3"
-        android:layout_width="match_parent"
-        android:layout_height="0sp"
-        android:layout_weight="1"
-        android:text="@string/keypad_three"/>
-
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/linear_layout_edittext_then_button.xml b/proprietary/frameworks/base/tests/widget/res/layout/linear_layout_edittext_then_button.xml
deleted file mode 100755
index ab76e29c5fa1c732140c0894227af9750f7ce57c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/linear_layout_edittext_then_button.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/samples/SampleCode/res/layout/baseline_1.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <EditText
-        android:id="@+id/editText"
-        android:layout_width="match_parent"
-        android:layout_height="0sp"
-        android:layout_weight="1"/>
-
-    <Button
-        android:id="@+id/button"
-        android:layout_width="match_parent"
-        android:layout_height="0sp"
-        android:layout_weight="1"
-        android:text="@string/keypad_one"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/linear_layout_grid.xml b/proprietary/frameworks/base/tests/widget/res/layout/linear_layout_grid.xml
deleted file mode 100755
index 67b687705f33590d4a0c57e0412fbc707b5f4a52..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/linear_layout_grid.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/samples/SampleCode/res/layout/baseline_1.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout android:id="@+id/column1"
-        android:layout_width="match_parent"
-        android:layout_height="0sp"
-        android:layout_weight="1"
-        android:orientation="horizontal">
-
-        <Button
-            android:layout_width="0sp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/keypad_one"/>
-
-        <Button
-            android:layout_width="0sp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/keypad_two"/>
-
-        <Button
-            android:layout_width="0sp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/keypad_three"/>
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/column2"
-        android:layout_width="match_parent"
-        android:layout_height="0sp"
-        android:layout_weight="1"
-        android:orientation="horizontal">
-
-        <Button
-            android:layout_width="0sp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/keypad_four"/>
-
-        <Button
-            android:layout_width="0sp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/keypad_five"/>
-
-        <Button
-            android:layout_width="0sp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/keypad_six"/>
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/column3"
-        android:layout_width="match_parent"
-        android:layout_height="0sp"
-        android:layout_weight="1"
-        android:orientation="horizontal">
-
-        <Button
-            android:layout_width="0sp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/keypad_seven"/>
-
-        <Button
-            android:layout_width="0sp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/keypad_eight"/>
-
-        <Button
-            android:layout_width="0sp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/keypad_nine"/>
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/linear_layout_listview_height.xml b/proprietary/frameworks/base/tests/widget/res/layout/linear_layout_listview_height.xml
deleted file mode 100755
index 873b2d264a56519994d3f5312ef13228e51ed025..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/linear_layout_listview_height.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    
-    <!-- Outer linear layout providing vertical layout -->
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
-        
-        <!-- The control buttons -->
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-            
-            <Button
-                android:id="@+id/button1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/linear_listheight_fixed"/>
-        
-            <Button
-                android:id="@+id/button2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/linear_listheight_fill"/>
-        
-            <Button
-                android:id="@+id/button3"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/linear_listheight_hide"/>
-        </LinearLayout>
-        
-        <!-- The list view -->
-        <ListView 
-            android:id="@+id/inner_list"
-            android:layout_width="200dip"
-            android:layout_height="match_parent"
-            android:background="@android:drawable/spinner_dropdown_background"
-            android:divider="@android:drawable/divider_horizontal_bright" />
- 
-    </LinearLayout>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/linear_layout_spinner_then_button.xml b/proprietary/frameworks/base/tests/widget/res/layout/linear_layout_spinner_then_button.xml
deleted file mode 100755
index 53c028087b1fc515bd155f0a720bfd3ad444d49a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/linear_layout_spinner_then_button.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-        
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-   android:orientation="horizontal"
-   android:layout_width="match_parent"
-   android:layout_height="wrap_content">
-
-   <Spinner android:id="@+id/reminder_value"
-       android:layout_width="0dip"
-       android:layout_height="wrap_content"
-       android:layout_weight="0.7"
-       android:entries="@array/reminder_minutes_labels"/>
-
-   <Button android:id="@+id/reminder_remove"
-       android:layout_width="0dip"
-       android:layout_height="wrap_content"
-       android:layout_weight="0.3"
-       android:text="@string/show" />
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/linear_layout_textviews.xml b/proprietary/frameworks/base/tests/widget/res/layout/linear_layout_textviews.xml
deleted file mode 100755
index ccec213991930e698ddaab321d6119d5ff505cec..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/linear_layout_textviews.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout"
-    android:background="#FFFF0000"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <EditText
-        android:id="@+id/editText1"
-        android:text="@string/text"
-        android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="1.0" />
-
-    <EditText
-        android:id="@+id/editText2"
-        android:text="@string/text"
-        android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="1.0" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/linear_layout_weight.xml b/proprietary/frameworks/base/tests/widget/res/layout/linear_layout_weight.xml
deleted file mode 100755
index bb138df0021ba44d7cb3272c782f566913b91e38..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/linear_layout_weight.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout"
-    android:background="#FFFFFFFF"
-    android:orientation="horizontal"
-    android:layout_width="87dip"
-    android:layout_height="wrap_content">
-
-    <View
-        android:id="@+id/child1"
-        android:background="#FFFF0000"
-        android:layout_width="20dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="1.0" />
-
-    <View
-        android:id="@+id/child2"
-        android:background="#FF00FF00"
-        android:layout_width="20dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="1.0" />
-
-    <View
-        android:background="#FF0000FF"
-        android:id="@+id/child3"
-        android:layout_width="20dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="1.0" />
-
-    <View
-        android:background="#FFFF00FF"
-        android:id="@+id/child4"
-        android:layout_width="20dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="1.0" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/list_dividers.xml b/proprietary/frameworks/base/tests/widget/res/layout/list_dividers.xml
deleted file mode 100755
index 93810b49a9acf982b7ecd270635221f34253ea17..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/list_dividers.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <ListView android:id="@android:id/list"
-        android:paddingRight="15dip"
-        android:layout_marginLeft="50dip"
-        android:layout_width="150dip"
-        android:layout_height="300dip" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/list_filter.xml b/proprietary/frameworks/base/tests/widget/res/layout/list_filter.xml
deleted file mode 100755
index 0ab7101c68548b2b31a739bf76db1738766120f8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/list_filter.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent" 
-    android:layout_height="match_parent">
-    
-    <FrameLayout android:id="@+id/frame"
-        android:layout_width="match_parent" 
-        android:layout_height="0dip"
-        android:layout_weight="1">
-
-        <ListView android:id="@android:id/list"
-            android:layout_width="match_parent" 
-            android:layout_height="match_parent"
-            android:drawSelectorOnTop="false" />
-            
-    </FrameLayout>
-    
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent" 
-        android:layout_height="wrap_content">
-        
-        <Button android:id="@+id/hide"
-            android:layout_width="wrap_content" 
-            android:layout_height="wrap_content"
-            android:text="@string/hide" />
-         
-        <Button android:id="@+id/show"
-            android:layout_width="wrap_content" 
-            android:layout_height="wrap_content"
-            android:text="@string/show" /> 
-            
-    </LinearLayout>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/list_in_horizontal.xml b/proprietary/frameworks/base/tests/widget/res/layout/list_in_horizontal.xml
deleted file mode 100755
index b7706288e859c7931d3b6acce27d4f18802b6fde..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/list_in_horizontal.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TableRow>
-
-        <ListView android:id="@+id/list" />
-
-        <ImageButton android:src="@drawable/sym_now_playing_pause_1" />
-
-    </TableRow>
-
-</TableLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/list_in_vertical.xml b/proprietary/frameworks/base/tests/widget/res/layout/list_in_vertical.xml
deleted file mode 100755
index f951cb7d05a5d8b6aea62f81fc44aad2bd3fefe4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/list_in_vertical.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <ListView android:id="@+id/list"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-        <ImageButton
-            android:src="@drawable/sym_now_playing_pause_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <ImageButton
-            android:src="@drawable/sym_now_playing_pause_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <ImageButton
-            android:src="@drawable/sym_now_playing_pause_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-         	
-    </LinearLayout>
-</ScrollView>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/list_main.xml b/proprietary/frameworks/base/tests/widget/res/layout/list_main.xml
deleted file mode 100755
index 7942d2399d590f4a0a445c257781ccb63cb2f1fb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/list_main.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/list_recycler_profiling.xml b/proprietary/frameworks/base/tests/widget/res/layout/list_recycler_profiling.xml
deleted file mode 100755
index 3fc6bd62c02a1da55dc993632bba2d42994f9b21..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/list_recycler_profiling.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ListView android:id="@+id/list"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1.0" />
-
-    <ImageButton android:id="@+id/pause"
-        android:src="@drawable/sym_now_playing_pause_1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/list_scroll_listener.xml b/proprietary/frameworks/base/tests/widget/res/layout/list_scroll_listener.xml
deleted file mode 100755
index 58ab55fdcf830e9352614f3111d5dcc3a0a8aa31..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/list_scroll_listener.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="match_parent" 
-    android:layout_height="match_parent">
-	
-	<ListView android:id="@android:id/list"
-	    android:layout_width="match_parent" 
-	    android:layout_height="0dip"
-	    android:layout_weight="1"
-	    android:drawSelectorOnTop="false"/>
-	    
-    <TextView android:id="@+id/text"
-    	android:layout_width="match_parent" 
-    	android:layout_height="wrap_content"
-    	android:gravity="center_horizontal"/>
-    	
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/list_take_focus_from_side.xml b/proprietary/frameworks/base/tests/widget/res/layout/list_take_focus_from_side.xml
deleted file mode 100755
index ee40019060953c8afa03e3b047b6e1f0aa2562ea..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/list_take_focus_from_side.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent" 
-    android:layout_height="match_parent">
-    
-    <ListView android:id="@android:id/list"
-        android:layout_width="0dip" 
-        android:layout_weight="1"
-        android:layout_height="match_parent"
-        android:drawSelectorOnTop="false"/>
-        
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="wrap_content" 
-        android:layout_height="match_parent">
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />  
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/side_button_label" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/list_thrasher.xml b/proprietary/frameworks/base/tests/widget/res/layout/list_thrasher.xml
deleted file mode 100755
index 58ab55fdcf830e9352614f3111d5dcc3a0a8aa31..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/list_thrasher.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="match_parent" 
-    android:layout_height="match_parent">
-	
-	<ListView android:id="@android:id/list"
-	    android:layout_width="match_parent" 
-	    android:layout_height="0dip"
-	    android:layout_weight="1"
-	    android:drawSelectorOnTop="false"/>
-	    
-    <TextView android:id="@+id/text"
-    	android:layout_width="match_parent" 
-    	android:layout_height="wrap_content"
-    	android:gravity="center_horizontal"/>
-    	
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/list_with_button_above.xml b/proprietary/frameworks/base/tests/widget/res/layout/list_with_button_above.xml
deleted file mode 100755
index 18bcf6b10bbed18835b80072db5e633b54b93f84..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/list_with_button_above.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Simple layout with a button and a list below, can be used to build more
- sophisticated test cases by adding stuff to the list programatically.-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/layout"
-        android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-
-    <Button android:id="@+id/button"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/button_above_list_label"/>
-
-
-    <ListView android:id="@android:id/list"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:paddingTop="2dip"
-        android:drawSelectorOnTop="false"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/list_with_disappearing_item_bug_item.xml b/proprietary/frameworks/base/tests/widget/res/layout/list_with_disappearing_item_bug_item.xml
deleted file mode 100755
index 82af6cad0010acc0906e633c97fa68f640acfea9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/list_with_disappearing_item_bug_item.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- A layout is needed to reprod the bug. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight">
-
-    <TextView 
-        android:id="@+id/text1"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:gravity="center_vertical"
-        android:paddingLeft="27dip"
-    />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/list_with_empty_view.xml b/proprietary/frameworks/base/tests/widget/res/layout/list_with_empty_view.xml
deleted file mode 100755
index 23bb65811373e66fd90f61c16a4506b9e22a634f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/list_with_empty_view.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
- 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <ListView android:id="@android:id/list"
-        android:drawSelectorOnTop="false"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-    <TextView android:id="@+id/empty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:textSize="36sp"
-        android:textColor="#999"
-        android:visibility="gone"
-        android:text="@string/empty_list" />
-
-</FrameLayout>    
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/mail_message.xml b/proprietary/frameworks/base/tests/widget/res/layout/mail_message.xml
deleted file mode 100755
index 7f15e4f4ae8a24dd1de859f17091653ec73704e2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/mail_message.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- A layout similar to a gmail message.  useful for setting up tests, like
- a list with a list of messages.-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView android:id="@+id/subject"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"/>
-
-    <WebView android:id="@+id/body"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/normal_main.xml b/proprietary/frameworks/base/tests/widget/res/layout/normal_main.xml
deleted file mode 100755
index 8559c3e6dfde9601a57e400f00ef50d9693a50ed..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/normal_main.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:text="@string/hello_world"
-        tools:context=".MainActivity" />
-
-    <Button 
-        android:id="@+id/button"
-        android:text="@string/hello_world"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-</RelativeLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/numberpicker_layout.xml b/proprietary/frameworks/base/tests/widget/res/layout/numberpicker_layout.xml
deleted file mode 100755
index 8e21b749516a79b494d293b5eb141f1a505bd03a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/numberpicker_layout.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <NumberPicker
-        android:id="@+id/testNumberPicker"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/preference_fragment_main.xml b/proprietary/frameworks/base/tests/widget/res/layout/preference_fragment_main.xml
deleted file mode 100755
index 94d63eafb84bf958365f5c4f4bd8144f2d825d10..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/preference_fragment_main.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="@dimen/padding_medium"
-        android:text="@string/hello_world"
-        tools:context=".MainActivity" />
-    
-    <CheckBox
-        android:id="@+id/prefCheckBox"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="CheckBoxPreference" />
-    
-    <TextView
-        android:id="@+id/prefEditText"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-        
-
-</LinearLayout>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/progressbar_layout.xml b/proprietary/frameworks/base/tests/widget/res/layout/progressbar_layout.xml
deleted file mode 100755
index a15d29c966e677f7bea32289085c020735734f81..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/progressbar_layout.xml
+++ /dev/null
@@ -1,16 +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="vertical" >
-    <ProgressBar
-        android:id="@+id/testProgressBar"
-        android:layout_width="match_parent"
-        android:layout_height="100px"
-        android:indeterminate="false"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:max="100"
-        android:progress="0"
-        android:secondaryProgress="10"
-        />"
-</LinearLayout>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/radiogroup_checkedchild.xml b/proprietary/frameworks/base/tests/widget/res/layout/radiogroup_checkedchild.xml
deleted file mode 100755
index db88f4dc2f2716879762c54a7cef0f5f4f3e09db..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/radiogroup_checkedchild.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/group"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-      <RadioButton
-          android:id="@+id/value_one"
-          android:layout_width="match_parent"
-          android:layout_height="match_parent"
-          android:textColor="#555555"
-          android:checked="true"
-          android:text="@string/visibility_1_view_1" />
-
-      <RadioButton
-          android:id="@+id/value_two"
-          android:layout_width="match_parent"
-          android:layout_height="match_parent"
-          android:textColor="#555555"
-          android:text="@string/visibility_1_view_2" />
-
-      <RadioButton
-          android:id="@+id/value_three"
-          android:layout_width="match_parent"
-          android:layout_height="match_parent"
-          android:textColor="#555555"
-          android:text="@string/visibility_1_view_3" />
-
-</RadioGroup>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/scroll_to_rect_with_internal_scroll.xml b/proprietary/frameworks/base/tests/widget/res/layout/scroll_to_rect_with_internal_scroll.xml
deleted file mode 100755
index b6ec479ca30e10ba48d837160c32b36bc85b0267..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/scroll_to_rect_with_internal_scroll.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/samples/SampleCode/res/layout/scroll_view_1.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- Demonstrates scrolling with a ScrollView. -->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/scrollView"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:scrollbars="none">
-
-    <LinearLayout
-        android:id="@+id/layout"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-
-        <Button android:id="@+id/scrollToBlob"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/scroll_top_button"/>
-
-        <TextView android:id="@+id/blob"
-            android:layout_width="match_parent"
-            android:layout_height="80dip"
-            android:layout_marginTop="500dip"
-            android:layout_marginBottom="5dip"/>
-
-
-    </LinearLayout>
-</ScrollView>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/scroll_to_rectangle.xml b/proprietary/frameworks/base/tests/widget/res/layout/scroll_to_rectangle.xml
deleted file mode 100755
index 55d057d4b4a0a09405dd944a1070cc5b1a0f776f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/scroll_to_rectangle.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/samples/SampleCode/res/layout/scroll_view_1.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- Demonstrates scrolling with a ScrollView. -->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/scrollView"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:scrollbars="none">
-
-    <LinearLayout
-        android:id="@+id/layout"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-
-        <Button android:id="@+id/scrollToRectFromTop"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/scroll_top_button"/>
-
-        <Button android:id="@+id/scrollToRectFromTop2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingBottom="10dip"
-            android:text="@string/scroll_top_button2"/>
-
-        <TextView android:id="@+id/topBlob"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dip"
-            android:layout_marginBottom="5dip"/>
-
-        <TextView android:id="@+id/childToMakeVisible"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dip"
-            android:layout_marginBottom="5dip"
-            android:text="@string/scroll_to_me"/>
-
-        <TextView android:id="@+id/bottomBlob"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dip"
-            android:layout_marginBottom="5dip"/>
-
-        <Button android:id="@+id/scrollToRectFromBottom2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="10dip"
-            android:text="@string/scroll_bottom_button2"/>
-
-        <Button android:id="@+id/scrollToRectFromBottom"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/scroll_bottom_button"/>
-
-
-    </LinearLayout>
-</ScrollView>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/scrollview_linear_layout.xml b/proprietary/frameworks/base/tests/widget/res/layout/scrollview_linear_layout.xml
deleted file mode 100755
index a3c12ce61f374f7a8d5686526bc68ad396c284c1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/scrollview_linear_layout.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/scrollView"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:scrollbars="none">
-
-    <LinearLayout
-        android:id="@+id/layout"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-    </LinearLayout>
-
-
-</ScrollView>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/spinner.xml b/proprietary/frameworks/base/tests/widget/res/layout/spinner.xml
deleted file mode 100755
index 3b69cc6c0ec097191ec787e8050d9ec8a69cf075..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/spinner.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-        
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"   
-   android:layout_width="match_parent"
-   android:layout_height="match_parent">
-
-   <Spinner android:id="@+id/spinner"
-       android:layout_width="match_parent"
-       android:layout_height="wrap_content"       
-       android:spinnerMode="dropdown"
-   />
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/split_action_bar_main.xml b/proprietary/frameworks/base/tests/widget/res/layout/split_action_bar_main.xml
deleted file mode 100755
index df3995755a31f8a88e045707dfe3878e55fc6433..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/split_action_bar_main.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:text="@string/hello_world"
-        tools:context=".MainActivity" />
-
-</RelativeLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/stack_view.xml b/proprietary/frameworks/base/tests/widget/res/layout/stack_view.xml
deleted file mode 100755
index ab48b9fa5dd76917dc6cea900f79824cff436e16..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/stack_view.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<LinearLayout xmlns:android = "http://schemas.android.com/apk/res/android"  
-    android:orientation = "horizontal"  
-    android:layout_width = "fill_parent"  
-    android:layout_height = "fill_parent"  
-    >  
-      
-    <StackView  
-        android:id = "@+id/stackView"  
-        android:layout_width = "fill_parent"   
-        android:layout_height = "wrap_content"   
-        android:loopViews = "true"  
-        />  
-          
-    <LinearLayout  
-        android:orientation = "vertical"  
-        android:layout_width = "wrap_content"  
-        android:layout_height = "wrap_content"  
-        >  
-          
-        <Button  
-            android:id = "@+id/previousButton"  
-            android:layout_width = "wrap_content"  
-            android:layout_height = "wrap_content"  
-            android:text = "next"  
-            />  
-              
-        <Button  
-            android:id = "@+id/nextButton"  
-            android:layout_width = "wrap_content"  
-            android:layout_height = "wrap_content"  
-            android:text = "prev"  
-            />  
-              
-    </LinearLayout>  
-      
-</LinearLayout>  
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/surfaceview_main.xml b/proprietary/frameworks/base/tests/widget/res/layout/surfaceview_main.xml
deleted file mode 100755
index 42e60df0a1bd36367f8c4b856c29120604d78703..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/surfaceview_main.xml
+++ /dev/null
@@ -1,15 +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"
-	android:id="@+id/LinearLayout">
-
-	<LinearLayout android:id="@+id/LinearLayout01"
-		android:layout_width="wrap_content" android:layout_height="wrap_content">
-		<Button android:id="@+id/Button01" android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:text="简单绘画"></Button>
-		<Button android:id="@+id/Button02" android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:text="定时器绘画"></Button>
-	</LinearLayout>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/table_layout_cell_span.xml b/proprietary/frameworks/base/tests/widget/res/layout/table_layout_cell_span.xml
deleted file mode 100755
index fceef0a4bdfb5105a38ccde1d7992eb270c79d8d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/table_layout_cell_span.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TableRow>
-        <TextView android:id="@+id/a"
-            android:text="@string/table_layout_a"
-            android:background="#FFFF0000"
-            android:padding="3dip" />
-        <TextView android:id="@+id/b"
-            android:text="@string/table_layout_b"
-            android:background="#FF00FF00"
-            android:padding="3dip" />
-        <TextView android:id="@+id/c"
-            android:text="@string/table_layout_c"
-            android:background="#FF0000FF"
-            android:padding="3dip" />
-    </TableRow>
-
-    <TableRow>
-        <TextView  android:id="@+id/spanThenCell"
-            android:text="@string/table_layout_d"
-            android:layout_span="2"
-            android:gravity="center_horizontal"
-            android:background="#FF0000FF"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_e"
-            android:background="#FF00FF00"
-            android:padding="3dip" />
-    </TableRow>
-
-    <TableRow>
-        <TextView
-            android:text="@string/table_layout_f"
-            android:background="#FFFF00FF"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_g"
-            android:background="#FF00FF00"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_h"
-            android:background="#FFFF0000"
-            android:padding="3dip" />
-    </TableRow>
-
-    <TableRow>
-        <TextView
-            android:text="@string/table_layout_a"
-            android:background="#FF00FF00"
-            android:padding="3dip" />
-        <TextView android:id="@+id/cellThenSpan"
-            android:text="@string/table_layout_b"
-            android:layout_span="2"
-            android:gravity="center_horizontal"
-            android:background="#FF0000FF"
-            android:padding="3dip" />
-    </TableRow>
-
-    <TableRow>
-        <TextView android:id="@+id/span"
-            android:text="@string/table_layout_g"
-            android:layout_span="3"
-            android:gravity="center_horizontal"
-            android:background="#FFC0C0C0"
-            android:padding="3dip" />
-    </TableRow>
-</TableLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/table_layout_fixed_width.xml b/proprietary/frameworks/base/tests/widget/res/layout/table_layout_fixed_width.xml
deleted file mode 100755
index 507701ed1a49041e6850afc90dcd7d7fba77e79f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/table_layout_fixed_width.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TableRow>
-        <View android:id="@+id/fixed_height"
-            android:layout_height="48dip"
-            android:background="#FF909090" />
-        <TextView android:id="@+id/fixed_width"
-            android:layout_width="150dip"
-            android:text="@string/table_layout_export"
-            android:background="#FFFF0000"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_export_shortcut"
-            android:background="#FF00FFFF"
-            android:gravity="right"
-            android:padding="3dip" />
-    </TableRow>
-
-    <TableRow>
-        <View
-            android:layout_height="48dip"
-            android:background="#FF909090" />
-        <TextView android:id="@+id/non_fixed_width"
-            android:text="@string/table_layout_export"
-            android:background="#FFFF0000"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_export_shortcut"
-            android:background="#FF00FFFF"
-            android:gravity="right"
-            android:padding="3dip" />
-    </TableRow>
-
-</TableLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/table_layout_horizontal_gravity.xml b/proprietary/frameworks/base/tests/widget/res/layout/table_layout_horizontal_gravity.xml
deleted file mode 100755
index fb72d81bd4a335e758fb69986befd114889abe5c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/table_layout_horizontal_gravity.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:stretchColumns="1">
-
-    <TableRow>
-        <TextView android:id="@+id/reference"
-            android:layout_column="1"
-            android:background="#FF0000FF"
-            android:text="@string/table_layout_open"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_open_shortcut"
-            android:gravity="right"
-            android:padding="3dip" />
-    </TableRow>
-
-    <TableRow>
-        <!-- Horizontally centers the content of the cell -->
-        <TextView android:id="@+id/center"
-            android:layout_column="1"
-            android:text="@string/table_layout_save_as"
-            android:background="#FFFF0000"
-            android:layout_gravity="center_horizontal"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_save_as_shortcut"
-            android:background="#FFFF00FF"
-            android:gravity="right"
-            android:padding="3dip" />
-    </TableRow>
-
-    <TableRow>
-        <View
-            android:layout_height="24dip"
-            android:background="#FF909090" />
-        <!-- Aligns the content of the cell to the bottom right -->
-        <TextView android:id="@+id/bottomRight"
-            android:text="@string/table_layout_export"
-            android:background="#FFFF0000"
-            android:layout_gravity="right|bottom"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_export_shortcut"
-            android:background="#FF00FFFF"
-            android:gravity="right"
-            android:padding="3dip" />
-    </TableRow>
-
-
-    <TableRow>
-        <TextView android:id="@+id/left"
-            android:layout_column="1"
-            android:background="#FF0000FF"
-            android:text="@string/table_layout_open"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_open_shortcut"
-            android:gravity="right"
-            android:padding="3dip" />
-    </TableRow>
-</TableLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/table_layout_vertical_gravity.xml b/proprietary/frameworks/base/tests/widget/res/layout/table_layout_vertical_gravity.xml
deleted file mode 100755
index ae17ada26e62624144dad50eba7eff1af0c2cca6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/table_layout_vertical_gravity.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TableRow>
-        <View android:id="@+id/reference1"
-            android:layout_height="96dip"
-            android:background="#FF909090" />
-        <TextView
-            android:background="#FF0000FF"
-            android:text="@string/table_layout_open"
-            android:padding="3dip" />
-        <TextView android:id="@+id/cell_top"
-            android:background="#FF00FF00"
-            android:layout_gravity="top"
-            android:text="@string/table_layout_open_shortcut"
-            android:padding="3dip" />
-    </TableRow>
-
-    <TableRow>
-        <View android:id="@+id/reference2"
-            android:layout_height="96dip"
-            android:background="#FF909090" />
-        <TextView
-            android:background="#FF0000FF"
-            android:text="@string/table_layout_open"
-            android:padding="3dip" />
-        <TextView android:id="@+id/cell_center"
-            android:background="#FF00FF00"
-            android:layout_gravity="center_vertical"
-            android:text="@string/table_layout_open_shortcut"
-            android:padding="3dip" />
-    </TableRow>
-
-    <TableRow>
-        <View android:id="@+id/reference3"
-            android:layout_height="96dip"
-            android:background="#FF909090" />
-        <TextView
-            android:background="#FF0000FF"
-            android:text="@string/table_layout_open"
-            android:padding="3dip" />
-        <TextView android:id="@+id/cell_bottom"
-            android:background="#FF00FF00"
-            android:layout_gravity="bottom"
-            android:text="@string/table_layout_open_shortcut"
-            android:padding="3dip" />
-    </TableRow>
-
-</TableLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/table_layout_weight.xml b/proprietary/frameworks/base/tests/widget/res/layout/table_layout_weight.xml
deleted file mode 100755
index ba4fade388dd0213071f4734e5fe1978f88ecfbb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/table_layout_weight.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TableRow android:id="@+id/row"
-        android:weightSum="0.9">
-        <View android:id="@+id/cell1"
-            android:layout_width="0dip"
-            android:layout_weight="0.3"
-            android:layout_height="190dip"
-            android:background="#FF0000FF" />
-        <View android:id="@+id/cell2"
-            android:layout_width="0dip"
-            android:layout_weight="0.3"
-            android:layout_height="190dip"
-            android:background="#FFFFFFFF" />
-        <View android:id="@+id/cell3"
-            android:layout_width="0dip"
-            android:layout_weight="0.3"
-            android:layout_height="190dip"
-            android:background="#FFFF0000" />
-    </TableRow>
-
-</TableLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/volume_panel_main.xml b/proprietary/frameworks/base/tests/widget/res/layout/volume_panel_main.xml
deleted file mode 100755
index df3995755a31f8a88e045707dfe3878e55fc6433..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/volume_panel_main.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:text="@string/hello_world"
-        tools:context=".MainActivity" />
-
-</RelativeLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/layout/weight_sum.xml b/proprietary/frameworks/base/tests/widget/res/layout/weight_sum.xml
deleted file mode 100755
index f8921ec3bf7b9b3cd08774a09780244d9f00b820..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/layout/weight_sum.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<LinearLayout android:id="@+id/container" xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:weightSum="1.0"
-    android:gravity="center_horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Button android:id="@+id/child"
-        android:layout_width="0dip"
-        android:layout_weight="0.5"
-        android:layout_height="wrap_content"
-        android:text="@string/visibility_1_vis"/>
-
-</LinearLayout>
diff --git a/proprietary/frameworks/base/tests/widget/res/menu/action_mode_list.xml b/proprietary/frameworks/base/tests/widget/res/menu/action_mode_list.xml
deleted file mode 100755
index 911bb370799b60eaf040a7f6f0bf448847ad4b44..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/menu/action_mode_list.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item
-        android:id="@+id/action1"
-        android:title="@string/action1"
-    />
- 
-    <item
-        android:id="@+id/action2"
-        android:title="@string/action2"
-    />
- 
-    <item
-        android:id="@+id/action3"
-        android:title="@string/action3"
-    />
-
-</menu>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/widget/res/menu/action_provider.xml b/proprietary/frameworks/base/tests/widget/res/menu/action_provider.xml
deleted file mode 100755
index 494fa499c4481848b4ff4befa39ff4341e390f87..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/menu/action_provider.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/menu_search"
-        android:icon="@android:drawable/ic_menu_search"
-        android:title="@string/menu_search"
-        android:showAsAction="ifRoom"
-        android:actionProviderClass="android.widget.ShareActionProvider" />
-</menu>
diff --git a/proprietary/frameworks/base/tests/widget/res/menu/action_view.xml b/proprietary/frameworks/base/tests/widget/res/menu/action_view.xml
deleted file mode 100755
index fbdc34f840bd43c206f3337c8eb59061130609c1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/menu/action_view.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/menu_search"
-        android:icon="@android:drawable/ic_menu_search"
-        android:title="@string/menu_search"
-        android:showAsAction="collapseActionView|always"
-        android:actionViewClass="android.widget.SearchView" />
-</menu>
diff --git a/proprietary/frameworks/base/tests/widget/res/menu/display_options_actions.xml b/proprietary/frameworks/base/tests/widget/res/menu/display_options_actions.xml
deleted file mode 100755
index 37822a61c74920f344004b842e0b3e639c68732d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/menu/display_options_actions.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/simple_item"
-          android:title="@string/display_options_menu_item"
-          android:icon="@android:drawable/ic_menu_add"
-          android:showAsAction="ifRoom" />
-    <item android:id="@+id/simple_item2"
-          android:title="@string/display_options_menu_item2"
-          android:icon="@android:drawable/ic_menu_edit"
-          android:showAsAction="ifRoom" />
-    <item android:id="@+id/simple_item3"
-          android:title="@string/display_options_menu_item3"
-          android:icon="@android:drawable/ic_menu_save"
-          android:showAsAction="ifRoom" />
-    <item android:id="@+id/simple_item4"
-          android:title="@string/display_options_menu_item4"
-          android:icon="@android:drawable/ic_menu_search"
-          android:showAsAction="ifRoom" />
-    <item android:id="@+id/simple_item5"
-          android:title="@string/display_options_menu_item5"
-          android:icon="@android:drawable/ic_menu_call"
-          android:showAsAction="ifRoom" />
-    <item android:id="@+id/simple_item6"
-          android:title="@string/display_options_menu_item6"
-          android:icon="@android:drawable/ic_menu_share"
-          android:showAsAction="ifRoom" />
-    <item android:id="@+id/simple_item7"
-          android:title="@string/display_options_menu_item7"
-          android:icon="@android:drawable/ic_menu_camera"
-          android:showAsAction="ifRoom" />
-</menu>
diff --git a/proprietary/frameworks/base/tests/widget/res/menu/normal_main.xml b/proprietary/frameworks/base/tests/widget/res/menu/normal_main.xml
deleted file mode 100755
index 35e5741855be1a1d3cc4865bf56986e8bb305197..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/menu/normal_main.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/action_search"  
-          android:icon="@android:drawable/ic_menu_search"  
-          android:title="action_bar_search"  
-          android:showAsAction="ifRoom"  
-          android:actionViewClass="android.widget.SearchView" />  
-    <item android:id="@+id/action_add"  
-          android:icon="@android:drawable/ic_menu_add"  
-          android:title="action_bar_add"
-          android:showAsAction="always" />  
-    <item android:id="@+id/action_edit"  
-          android:icon="@android:drawable/ic_menu_edit"  
-          android:showAsAction="never"  
-          android:title="action_bar_edit" />  
-    <item android:id="@+id/action_share"  
-          android:icon="@android:drawable/ic_menu_share"  
-          android:title="action_bar_share"  
-          android:showAsAction="never" />  
-    <item android:id="@+id/action_sort"  
-          android:icon="@android:drawable/ic_menu_sort_by_size"  
-          android:title="action_bar_sort"  
-          android:showAsAction="never">  
-        <menu>  
-            <item android:id="@+id/action_sort_size"  
-                  android:icon="@android:drawable/ic_menu_sort_by_size"  
-                  android:title="action_bar_sort_size"  
-                  android:onClick="onSort" />  
-            <item android:id="@+id/action_sort_alpha"  
-                  android:icon="@android:drawable/ic_menu_sort_alphabetically"  
-                  android:title="action_bar_sort_alpha"  
-                  android:onClick="onSort" />  
-        </menu>  
-    </item>
-</menu>
diff --git a/proprietary/frameworks/base/tests/widget/res/menu/preference_fragment.xml b/proprietary/frameworks/base/tests/widget/res/menu/preference_fragment.xml
deleted file mode 100755
index cfc10fd52e835c45ae499aef7b3885116946b58f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/menu/preference_fragment.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/menu_settings"
-        android:title="@string/menu_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never" />
-</menu>
diff --git a/proprietary/frameworks/base/tests/widget/res/menu/split_action_bar.xml b/proprietary/frameworks/base/tests/widget/res/menu/split_action_bar.xml
deleted file mode 100755
index 88e00ad4da2f0eb368bd70b8c74b23fb8892ba0c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/menu/split_action_bar.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/simple_item"
-          android:title="@string/display_options_menu_item"
-          android:icon="@android:drawable/ic_menu_add"
-          android:showAsAction="ifRoom" />
-    <item android:id="@+id/simple_item2"
-          android:title="@string/display_options_menu_item2"
-          android:icon="@android:drawable/ic_menu_edit"
-          android:showAsAction="ifRoom" />
-    <item android:id="@+id/simple_item3"
-          android:title="@string/display_options_menu_item3"
-          android:icon="@android:drawable/ic_menu_save"
-          android:showAsAction="ifRoom" />
-    <item android:id="@+id/simple_item4"
-          android:title="@string/display_options_menu_item4"
-          android:icon="@android:drawable/ic_menu_search"
-          android:showAsAction="ifRoom" />
-    <item android:id="@+id/simple_item5"
-          android:title="@string/display_options_menu_item5"
-          android:icon="@android:drawable/ic_menu_call"
-          android:showAsAction="ifRoom" />
-    <item android:id="@+id/simple_item6"
-          android:title="@string/display_options_menu_item6"
-          android:icon="@android:drawable/ic_menu_share"
-          android:showAsAction="ifRoom" />
-    <item android:id="@+id/simple_item7"
-          android:title="@string/display_options_menu_item7"
-          android:icon="@android:drawable/ic_menu_camera"
-          android:showAsAction="ifRoom" />
-</menu>
diff --git a/proprietary/frameworks/base/tests/widget/res/values/arrays.xml b/proprietary/frameworks/base/tests/widget/res/values/arrays.xml
deleted file mode 100755
index f76da8579fc96bbdf4edd2a5c61bf43654da05ff..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/values/arrays.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <string-array name="reminder_minutes_labels">
-        <item>5 minutes</item>
-        <item>10 minutes</item>
-        <item>15 minutes</item>
-        <item>20 minutes</item>
-        <item>25 minutes</item>
-        <item>30 minutes</item>
-        <item>45 minutes</item>
-        <item>1 hour</item>
-        <item>2 hours</item>
-        <item>3 hours</item>
-        <item>12 hours</item>
-        <item>24 hours</item>
-        <item>2 days</item>
-        <item>1 week</item>
-    </string-array>
-</resources>
diff --git a/proprietary/frameworks/base/tests/widget/res/values/attrs.xml b/proprietary/frameworks/base/tests/widget/res/values/attrs.xml
deleted file mode 100755
index bf59e74b9f7de7d6c5e60a71aa4ea9785e857570..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/values/attrs.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-     <declare-styleable name="SelectableRowView">
-        <attr name="numRows" format="integer" />
-    </declare-styleable>
-</resources>
diff --git a/proprietary/frameworks/base/tests/widget/res/values/colors.xml b/proprietary/frameworks/base/tests/widget/res/values/colors.xml
deleted file mode 100755
index f881660249f2570a170829078a5ed37634deeea9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/values/colors.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/samples/SampleCode/res/values/colors.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<resources>
-    <drawable name="red">#ffff0000</drawable>
-    <drawable name="blue">#ff0000ff</drawable>
-    <drawable name="green">#ff00ff00</drawable>
-    <drawable name="yellow">#ffffff00</drawable>
-</resources>
diff --git a/proprietary/frameworks/base/tests/widget/res/values/dimens.xml b/proprietary/frameworks/base/tests/widget/res/values/dimens.xml
deleted file mode 100755
index ec966461c7dda8fa9df76bf1035d339d6f6e1571..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/values/dimens.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<resources>
-
-    <dimen name="padding_small">8dp</dimen>
-    <dimen name="padding_medium">8dp</dimen>
-    <dimen name="padding_large">16dp</dimen>
-
-</resources>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/widget/res/values/strings.xml b/proprietary/frameworks/base/tests/widget/res/values/strings.xml
deleted file mode 100755
index 7c83d0bbf78ef167c94b8352ed13e84acdc326f8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/values/strings.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">FrameworkTestApplication</string>
-
-    <!-- FocusAfterRemoval -->
-    <string name="left_top">parent GONE</string>
-    <string name="left_bottom">parent INVISIBLE</string>
-    <string name="right_top">me GONE</string>
-    <string name="right_bottom">me INVISIBLE</string>
-
-    <!-- Strings for the 12 key dialer -->
-    <string name="keypad_one">1</string>
-    <string name="keypad_two">"2\nabc"</string>
-    <string name="keypad_three">"3\ndef"</string>
-    <string name="keypad_four">"4\nghi"</string>
-    <string name="keypad_five">"5\njkl"</string>
-    <string name="keypad_six">"6\nmno"</string>
-    <string name="keypad_seven">"7\npqrs"</string>
-    <string name="keypad_eight">"8\ntuv"</string>
-    <string name="keypad_nine">"9\nwxyz"</string>
-    <string name="keypad_zero">0</string>
-    <string name="keypad_star">*</string>
-    <string name="keypad_pound">"#"</string>
-    
-
-    <!-- HorizontalGravity -->
-    <string name="table_layout_open">Open\u2026</string>
-    <string name="table_layout_open_shortcut">Ctrl-O</string>
-    <string name="table_layout_save_as">Save As\u2026</string>
-    <string name="table_layout_save_as_shortcut">Ctrl-Shift-S</string>
-    <string name="table_layout_export">Export\u2026</string>
-    <string name="table_layout_export_shortcut">Ctrl-E</string>
-
-    <!-- CellSpan -->
-    <string name="table_layout_a">A</string>
-    <string name="table_layout_b">BB</string>
-    <string name="table_layout_c">CCCC</string>
-    <string name="table_layout_d">D</string>
-    <string name="table_layout_e">E</string>
-    <string name="table_layout_f">F</string>
-    <string name="table_layout_g">G</string>
-    <string name="table_layout_h">H</string>
-    
-    <!-- scroll_to_rectangle -->
-    <string name="scroll_top_button">Click to make "hi!" on screen</string>
-    <string name="scroll_top_button2">Click to make blob on screen</string>
-    <string name="scroll_to_me">hi!</string>
-    <string name="scroll_bottom_button2">Click to make blob on screen</string>
-    <string name="scroll_bottom_button">Click to make "hi!" on screen</string>
-
-    <!-- Visibility -->
-    <string name="visibility_1_view_1">View A</string>
-    <string name="visibility_1_view_2">View B</string>
-    <string name="visibility_1_view_3">View C</string>
-    <string name="visibility_1_vis">Visible</string>
-    <string name="visibility_1_invis">Invisible</string>
-    <string name="visibility_1_gone">Gone</string>
-
-    <string name="submit">submit</string>
-    <string name="cancel">cancel</string>
-    <string name="enter_title">enter title</string>
-    <string name="enter_url">enter url</string>
-
-    <!-- List with button above -->
-    <string name="button_above_list_label">Button above list</string>
-    
-    <!-- List take focus from side -->
-    <string name="side_button_label">X</string>
-    
-    <!-- Linear Layout show/hide & sizing -->
-    <string name="linear_listheight_fixed">Fixed Size</string>
-    <string name="linear_listheight_fill">Fill Screen</string>
-    <string name="linear_listheight_hide">Hide</string>
-
-    <!-- Baseline -->
-    <string name="show">Show</string>
-    <string name="time">00:00:00</string>
-    
-    <!-- Drawable -->
-    <string name="minimal_text">a</string>
-    <string name="change_backgrounds">Change backgrounds</string>
-
-    <!-- List with empty view -->
-    <string name="empty_list">Empty list</string>
-    <string name="menu_add">Add</string>
-    <string name="menu_remove">Remove</string>
-
-    <!-- Misc. -->
-    <string name="add_row_button">Add Row</string>
-    <string name="disabled_button">Disabled</string>
-    <string name="translucent_background">Example of how you can make an
-            activity have a translucent background, compositing over
-            whatever is behind it.</string>
-    <string name="text">Lorem ipsum datum carat casus belli honorare</string>
-    
-	<string name="hide">Hide</string>
-    <string name="go">Go</string>
-
-    <string name="include_label">Included views below:</string>
-    <string name="include_button">I was included!</string>
-
-    <string name="view">View</string>
-
-    <string name="layout_five_text_text">S</string>
-    <string name="layout_four_text_text">S</string>
-    <string name="layout_six_text_text">S</string>
-
-    <string name="menu_test">test</string>
-    <string name="metadata_text">text</string>
-
-    <string name="permlab_testGranted">Test Granted</string>
-    <string name="permdesc_testGranted">Used for running unit tests, for
-        testing operations where we have the permission.</string>
-    <string name="permlab_testDenied">Test Denied</string>
-    <string name="permdesc_testDenied">Used for running unit tests, for
-        testing operations where we do not have the permission.</string>
-
-    <string name="searchable_label">SearchManager Test</string>
-    <string name="searchable_hint">A search hint</string>
-
-    <!-- InterrogationActivity -->
-    <string name="button1">Button1</string>
-    <string name="button2">Button2</string>
-    <string name="button3">Button3</string>
-    <string name="button4">Button4</string>
-    <string name="button5">Button5</string>
-    <string name="button6">Button6</string>
-    <string name="button7">Button7</string>
-    <string name="button8">Button8</string>
-    <string name="button9">Button9</string>
-
-    <string name="textview_hebrew_text">&#x05DD;&#x05DE;ab?!</string>
-
-    <!-- SizeAdaptiveLayout -->
-    <string name="first">Four score and seven years ago our fathers brought forth on this continent, a new nation, conceived in Liberty, and dedicated to the proposition that all men are created equal.</string>
-    <string name="actor">Abe Lincoln</string>
-    <string name="caption">Lincoln adressing the crowd at Gettysburgh</string>
-    
-    <!-- ActionBar -->
-    <string name="btn_add_tab">add tab</string>
-    <string name="btn_remove_tab">remove tab</string>
-    <string name="btn_toggle_tabs">toggle tabs</string>
-    <string name="btn_remove_all_tabs">remove all tabs</string>
-    <string name="display_options_custom_button">custom</string>
-    <string name="display_options_menu_item">option 1</string>
-    <string name="display_options_menu_item2">option 2</string>
-    <string name="display_options_menu_item3">option 3</string>
-    <string name="display_options_menu_item4">option 4</string>
-    <string name="display_options_menu_item5">option 5</string>
-    <string name="display_options_menu_item6">option 6</string>
-    <string name="display_options_menu_item7">option 7</string>
-
-    <string-array name="action_list">
-        <item>Mercury</item>
-        <item>Venus</item>
-        <item>Earth</item>
-    </string-array>
-    
-    <string name="menu_search">Search</string>
-    
-    <string name="shared_app_name">ShareTarget</string>
-    
-    <string name="action1">Action1</string>
-    <string name="action2">Action2</string>
-    <string name="action3">Action3</string>
-    
-    <string name="hello_world">Hello world!</string>
-    <string name="menu_settings">Settings</string>
-</resources>
diff --git a/proprietary/frameworks/base/tests/widget/res/values/styles.xml b/proprietary/frameworks/base/tests/widget/res/values/styles.xml
deleted file mode 100755
index 7a90197c5b6639eca4058ce0d056f27403133530..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/values/styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<resources>
-    <style name="Theme" parent="android:Theme">
-        <item name="android:windowAnimationStyle">@style/Animation</item>
-    </style>
-
-    <style name="Animation">
-        <item name="android:activityOpenEnterAnimation">@null</item>
-        <item name="android:activityOpenExitAnimation">@null</item>
-        <item name="android:activityCloseEnterAnimation">@null</item>
-        <item name="android:activityCloseExitAnimation">@null</item>
-        <item name="android:taskOpenEnterAnimation">@null</item>
-        <item name="android:taskOpenExitAnimation">@null</item>
-        <item name="android:taskCloseEnterAnimation">@null</item>
-        <item name="android:taskCloseExitAnimation">@null</item>
-        <item name="android:taskToFrontEnterAnimation">@null</item>
-        <item name="android:taskToFrontExitAnimation">@null</item>
-        <item name="android:taskToBackEnterAnimation">@null</item>
-        <item name="android:taskToBackExitAnimation">@null</item>
-    </style>
-</resources>
diff --git a/proprietary/frameworks/base/tests/widget/res/xml/metadata.xml b/proprietary/frameworks/base/tests/widget/res/xml/metadata.xml
deleted file mode 100755
index e352f27f814817f23051490aa7105ba39e566339..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/xml/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<thedata xmlns:android="http://schemas.android.com/apk/res/android"
-    rawText="some raw text"
-    rawColor="#ffffff00"
-    android:color="#f00"
-    android:text="@string/metadata_text"
-
-/>
diff --git a/proprietary/frameworks/base/tests/widget/res/xml/metadata_app.xml b/proprietary/frameworks/base/tests/widget/res/xml/metadata_app.xml
deleted file mode 100755
index c37e6badcb7e5bf9e429d64ec3356e0914eee98a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/xml/metadata_app.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<thedata xmlns:android="http://schemas.android.com/apk/res/android"
-    rawText="some raw text"
-    rawColor="#ffffff00"
-    android:color="#f00"
-    android:text="@string/metadata_text"
-    appInfo="true"
-
-/>
diff --git a/proprietary/frameworks/base/tests/widget/res/xml/preferences.xml b/proprietary/frameworks/base/tests/widget/res/xml/preferences.xml
deleted file mode 100755
index b5669da81b6763700385cb09b17f504aa6c4abc8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/xml/preferences.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<PreferenceScreen
-        xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <PreferenceCategory
-            android:title="PreferenceCategory A">
-
-        <CheckBoxPreference
-                android:key="checkbox_preference"
-                android:title="title_checkbox_preference"
-                android:summary="summary_checkbox_preference" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-            android:title="PreferenceCategory B">
-
-        <EditTextPreference
-                android:key="edittext_preference"
-                android:title="title_edittext_preference"
-                android:summary="summary_edittext_preference"
-                android:dialogTitle="dialog_title_edittext_preference" />
-
-    </PreferenceCategory>
-
-</PreferenceScreen>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/widget/res/xml/searchable.xml b/proprietary/frameworks/base/tests/widget/res/xml/searchable.xml
deleted file mode 100755
index 9d293b5ac425a31997655b8e42f8bc2c9b98637f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/res/xml/searchable.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<searchable xmlns:android="http://schemas.android.com/apk/res/android"
-    android:label="@string/searchable_label"
-    android:hint="@string/searchable_hint"
-    android:searchSuggestAuthority="com.android.unit_tests.SuggestionProvider"
-    >
-
-        <actionkey android:keycode="KEYCODE_CALL"
-            android:suggestActionMsgColumn="suggest_action_msg_call" />
-
-</searchable>
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarActionModeListActivity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarActionModeListActivity.java
deleted file mode 100755
index 700ab1178465a60a4bfaf92eb82da37114c772c6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarActionModeListActivity.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.os.Bundle;
-import android.app.ListActivity;
-import android.util.SparseBooleanArray;
-import android.view.ActionMode;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.AbsListView.MultiChoiceModeListener;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.Toast;
-
-public class ActionBarActionModeListActivity extends ListActivity {
-
-    String[] rivers = new String[] { "Indus", "Ganges", "Brahmaputra",
-            "Jamuna", "Sutlej", "Kaveri", "Godavari" };
-
-    MultiChoiceModeListener mMultiChoiceModeListener;
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-
-        /**
-         * For contextual action mode, the choice mode should be
-         * CHOICE_MODE_MULTIPLE_MODAL
-         */
-        getListView().setChoiceMode(ListView.CHOICE_MODE_MULTIPLE_MODAL);
-
-        /** Setting multichoicemode listener for the listview */
-        getListView().setMultiChoiceModeListener(mMultiChoiceModeListener);
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        /** Defining a multichoicemodelistener for the listview. */
-        mMultiChoiceModeListener = new MultiChoiceModeListener() {
-
-            public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-                return false;
-            }
-
-            public void onDestroyActionMode(ActionMode mode) {
-            }
-
-            /**
-             * This will be invoked when action mode is created. In our case ,
-             * it is on long clicking a menu item
-             */
-            public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-                getMenuInflater().inflate(R.menu.action_mode_list, menu);
-                return true;
-            }
-
-            /** Invoked when an action in the action mode is clicked */
-            public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-                Toast.makeText(
-                        getBaseContext(),
-                        "Applying " + item.getTitle() + " on "
-                                + getListView().getCheckedItemCount()
-                                + " Rivers \n" + getCheckedItems(),
-                        Toast.LENGTH_LONG).show();
-                return false;
-            }
-
-            public void onItemCheckedStateChanged(ActionMode mode,
-                    int position, long id, boolean checked) {
-            }
-        };
-
-        /** Defining array adapter to host the list of items */
-        ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,
-                android.R.layout.simple_list_item_multiple_choice, rivers);
-
-        /** Setting array adapter for the listview */
-        getListView().setAdapter(adapter);
-
-    }
-
-    /** Returning the selected rivers */
-    public String getCheckedItems() {
-        String selected_rivers = "";
-        SparseBooleanArray checkedItems = getListView()
-                .getCheckedItemPositions();
-        for (int i = 0, j = 0; i < rivers.length; i++) {
-            if (checkedItems.get(i)) {
-                j++;
-                selected_rivers += "\n" + j + "." + rivers[i];
-            }
-
-        }
-        return selected_rivers;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarActionModeListTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarActionModeListTest.java
deleted file mode 100755
index e8ff41dca8599e05a41ff2a62048921df3468f35..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarActionModeListTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.app.ActionBar;
-import android.test.ActivityInstrumentationTestCase2;
-
-@SuppressLint("NewApi")
-@TargetApi(15)
-public class ActionBarActionModeListTest extends ActivityInstrumentationTestCase2<ActionBarActionModeListActivity> {
-    private ActionBarActionModeListActivity mActivity;
-
-    private ActionBarUtils mActionBarUtils;
-
-    public ActionBarActionModeListTest() {
-        super("com.mediatek.common.widget.tests", ActionBarActionModeListActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        // TODO Auto-generated method stub
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = (ActionBarActionModeListActivity) getActivity();
-        mActionBarUtils = new ActionBarUtils(mActivity, getInstrumentation());
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        // TODO Auto-generated method stub
-        super.tearDown();
-        System.out.println("tearDown");
-    }
-
-    public void testPreConditions() {
-        assertTrue(mActivity != null);
-    }
-
-    public void testActionProvider() {
-        ActionBar actionBar = mActivity.getActionBar();
-
-        assertTrue("", true);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarActionProviderActivity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarActionProviderActivity.java
deleted file mode 100755
index d2cf23df46b00ac9b36ecc9ab80393e9e1375896..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarActionProviderActivity.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.os.Bundle;
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.view.Menu;
-import android.widget.ShareActionProvider;
-import android.widget.ShareActionProvider.OnShareTargetSelectedListener;
-
-@SuppressLint("NewApi")
-public class ActionBarActionProviderActivity extends Activity {
-    private Menu mMenu;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.action_provider_main);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        mMenu = menu;
-        getMenuInflater().inflate(R.menu.action_provider, menu);
-        ShareActionProvider mShareActionProvider = (ShareActionProvider) menu
-                .findItem(R.id.menu_search).getActionProvider();
-        mShareActionProvider
-                .setShareHistoryFileName("custom_share_history.xml");
-        mShareActionProvider.setShareIntent(getDefaultShareIntent());
-        mShareActionProvider.setOnShareTargetSelectedListener(new OnShareTargetSelectedListener() {
-
-            public boolean onShareTargetSelected(ShareActionProvider source,
-                    Intent intent) {
-                return false;
-            }
-        });
-        return true;
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        // TODO Auto-generated method stub
-        mMenu = menu;
-        return super.onPrepareOptionsMenu(menu);
-    }
-
-    @Override
-    public void onOptionsMenuClosed(Menu menu) {
-        // TODO Auto-generated method stub
-        super.onOptionsMenuClosed(menu);
-        mMenu = null;
-    }
-
-    private Intent getDefaultShareIntent() {
-        Intent shareIntent = new Intent(Intent.ACTION_SEND);
-        shareIntent.setType("text/plain");
-        shareIntent.putExtra(Intent.EXTRA_TEXT, "http://www.google.com");
-        return shareIntent;
-    }
-
-    public void clickOnMenuItem(int menuItemId, Instrumentation instruments) {
-        final Integer itemId = menuItemId;
-        instruments.runOnMainSync(new Runnable() {
-            public void run() {
-                if (mMenu != null) {
-                    mMenu.performIdentifierAction(itemId, 0);
-                }
-            }
-        });
-        instruments.waitForIdleSync();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarActionProviderTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarActionProviderTest.java
deleted file mode 100755
index c76820f51724ed7b69cab5224675a05776178413..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarActionProviderTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.app.ActionBar;
-import android.test.ActivityInstrumentationTestCase2;
-import android.widget.TextView;
-
-@SuppressLint("NewApi")
-@TargetApi(15)
-public class ActionBarActionProviderTest extends ActivityInstrumentationTestCase2<ActionBarActionProviderActivity> {
-    private ActionBarActionProviderActivity mActivity;
-    private TextView mTextView;
-
-    private ActionBarUtils mActionBarUtils;
-
-    public ActionBarActionProviderTest() {
-        super("com.mediatek.common.widget.tests", ActionBarActionProviderActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        // TODO Auto-generated method stub
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = (ActionBarActionProviderActivity) getActivity();
-        mActionBarUtils = new ActionBarUtils(mActivity, getInstrumentation());
-        mTextView = (TextView) mActivity.findViewById(R.id.text);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        // TODO Auto-generated method stub
-        super.tearDown();
-        System.out.println("tearDown");
-    }
-
-    public void testPreConditions() {
-        assertTrue(mActivity != null);
-        assertTrue(mTextView != null);
-    }
-
-    public void testActionProvider() {
-        ActionBar actionBar = mActivity.getActionBar();
-
-        mActionBarUtils.clickOnActionBarItem(R.id.menu_search);
-        getInstrumentation().waitForIdleSync();
-
-        assertTrue("", true);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarActionViewActivity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarActionViewActivity.java
deleted file mode 100755
index feda649b639416548e6623cebcf1982de0b070c0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarActionViewActivity.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.os.Bundle;
-import android.annotation.SuppressLint;
-import android.app.ActionBar;
-import android.app.Activity;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.SearchView;
-
-@SuppressLint("NewApi")
-public class ActionBarActionViewActivity extends Activity {
-    private Menu mMenu;
-    MenuItem tmpItem;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.action_view_main);
-
-    }
-
-    @Override
-    protected void onStart() {
-        // TODO Auto-generated method stub
-        ActionBar actionBar = getActionBar();
-        getActionBar().setDisplayHomeAsUpEnabled(true);
-        //actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
-        super.onStart();
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        mMenu = menu;
-        getMenuInflater().inflate(R.menu.action_view, menu);
-        /*
-        MenuItem addItem = menu.add("Search");
-        // addItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-        addItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS|MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
-        addItem.setIcon(android.R.drawable.ic_menu_search);
-        SearchManager searchManager = (SearchManager) getSystemService( Context.SEARCH_SERVICE );
-        SearchView searchView = new SearchView( this );
-        searchView.setSearchableInfo( searchManager.getSearchableInfo( getComponentName() ) );
-        searchView.setIconifiedByDefault( true );
-        addItem.setActionView(searchView);
-        */
-        MenuItem mSearchMenuItem = menu.findItem(R.id.menu_search) ;
-        SearchView mSearchView = (SearchView) mSearchMenuItem.getActionView();
-        //mSearchView.setOnQueryTextListener(mOnsearchClickListener);
-        mSearchView.setIconifiedByDefault(true);
-        /*
-        mSearchMenuItem.setOnActionExpandListener(new MenuItem.OnActionExpandListener(){
-
-            public boolean onMenuItemActionExpand(MenuItem item) {
-                //getActionBar().setDisplayShowHomeEnabled(false);
-                return false;
-            }
-
-            public boolean onMenuItemActionCollapse(MenuItem item) {
-                // TODO Auto-generated method stub
-                return false;
-            }});
-            */
-        //tmpItem = addItem;
-        return true;
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        // TODO Auto-generated method stub
-        mMenu = menu;
-        return super.onPrepareOptionsMenu(menu);
-    }
-
-    @Override
-    public void onOptionsMenuClosed(Menu menu) {
-        // TODO Auto-generated method stub
-        super.onOptionsMenuClosed(menu);
-        mMenu = null;
-    }
-
-    public Menu getMenu() {
-        return mMenu;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-
-        switch (item.getItemId()) {
-        case android.R.id.home:
-            //tmpItem.collapseActionView();
-            return false;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarActionViewTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarActionViewTest.java
deleted file mode 100755
index 244bdea10416ca8d12fd1f6d690eb856ed7e6a1d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarActionViewTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.app.ActionBar;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.SearchView;
-import android.widget.TextView;
-
-@SuppressLint("NewApi")
-@TargetApi(15)
-public class ActionBarActionViewTest extends ActivityInstrumentationTestCase2<ActionBarActionViewActivity> {
-    private ActionBarActionViewActivity mActivity;
-    private TextView mTextView;
-
-    private ActionBarUtils mActionBarUtils;
-
-    public ActionBarActionViewTest() {
-        super("com.mediatek.common.widget.tests", ActionBarActionViewActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        // TODO Auto-generated method stub
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = (ActionBarActionViewActivity) getActivity();
-        mActionBarUtils = new ActionBarUtils(mActivity, getInstrumentation());
-        mTextView = (TextView) mActivity.findViewById(R.id.text);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        // TODO Auto-generated method stub
-        super.tearDown();
-        System.out.println("tearDown");
-    }
-
-    public void testPreConditions() {
-        assertTrue(mActivity != null);
-        assertTrue(mTextView != null);
-    }
-
-    public void testActionProvider() {
-        ActionBar actionBar = mActivity.getActionBar();
-
-        mActionBarUtils.clickOnActionBarItem(R.id.menu_search);
-        getInstrumentation().waitForIdleSync();
-
-        Menu menu = mActivity.getMenu();
-        assertNotNull(menu);
-
-        MenuItem searchMenuItem = menu.findItem(R.id.menu_search);
-        assertNotNull(searchMenuItem);
-
-        SearchView searchView = (SearchView) searchMenuItem.getActionView();
-        assertNotNull(searchView);
-
-        mActionBarUtils.clickOnActionBarHomeButton();
-        getInstrumentation().waitForIdleSync();
-
-        assertTrue("", true);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarListActivity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarListActivity.java
deleted file mode 100755
index 4ff6cd531f7d96e700c55730635afa9544e04c91..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarListActivity.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.app.ActionBar;
-import android.app.ActionBar.OnNavigationListener;
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.SpinnerAdapter;
-import android.widget.TextView;
-
-@SuppressLint("NewApi")
-@TargetApi(14)
-public class ActionBarListActivity extends Activity {
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.list_main);
-
-        SpinnerAdapter adapter = ArrayAdapter.createFromResource(this,
-                R.array.action_list,
-                android.R.layout.simple_spinner_dropdown_item);
-        ActionBar actionBar = getActionBar();
-        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
-        actionBar.setListNavigationCallbacks(adapter, new DropDownListenser());
-        //actionBar.setTitle("XD");
-        actionBar.setSubtitle("orz");
-    }
-
-    class DropDownListenser implements OnNavigationListener {
-        String[] listNames = getResources().getStringArray(R.array.action_list);
-
-        public boolean onNavigationItemSelected(int itemPosition, long itemId) {
-            ListContentFragment content = new ListContentFragment(listNames[itemPosition]);
-            FragmentManager manager = getFragmentManager();
-            FragmentTransaction transaction = manager.beginTransaction();
-
-            transaction.replace(R.id.container, content,
-                    "test");
-            transaction.commit();
-            return true;
-        }
-    }
-
-    private class ListContentFragment extends Fragment {
-        private String mTag;
-
-        public ListContentFragment() {
-        }
-
-        ListContentFragment(String tag) {
-            mTag = tag;
-        }
-
-        @Override
-        public void onAttach(Activity activity) {
-            super.onAttach(activity);
-        }
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            TextView textView = new TextView(getActivity());
-            textView.setText(mTag);
-            return textView;
-        }
-    }
-}
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarListTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarListTest.java
deleted file mode 100755
index 8ccfc9dc3723ddca38f37ba31b7ca6c9df1e47be..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarListTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.app.ActionBar;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.View;
-import android.widget.TextView;
-
-@SuppressLint("NewApi")
-@TargetApi(15)
-public class ActionBarListTest extends ActivityInstrumentationTestCase2<ActionBarListActivity> {
-    private ActionBarListActivity mActivity;
-
-    public ActionBarListTest() {
-        super("com.mediatek.common.widget.tests", ActionBarListActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        // TODO Auto-generated method stub
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = (ActionBarListActivity) getActivity();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        // TODO Auto-generated method stub
-        super.tearDown();
-        System.out.println("tearDown");
-    }
-
-    public void testPreConditions() {
-        assertTrue(mActivity != null);
-
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                ActionBar actionBar = mActivity.getActionBar();
-                assertTrue("navigation mode is not list", actionBar.getNavigationMode() == ActionBar.NAVIGATION_MODE_LIST);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-    }
-
-    public void testList() {
-        FragmentManager fragmentManager = mActivity.getFragmentManager();
-
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                ActionBar actionBar = mActivity.getActionBar();
-
-                assertTrue("list item count is wrong", actionBar.getNavigationItemCount() == 3);
-                FragmentManager fragmentManager = mActivity.getFragmentManager();
-                Fragment fragment = fragmentManager.findFragmentByTag("test");
-                View rootView = fragment.getView();
-                assertTrue("root view is not TextView", rootView instanceof TextView);
-                assertTrue("the content is wrong", ((TextView) rootView).getText().equals("Mercury"));
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                ActionBar actionBar = mActivity.getActionBar();
-                actionBar.setSelectedNavigationItem(1);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-        Fragment fragment = fragmentManager.findFragmentByTag("test");
-        View rootView = fragment.getView();
-        assertTrue("root view is not TextView", rootView instanceof TextView);
-        assertTrue("the content is wrong", ((TextView) rootView).getText().equals("Venus"));
-
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                ActionBar actionBar = mActivity.getActionBar();
-                actionBar.setSelectedNavigationItem(2);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-        fragment = fragmentManager.findFragmentByTag("test");
-        rootView = fragment.getView();
-        assertTrue("root view is not TextView", rootView instanceof TextView);
-        assertTrue("the content is wrong", ((TextView) rootView).getText().equals("Earth"));
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarNormalActivity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarNormalActivity.java
deleted file mode 100755
index ca9a74215a6d1d212ee9ec8ce61a51491048912a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarNormalActivity.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.os.Bundle;
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.app.Instrumentation;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.TextView;
-import android.widget.Toast;
-
-@TargetApi(11)
-@SuppressLint("NewApi")
-public class ActionBarNormalActivity extends Activity {
-    private Menu mMenu;
-    private TextView mTextView;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.normal_main);
-
-        mTextView = (TextView) findViewById(R.id.text);
-
-        getActionBar().setHomeButtonEnabled(true);
-        getActionBar().setDisplayHomeAsUpEnabled(true);
-        getActionBar().setDisplayShowHomeEnabled(true);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.normal_main, menu);
-        mMenu = menu;
-        return true;
-    }
-
-    public Menu getMenu() {
-        return mMenu;
-    }
-
-    public void setOrientation(int requestedOrientation) {
-        //ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-        this.setRequestedOrientation(requestedOrientation);
-    }
-
-    public void clickOnMenuItem(int menuItemId, Instrumentation instruments) {
-        final Integer itemId = menuItemId;
-        instruments.runOnMainSync(new Runnable() {
-            public void run() {
-                if (mMenu != null) {
-                    mMenu.performIdentifierAction(itemId, 0);
-                }
-            }
-        });
-        instruments.waitForIdleSync();
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        // TODO Auto-generated method stub
-        mMenu = menu;
-        return super.onPrepareOptionsMenu(menu);
-    }
-
-    @Override
-    public void onOptionsMenuClosed(Menu menu) {
-        // TODO Auto-generated method stub
-        super.onOptionsMenuClosed(menu);
-        mMenu = null;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // TODO Auto-generated method stub
-        if (item.getItemId() == android.R.id.home) {
-            mTextView.setText(item.getTitle());
-            Toast.makeText(this, "Selected Item: " + item.getTitle(), Toast.LENGTH_SHORT).show();
-            return super.onOptionsItemSelected(item);
-        } else {
-            mTextView.setText(item.getTitle());
-            Toast.makeText(this, "Selected Item: " + item.getTitle(), Toast.LENGTH_SHORT).show();
-            return true;
-        }
-    }
-
-    public void onSort(MenuItem item) {
-        mTextView.setText(item.getTitle());
-        Toast.makeText(this, "Selected Item: " + item.getTitle(), Toast.LENGTH_SHORT).show();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarNormalTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarNormalTest.java
deleted file mode 100755
index d74758057bce7d4556cd9b527fe4f677057be36f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarNormalTest.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-
-import android.annotation.SuppressLint;
-import android.app.ActionBar;
-import android.content.pm.ActivityInfo;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-@SuppressLint({ "NewApi", "NewApi" })
-public class ActionBarNormalTest extends ActivityInstrumentationTestCase2<ActionBarNormalActivity> {
-
-    private ActionBarUtils mActionBarUtils;
-    private ActionBarNormalActivity mActivity;
-    private View mMenuView;
-    private Button mButton;
-    private TextView mTextView;
-
-    public ActionBarNormalTest() {
-        super("com.mediatek.common.widget.tests", ActionBarNormalActivity.class);
-    }
-    /*
-    public ActionBarTest(Class<ActionBarActivity> activityClass) {
-        super(activityClass);
-        // TODO Auto-generated constructor stub
-    }
-    */
-
-    @Override
-    protected void setUp() throws Exception {
-        // TODO Auto-generated method stub
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = (ActionBarNormalActivity) getActivity();
-        mActionBarUtils = new ActionBarUtils(mActivity, getInstrumentation());
-        mMenuView = (View) mActivity.findViewById(R.id.action_add);
-        mButton = (Button) mActivity.findViewById(R.id.button);
-        mTextView = (TextView) mActivity.findViewById(R.id.text);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        // TODO Auto-generated method stub
-        super.tearDown();
-        System.out.println("tearDown");
-    }
-
-    public void invokeMenuItem(int id) {
-        View menuItemView = (View) mActivity.findViewById(id);
-
-        if (menuItemView != null) {
-            //sendKeys(KeyEvent.KEYCODE_MENU);
-            mActivity.clickOnMenuItem(id, getInstrumentation());
-            //getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_ENTER);
-        } else {
-            getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_MENU);
-            mActionBarUtils.sleep(300);
-            mActivity.clickOnMenuItem(id, getInstrumentation());
-            //sleep(300);
-            //getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_ENTER);
-        }
-    }
-
-    public void testPreconditions() {
-
-
-        assertTrue(mActivity != null);
-        assertTrue(mButton != null);
-        assertTrue(mTextView != null);
-
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                ActionBar actionBar = mActivity.getActionBar();
-                int displayOptions;
-
-                assertTrue(actionBar.isShowing());
-
-                displayOptions = actionBar.getDisplayOptions();
-                assertTrue((displayOptions & ActionBar.DISPLAY_HOME_AS_UP) != 0);
-                assertTrue((displayOptions & ActionBar.DISPLAY_SHOW_HOME) != 0);
-
-                assertTrue(actionBar.getNavigationMode() == ActionBar.NAVIGATION_MODE_STANDARD);
-                assertTrue(actionBar.getCustomView() == null);
-                assertTrue(actionBar.getNavigationItemCount() == 0);
-                assertTrue(actionBar.getSelectedNavigationIndex() == -1);
-                assertTrue(actionBar.getSelectedTab() == null);
-                //assertTrue(actionBar.getTabAt(0) == null); // index out of bound
-                assertTrue(actionBar.getTabCount() == 0);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-    }
-
-    public void testActionBarHomeButton() throws InterruptedException {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                //((View)mMenuView).requestFocus();
-                //((View)mMenuView).callOnClick();
-                mActionBarUtils.clickOnActionBarHomeButton();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-        assertTrue("Can't click action bar home button", mTextView.getText().equals(mActivity.getTitle()));
-    }
-
-    public void testActionMenuItem() throws InterruptedException {
-        mActionBarUtils.clickOnActionBarItem(R.id.action_add);
-        getInstrumentation().waitForIdleSync();
-
-        assertTrue("Can't click action bar menu item", mTextView.getText().equals("action_bar_add"));
-    }
-
-
-    public void testOptionMenuItem() throws InterruptedException {
-        invokeMenuItem(R.id.action_edit);
-        getInstrumentation().waitForIdleSync();
-
-        assertTrue("Can't click action bar option menu item", mTextView.getText().equals("action_bar_edit"));
-    }
-
-    public void testOptionMenuSubItem() throws InterruptedException {
-        invokeMenuItem(R.id.action_sort);
-        getInstrumentation().waitForIdleSync();
-        mActivity.clickOnMenuItem(R.id.action_sort_size, getInstrumentation());
-        getInstrumentation().waitForIdleSync();
-
-        assertTrue("Can't click action bar option menu sub item", mTextView.getText().equals("action_bar_sort_size"));
-    }
-
-    public void testActionBarOrientation() throws InterruptedException {
-        mActivity.setOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-        getInstrumentation().waitForIdleSync();
-
-        assertTrue("test orientation", true);
-    }
-
-    public void testActionBarOptions() throws InterruptedException {
-
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                ActionBar actionBar = mActivity.getActionBar();
-
-                actionBar.setDisplayHomeAsUpEnabled(false);
-                assertTrue((actionBar.getDisplayOptions() & ActionBar.DISPLAY_HOME_AS_UP) == 0);
-                actionBar.setDisplayShowHomeEnabled(false);
-                assertTrue((actionBar.getDisplayOptions() & ActionBar.DISPLAY_SHOW_HOME) == 0);
-                actionBar.setDisplayShowTitleEnabled(false);
-                assertTrue((actionBar.getDisplayOptions() & ActionBar.DISPLAY_SHOW_TITLE) == 0);
-                actionBar.setDisplayUseLogoEnabled(false);
-                assertTrue((actionBar.getDisplayOptions() & ActionBar.DISPLAY_USE_LOGO) == 0);
-                actionBar.setDisplayShowCustomEnabled(false);
-                assertTrue((actionBar.getDisplayOptions() & ActionBar.DISPLAY_SHOW_CUSTOM) == 0);
-
-                actionBar.setDisplayHomeAsUpEnabled(true);
-                assertTrue((actionBar.getDisplayOptions() & ActionBar.DISPLAY_HOME_AS_UP) != 0);
-                actionBar.setDisplayShowHomeEnabled(true);
-                assertTrue((actionBar.getDisplayOptions() & ActionBar.DISPLAY_SHOW_HOME) != 0);
-                actionBar.setDisplayShowTitleEnabled(true);
-                assertTrue((actionBar.getDisplayOptions() & ActionBar.DISPLAY_SHOW_TITLE) != 0);
-                actionBar.setDisplayUseLogoEnabled(true);
-                assertTrue((actionBar.getDisplayOptions() & ActionBar.DISPLAY_USE_LOGO) != 0);
-                actionBar.setDisplayShowCustomEnabled(true);
-                assertTrue((actionBar.getDisplayOptions() & ActionBar.DISPLAY_SHOW_CUSTOM) != 0);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-    }
-
-    public void testActionBarProperties() throws InterruptedException {
-
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                ActionBar actionBar = mActivity.getActionBar();
-
-                actionBar.setTitle("test");
-                assertEquals(actionBar.getTitle(), "test");
-
-                actionBar.setSubtitle("test subtitle");
-                assertEquals(actionBar.getSubtitle(), "test subtitle");
-
-                //Drawable drawable = mActivity.getResources().getDrawable(android.R.drawable.ic_menu_add);
-                //actionBar.setIcon(drawable);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarOrientationChangedActivity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarOrientationChangedActivity.java
deleted file mode 100755
index fffcfe69e4a30eea8c40c8725303cc26f4e3a1d1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarOrientationChangedActivity.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.os.Bundle;
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.app.Instrumentation;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.TextView;
-import android.widget.Toast;
-
-@TargetApi(11)
-@SuppressLint("NewApi")
-public class ActionBarOrientationChangedActivity extends Activity {
-    private Menu mMenu;
-    private TextView mTextView;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.normal_main);
-
-        mTextView = (TextView) findViewById(R.id.text);
-
-        getActionBar().setHomeButtonEnabled(true);
-        getActionBar().setDisplayHomeAsUpEnabled(true);
-        getActionBar().setDisplayShowHomeEnabled(true);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.normal_main, menu);
-        mMenu = menu;
-        return true;
-    }
-
-    public Menu getMenu() {
-        return mMenu;
-    }
-
-    public void setOrientation(int requestedOrientation) {
-        //ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-        this.setRequestedOrientation(requestedOrientation);
-    }
-
-    public void clickOnMenuItem(int menuItemId, Instrumentation instruments) {
-        final Integer itemId = menuItemId;
-        instruments.runOnMainSync(new Runnable() {
-            public void run() {
-                if (mMenu != null) {
-                    mMenu.performIdentifierAction(itemId, 0);
-                }
-            }
-        });
-        instruments.waitForIdleSync();
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        // TODO Auto-generated method stub
-        mMenu = menu;
-        return super.onPrepareOptionsMenu(menu);
-    }
-
-    @Override
-    public void onOptionsMenuClosed(Menu menu) {
-        // TODO Auto-generated method stub
-        super.onOptionsMenuClosed(menu);
-        mMenu = null;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // TODO Auto-generated method stub
-        if (item.getItemId() == android.R.id.home) {
-            mTextView.setText(item.getTitle());
-            Toast.makeText(this, "Selected Item: " + item.getTitle(), Toast.LENGTH_SHORT).show();
-            return super.onOptionsItemSelected(item);
-        } else {
-            mTextView.setText(item.getTitle());
-            Toast.makeText(this, "Selected Item: " + item.getTitle(), Toast.LENGTH_SHORT).show();
-            return true;
-        }
-    }
-
-    public void onSort(MenuItem item) {
-        mTextView.setText(item.getTitle());
-        Toast.makeText(this, "Selected Item: " + item.getTitle(), Toast.LENGTH_SHORT).show();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarOrientationChangedTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarOrientationChangedTest.java
deleted file mode 100755
index abbafc64620c9a3caa013d1b280a195b4ab84bd6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarOrientationChangedTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-
-import android.annotation.SuppressLint;
-import android.content.pm.ActivityInfo;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-@SuppressLint({ "NewApi", "NewApi" })
-public class ActionBarOrientationChangedTest extends ActivityInstrumentationTestCase2<ActionBarOrientationChangedActivity> {
-
-    private ActionBarUtils mActionBarUtils;;
-    private ActionBarOrientationChangedActivity mActivity;
-    private View mMenuView;
-    private Button mButton;
-    private TextView mTextView;
-
-    public ActionBarOrientationChangedTest() {
-        super("com.mediatek.common.widget.tests", ActionBarOrientationChangedActivity.class);
-    }
-    /*
-    public ActionBarTest(Class<ActionBarActivity> activityClass) {
-        super(activityClass);
-        // TODO Auto-generated constructor stub
-    }
-    */
-
-    @Override
-    protected void setUp() throws Exception {
-        // TODO Auto-generated method stub
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = (ActionBarOrientationChangedActivity) getActivity();
-        mActionBarUtils = new ActionBarUtils(mActivity, getInstrumentation());
-        mMenuView = (View) mActivity.findViewById(R.id.action_add);
-        mButton = (Button) mActivity.findViewById(R.id.button);
-        mTextView = (TextView) mActivity.findViewById(R.id.text);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        // TODO Auto-generated method stub
-        super.tearDown();
-        System.out.println("tearDown");
-    }
-
-    public void testPreConditions() {
-        assertTrue(mActivity != null);
-        assertTrue(mButton != null);
-        assertTrue(mTextView != null);
-    }
-
-
-    public void testActionBarOrientation() throws InterruptedException {
-        mActivity.setOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-        getInstrumentation().waitForIdleSync();
-
-        assertTrue("test orientation", true);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarSplitActionBarActivity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarSplitActionBarActivity.java
deleted file mode 100755
index 1083b249c942bf428cecaa3dbdfb8a3253c0d1e1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarSplitActionBarActivity.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.os.Bundle;
-import android.app.Activity;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.TextView;
-
-public class ActionBarSplitActionBarActivity extends Activity {
-    private TextView mTextView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.split_action_bar_main);
-        mTextView = (TextView) findViewById(R.id.text);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.split_action_bar, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        mTextView.setText(item.getTitle());
-        return super.onOptionsItemSelected(item);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarSplitActionBarTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarSplitActionBarTest.java
deleted file mode 100755
index 1a308e8ac22aca43de41e7cd8f77cc64a53bb22a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarSplitActionBarTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.app.ActionBar;
-import android.test.ActivityInstrumentationTestCase2;
-import android.widget.TextView;
-
-@SuppressLint("NewApi")
-@TargetApi(15)
-public class ActionBarSplitActionBarTest extends ActivityInstrumentationTestCase2<ActionBarSplitActionBarActivity> {
-    private ActionBarSplitActionBarActivity mActivity;
-    private TextView mTextView;
-
-    private ActionBarUtils mActionBarUtils;
-
-    public ActionBarSplitActionBarTest() {
-        super("com.mediatek.common.widget.tests", ActionBarSplitActionBarActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        // TODO Auto-generated method stub
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = (ActionBarSplitActionBarActivity) getActivity();
-        mActionBarUtils = new ActionBarUtils(mActivity, getInstrumentation());
-        mTextView = (TextView) mActivity.findViewById(R.id.text);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        // TODO Auto-generated method stub
-        super.tearDown();
-        System.out.println("tearDown");
-    }
-
-    public void testPreConditions() {
-        assertTrue(mActivity != null);
-        assertTrue(mTextView != null);
-    }
-
-    public void testSplitActionBar() {
-        ActionBar actionBar = mActivity.getActionBar();
-
-        mActionBarUtils.clickOnActionBarItem(R.id.simple_item);
-        getInstrumentation().waitForIdleSync();
-        assertTrue("the text is wrong", mTextView.getText().equals("option 1"));
-        mActionBarUtils.clickOnActionBarItem(R.id.simple_item2);
-        getInstrumentation().waitForIdleSync();
-        assertTrue("the text is wrong", mTextView.getText().equals("option 2"));
-        mActionBarUtils.clickOnActionBarItem(R.id.simple_item3);
-        getInstrumentation().waitForIdleSync();
-        assertTrue("the text is wrong", mTextView.getText().equals("option 3"));
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarTabActivity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarTabActivity.java
deleted file mode 100755
index d740abac9fc53cfe42703fcd90c0a5808dc3ef4d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarTabActivity.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.os.Bundle;
-import android.app.ActionBar;
-import android.app.ActionBar.LayoutParams;
-import android.app.ActionBar.Tab;
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.FragmentTransaction;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import android.widget.Toast;
-
-public class ActionBarTabActivity extends Activity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.action_bar_tabs);
-
-        final ActionBar bar = getActionBar();
-        int flags = ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_TITLE | ActionBar.DISPLAY_SHOW_CUSTOM;
-        bar.setDisplayOptions(flags);
-
-        View mCustomView = null;
-        mCustomView = getLayoutInflater().inflate(R.layout.action_bar_display_options_custom, null);
-        bar.setCustomView(mCustomView,
-                new ActionBar.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
-    }
-
-    public void onAddTab(View v) {
-        final ActionBar bar = getActionBar();
-        final int tabCount = bar.getTabCount();
-        final String text = "Tab " + tabCount;
-        bar.addTab(bar.newTab().setText(text)
-                .setTabListener(new TabListener(new TabContentFragment(text))));
-    }
-
-    public void onRemoveTab(View v) {
-        final ActionBar bar = getActionBar();
-        if (bar.getTabCount() > 0) {
-            bar.removeTabAt(bar.getTabCount() - 1);
-        }
-    }
-
-    public void onToggleTabs(View v) {
-        final ActionBar bar = getActionBar();
-        if (bar.getNavigationMode() == ActionBar.NAVIGATION_MODE_TABS) {
-            bar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
-            bar.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE,
-                    ActionBar.DISPLAY_SHOW_TITLE);
-        } else {
-            bar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
-            bar.setDisplayOptions(bar.getDisplayOptions(), ActionBar.DISPLAY_SHOW_TITLE);
-        }
-    }
-
-    public void onRemoveAllTabs(View v) {
-        getActionBar().removeAllTabs();
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.display_options_actions, menu);
-        return true;
-    }
-
-    private class TabListener implements ActionBar.TabListener {
-        private TabContentFragment mFragment;
-
-        public TabListener(TabContentFragment fragment) {
-            mFragment = fragment;
-        }
-
-        public void onTabSelected(Tab tab, FragmentTransaction ft) {
-            ft.add(R.id.fragment_content, mFragment, mFragment.getText());
-        }
-
-        public void onTabUnselected(Tab tab, FragmentTransaction ft) {
-            ft.remove(mFragment);
-        }
-
-        public void onTabReselected(Tab tab, FragmentTransaction ft) {
-            Toast.makeText(ActionBarTabActivity.this, "Reselected!",
-                    Toast.LENGTH_SHORT).show();
-        }
-    }
-
-    private class TabContentFragment extends Fragment {
-
-        private String mText;
-
-        public TabContentFragment(String text) {
-            mText = text;
-        }
-
-        public String getText() {
-            return mText;
-        }
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            View fragView = inflater.inflate(R.layout.action_bar_tab_content,
-                    container, false);
-            TextView text = (TextView) fragView.findViewById(R.id.text);
-            text.setText(mText);
-            return fragView;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarTabTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarTabTest.java
deleted file mode 100755
index 8fe277761ab43156b57a731b8c775ee193589b91..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarTabTest.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.app.ActionBar;
-import android.test.ActivityInstrumentationTestCase2;
-import android.widget.Button;
-
-@SuppressLint("NewApi")
-@TargetApi(15)
-public class ActionBarTabTest extends ActivityInstrumentationTestCase2<ActionBarTabActivity> {
-    private ActionBarTabActivity mActivity;
-    private Button mAddTabBtn;
-    private Button mRemoveTabBtn;
-    private Button mToggleTabsBtn;
-    private Button mRemoveAllTabsBtn;
-
-    public ActionBarTabTest() {
-        super("com.mediatek.common.widget.tests", ActionBarTabActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        // TODO Auto-generated method stub
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = (ActionBarTabActivity) getActivity();
-        mAddTabBtn = (Button) mActivity.findViewById(R.id.btn_add_tab);
-        mRemoveTabBtn = (Button) mActivity.findViewById(R.id.btn_remove_tab);
-        mToggleTabsBtn = (Button) mActivity.findViewById(R.id.btn_toggle_tabs);
-        mRemoveAllTabsBtn = (Button) mActivity.findViewById(R.id.btn_remove_all_tabs);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        // TODO Auto-generated method stub
-        super.tearDown();
-        System.out.println("tearDown");
-    }
-
-    public void testPreConditions() {
-        assertTrue(mActivity != null);
-        assertTrue(mAddTabBtn != null);
-        assertTrue(mRemoveTabBtn != null);
-        assertTrue(mToggleTabsBtn != null);
-        assertTrue(mRemoveAllTabsBtn != null);
-
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mToggleTabsBtn.requestFocus();
-                mToggleTabsBtn.callOnClick();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                ActionBar actionBar = mActivity.getActionBar();
-                assertTrue("navigation mode is not tab", actionBar.getNavigationMode() == ActionBar.NAVIGATION_MODE_TABS);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-    }
-
-    public void testAddTabs() {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                ActionBar actionBar = mActivity.getActionBar();
-
-                mToggleTabsBtn.requestFocus();
-                mToggleTabsBtn.callOnClick();
-
-                mAddTabBtn.requestFocus();
-                mAddTabBtn.callOnClick();
-                mAddTabBtn.callOnClick();
-                mAddTabBtn.callOnClick();
-
-                assertTrue("tab count is wrong", actionBar.getTabCount() == 3);
-                assertTrue("navigation count is wrong", actionBar.getNavigationItemCount() == actionBar.getTabCount());
-                assertNotNull(actionBar.getTabAt(0));
-                assertNotNull(actionBar.getTabAt(1));
-                assertNotNull(actionBar.getTabAt(2));
-                assertEquals(actionBar.getTabAt(0).getText(), "Tab " + 0);
-                assertEquals(actionBar.getTabAt(1).getText(), "Tab " + 1);
-                assertEquals(actionBar.getTabAt(2).getText(), "Tab " + 2);
-
-                actionBar.removeTabAt(1);
-                assertTrue("tab count is wrong", actionBar.getTabCount() == 2);
-                assertEquals(actionBar.getTabAt(0).getText(), "Tab " + 0);
-                assertEquals(actionBar.getTabAt(1).getText(), "Tab " + 2);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-    }
-
-    public void testRemoveTabs() {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                ActionBar actionBar = mActivity.getActionBar();
-
-                mToggleTabsBtn.requestFocus();
-                mToggleTabsBtn.callOnClick();
-
-                mAddTabBtn.requestFocus();
-                mAddTabBtn.callOnClick();
-                mAddTabBtn.callOnClick();
-                mAddTabBtn.callOnClick();
-
-                mRemoveTabBtn.requestFocus();
-                mRemoveTabBtn.callOnClick();
-                assertTrue("tab count is wrong", actionBar.getTabCount() == 2);
-                mRemoveTabBtn.callOnClick();
-                assertTrue("tab count is wrong", actionBar.getTabCount() == 1);
-                mRemoveTabBtn.callOnClick();
-                assertTrue("tab count is wrong", actionBar.getTabCount() == 0);
-                assertTrue("navigation count is wrong", actionBar.getNavigationItemCount() == actionBar.getTabCount());
-
-                mAddTabBtn.requestFocus();
-                mAddTabBtn.callOnClick();
-                mAddTabBtn.callOnClick();
-                mAddTabBtn.callOnClick();
-
-                mRemoveAllTabsBtn.requestFocus();
-                mRemoveAllTabsBtn.callOnClick();
-                assertTrue("tab count is wrong", actionBar.getTabCount() == 0);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-    }
-
-    public void testOthers() {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                ActionBar actionBar = mActivity.getActionBar();
-
-                mToggleTabsBtn.requestFocus();
-                mToggleTabsBtn.callOnClick();
-
-                mAddTabBtn.requestFocus();
-                mAddTabBtn.callOnClick();
-                mAddTabBtn.callOnClick();
-
-                assertTrue("select wrong tab", actionBar.getTabAt(0) == actionBar.getSelectedTab());
-                actionBar.setSelectedNavigationItem(1);
-                assertTrue("select wrong tab", actionBar.getTabAt(1) == actionBar.getSelectedTab());
-                actionBar.selectTab(actionBar.getTabAt(0));
-                assertTrue("select wrong tab", actionBar.getTabAt(0) == actionBar.getSelectedTab());
-
-                actionBar.selectTab(null);
-                assertNull(actionBar.getSelectedTab());
-
-                // index out of bound
-                //actionBar.selectTab(actionBar.getTabAt(0));
-                //actionBar.setSelectedNavigationItem(Tab.INVALID_POSITION);
-
-
-
-                //assertNull(actionBar.getSelectedTab());
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarUtils.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarUtils.java
deleted file mode 100755
index 7eec7f9e7f2ef81d611a1d9dc7b1ed2ea47b57de..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ActionBarUtils.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import java.lang.reflect.Constructor;
-
-import junit.framework.Assert;
-
-import android.app.Activity;
-import android.app.Instrumentation;
-import android.content.Context;
-import android.os.SystemClock;
-import android.util.Log;
-import android.view.KeyCharacterMap;
-import android.view.KeyEvent;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.ViewConfiguration;
-import android.view.Window;
-
-public class ActionBarUtils {
-    private final int TIMEOUT = 10000;
-    private Activity mActivity;
-    private Instrumentation mInstrumentation;
-
-    public ActionBarUtils(Activity activity, Instrumentation instrumentation) {
-        mActivity = activity;
-        mInstrumentation = instrumentation;
-    }
-
-    public void sleepMini() {
-        sleep(300);
-    }
-
-    public void sleep(int time) {
-        try {
-            Thread.sleep(time);
-        } catch (InterruptedException ignored) { }
-    }
-
-    public void clickOnActionBarHomeButton() {
-        MenuItem homeMenuItem = null;
-
-        try {
-            Class<?> cls = Class.forName("com.android.internal.view.menu.ActionMenuItem");
-            Class<?> partypes[] = new Class[6];
-            partypes[0] = Context.class;
-            partypes[1] = Integer.TYPE;
-            partypes[2] = Integer.TYPE;
-            partypes[3] = Integer.TYPE;
-            partypes[4] = Integer.TYPE;
-            partypes[5] = CharSequence.class;
-            Constructor<?> ct = cls.getConstructor(partypes);
-            Object argList[] = new Object[6];
-            argList[0] = mActivity;
-            argList[1] = 0;
-            argList[2] = android.R.id.home;
-            argList[3] = 0;
-            argList[4] = 0;
-            argList[5] = mActivity.getTitle();
-            homeMenuItem = (MenuItem) ct.newInstance(argList);
-        } catch (Exception ex) {
-            Log.d("ActionBarTest", "Can not find methods to invoke Home button.");
-        }
-
-        if (homeMenuItem != null) {
-            mActivity.getWindow().getCallback().onMenuItemSelected(Window.FEATURE_OPTIONS_PANEL, homeMenuItem);
-        }
-    }
-
-    public void clickOnActionBarItem(int resourceId) {
-        mInstrumentation.invokeMenuActionSync(mActivity, resourceId, 0);
-    }
-
-    public void doSearch(String query) {
-        mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_SEARCH);
-
-        KeyCharacterMap keymap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);
-        for (KeyEvent key : keymap.getEvents(query.toCharArray())) {
-            mInstrumentation.sendKeySync(key);
-        }
-        mInstrumentation.sendCharacterSync(KeyEvent.KEYCODE_ENTER);
-
-        /*
-            Instrumentation instrumentation = getInstrumentation();
-            instrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_SEARCH);
-            instrumentation.sendCharacterSync(KeyEvent.KEYCODE_F);
-            instrumentation.sendCharacterSync(KeyEvent.KEYCODE_O);
-            instrumentation.sendCharacterSync(KeyEvent.KEYCODE_O);
-         * */
-    }
-
-    public void clickOnScreen(float x, float y) {
-        long downTime = SystemClock.uptimeMillis();
-        long eventTime = SystemClock.uptimeMillis();
-        MotionEvent event = MotionEvent.obtain(downTime, eventTime,
-                MotionEvent.ACTION_DOWN, x, y, 0);
-        MotionEvent event2 = MotionEvent.obtain(downTime, eventTime,
-                MotionEvent.ACTION_UP, x, y, 0);
-        try {
-            mInstrumentation.sendPointerSync(event);
-            mInstrumentation.sendPointerSync(event2);
-            sleepMini();
-        } catch (SecurityException e) {
-            Assert.assertTrue("Click can not be completed!", false);
-        }
-    }
-
-    public void clickLongOnScreen(float x, float y, int time) {
-        long downTime = SystemClock.uptimeMillis();
-        long eventTime = SystemClock.uptimeMillis();
-        MotionEvent event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_DOWN, x, y, 0);
-        try {
-            mInstrumentation.sendPointerSync(event);
-        } catch (SecurityException e) {
-            Assert.assertTrue("Click can not be completed! Something is in the way e.g. the keyboard.", false);
-        }
-        eventTime = SystemClock.uptimeMillis();
-        event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_MOVE,
-                x + ViewConfiguration.getTouchSlop() / 2,
-                y + ViewConfiguration.getTouchSlop() / 2, 0);
-        mInstrumentation.sendPointerSync(event);
-        if (time > 0)
-            sleep(time);
-        else
-            sleep((int) (ViewConfiguration.getLongPressTimeout() * 2.5f));
-
-        eventTime = SystemClock.uptimeMillis();
-        event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_UP, x, y, 0);
-        mInstrumentation.sendPointerSync(event);
-        sleep(500);
-    }
-
-    public void drag(float fromX, float toX, float fromY, float toY,
-            int stepCount) {
-        long downTime = SystemClock.uptimeMillis();
-        long eventTime = SystemClock.uptimeMillis();
-        float y = fromY;
-        float x = fromX;
-        float yStep = (toY - fromY) / stepCount;
-        float xStep = (toX - fromX) / stepCount;
-        MotionEvent event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_DOWN, fromX, fromY, 0);
-        try {
-            mInstrumentation.sendPointerSync(event);
-        } catch (SecurityException ignored) { }
-        for (int i = 0; i < stepCount; ++i) {
-            y += yStep;
-            x += xStep;
-            eventTime = SystemClock.uptimeMillis();
-            event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_MOVE, x, y, 0);
-            try {
-                mInstrumentation.sendPointerSync(event);
-            } catch (SecurityException ignored) { }
-        }
-        eventTime = SystemClock.uptimeMillis();
-        event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_UP, toX, toY, 0);
-        try {
-            mInstrumentation.sendPointerSync(event);
-        } catch (SecurityException ignored) { }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/AutoCompleteTextViewCallbacks.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/AutoCompleteTextViewCallbacks.java
deleted file mode 100755
index fa5cec54592da03f086c2f712f8966bc92be90d1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/AutoCompleteTextViewCallbacks.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests;
-
-import android.app.Instrumentation;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.FlakyTest;
-
-import android.widget.AutoCompleteTextView;
-
-// TODO: tests fail intermittently. Add back MediumTest annotation when fixed
-public class AutoCompleteTextViewCallbacks
-        extends ActivityInstrumentationTestCase2<AutoCompleteTextViewSimple> {
-
-    private static final int WAIT_TIME = 200;
-
-    public AutoCompleteTextViewCallbacks() {
-        super("com.mediatek.common.widget.tests", AutoCompleteTextViewSimple.class);
-    }
-
-    /** Test that the initial popup of the suggestions does not select anything.
-     */
-    @FlakyTest(tolerance = 3)
-    public void testPopupNoSelection() throws Exception {
-        AutoCompleteTextViewSimple theActivity = getActivity();
-        AutoCompleteTextView textView = theActivity.getTextView();
-        final Instrumentation instrumentation = getInstrumentation();
-
-        // focus and type
-        textView.requestFocus();
-        instrumentation.waitForIdleSync();
-        sendKeys("A");
-        instrumentation.waitForIdleSync();
-        // give UI time to settle
-        Thread.sleep(WAIT_TIME);
-
-        // now check for selection callbacks.  Nothing should be clicked or selected.
-        assertFalse("onItemClick should not be called", theActivity.mItemClickCalled);
-        assertFalse("onItemSelected should not be called", theActivity.mItemSelectedCalled);
-
-        // arguably, this should be "false", because we aren't deselecting - we shouldn't
-        // really be calling it.  But it's not the end of the world, and we might wind up
-        // breaking something if we change this.
-        //assertTrue("onNothingSelected should be called", theActivity.mNothingSelectedCalled);
-    }
-
-    /** Test that arrow-down into the popup calls the onSelected callback. */
-    /*  Test case Fail
-    @FlakyTest(tolerance=3)
-    public void testPopupEnterSelection() throws Exception {
-        final AutoCompleteTextViewSimple theActivity = getActivity();
-        AutoCompleteTextView textView = theActivity.getTextView();
-        final Instrumentation instrumentation = getInstrumentation();
-
-        // focus and type
-        textView.requestFocus();
-        instrumentation.waitForIdleSync();
-        sendKeys("A");
-
-        textView.post(new Runnable() {
-            public void run() {
-                // prepare to move down into the popup
-                theActivity.resetItemListeners();
-            }
-        });
-
-        sendKeys("DPAD_DOWN");
-        instrumentation.waitForIdleSync();
-        // give UI time to settle
-        Thread.sleep(WAIT_TIME);
-
-        // now check for selection callbacks.
-        assertFalse("onItemClick should not be called", theActivity.mItemClickCalled);
-        assertTrue("onItemSelected should be called", theActivity.mItemSelectedCalled);
-        assertEquals("onItemSelected position", 0, theActivity.mItemSelectedPosition);
-        assertFalse("onNothingSelected should not be called", theActivity.mNothingSelectedCalled);
-
-        textView.post(new Runnable() {
-            public void run() {
-                // try one more time - should move from 0 to 1
-                theActivity.resetItemListeners();
-            }
-        });
-
-        sendKeys("DPAD_DOWN");
-        instrumentation.waitForIdleSync();
-        // give UI time to settle
-        Thread.sleep(WAIT_TIME);
-
-        // now check for selection callbacks.
-        assertFalse("onItemClick should not be called", theActivity.mItemClickCalled);
-        assertTrue("onItemSelected should be called", theActivity.mItemSelectedCalled);
-        assertEquals("onItemSelected position", 1, theActivity.mItemSelectedPosition);
-        assertFalse("onNothingSelected should not be called", theActivity.mNothingSelectedCalled);
-    }
-    */
-
-    /** Test that arrow-up out of the popup calls the onNothingSelected callback */
-    /*  Test case Fail
-    @FlakyTest(tolerance=3)
-    public void testPopupLeaveSelection() {
-        final AutoCompleteTextViewSimple theActivity = getActivity();
-        AutoCompleteTextView textView = theActivity.getTextView();
-        final Instrumentation instrumentation = getInstrumentation();
-
-        // focus and type
-        textView.requestFocus();
-        instrumentation.waitForIdleSync();
-        sendKeys("A");
-        instrumentation.waitForIdleSync();
-
-        // move down into the popup
-        sendKeys("DPAD_DOWN");
-        instrumentation.waitForIdleSync();
-
-        textView.post(new Runnable() {
-            public void run() {
-                // prepare to move down into the popup
-                theActivity.resetItemListeners();
-            }
-        });
-
-        sendKeys("DPAD_UP");
-        instrumentation.waitForIdleSync();
-
-        // now check for selection callbacks.
-        assertFalse("onItemClick should not be called", theActivity.mItemClickCalled);
-        assertFalse("onItemSelected should not be called", theActivity.mItemSelectedCalled);
-        assertTrue("onNothingSelected should be called", theActivity.mNothingSelectedCalled);
-    }
-    */
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/AutoCompleteTextViewPopup.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/AutoCompleteTextViewPopup.java
deleted file mode 100755
index 10fedf84f10495bae2de61a4ab9a512b896423f8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/AutoCompleteTextViewPopup.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests;
-
-import android.app.Instrumentation;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.FlakyTest;
-
-import android.widget.AutoCompleteTextView;
-import android.widget.ListView;
-import android.widget.ArrayAdapter;
-
-/**
- * A collection of tests on aspects of the AutoCompleteTextView's popup
- *
- * TODO: tests fail intermittently. Add back MediumTest annotation when fixed
- */
-public class AutoCompleteTextViewPopup
-        extends ActivityInstrumentationTestCase2<AutoCompleteTextViewSimple> {
-
-    // ms to sleep when checking for intermittent UI state
-    private static final int SLEEP_TIME = 50;
-    // number of times to poll when checking expected UI state
-    // total wait time will be LOOP_AMOUNT * SLEEP_TIME
-    private static final int LOOP_AMOUNT = 10;
-
-
-    public AutoCompleteTextViewPopup() {
-        super("com.mediatek.common.widget.tests", AutoCompleteTextViewSimple.class);
-    }
-
-    /** Test that we can move the selection and it responds as expected */
-    @FlakyTest(tolerance = 3)
-    public void testPopupSetListSelection() throws Throwable {
-        AutoCompleteTextViewSimple theActivity = getActivity();
-        final AutoCompleteTextView textView = theActivity.getTextView();
-        final Instrumentation instrumentation = getInstrumentation();
-
-        // focus and type
-        textView.requestFocus();
-        instrumentation.waitForIdleSync();
-        sendKeys("A");
-
-        // No initial selection
-        waitAssertListSelection(textView, ListView.INVALID_POSITION);
-
-        // set and check
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                textView.setListSelection(0);
-            }
-        });
-        instrumentation.waitForIdleSync();
-        waitAssertListSelection("set selection to (0)", textView, 0);
-
-        // Use movement to cross-check the movement
-        sendKeys("DPAD_DOWN");
-        waitAssertListSelection("move selection to (1)", textView, 1);
-
-        // TODO: FlakyTest repeat runs will not currently call setUp, clear state
-        clearText(textView);
-    }
-
-    /** Test that we can look at the selection as we move around */
-    @FlakyTest(tolerance = 3)
-    public void testPopupGetListSelection() throws Throwable {
-        AutoCompleteTextViewSimple theActivity = getActivity();
-        final AutoCompleteTextView textView = theActivity.getTextView();
-        final Instrumentation instrumentation = getInstrumentation();
-
-        // focus and type
-        textView.requestFocus();
-        instrumentation.waitForIdleSync();
-        sendKeys("A");
-
-        // No initial selection
-        waitAssertListSelection(textView, ListView.INVALID_POSITION);
-
-        // check for selection position as expected
-        sendKeys("DPAD_DOWN");
-        waitAssertListSelection("move selection to (0)", textView, 0);
-
-        // Repeat for one more movement
-        sendKeys("DPAD_DOWN");
-        waitAssertListSelection("move selection to (1)", textView, 1);
-
-        // TODO: FlakyTest repeat runs will not currently call setUp, clear state
-        clearText(textView);
-    }
-
-    /** Test that we can clear the selection */
-    @FlakyTest(tolerance = 3)
-    public void testPopupClearListSelection() throws Throwable {
-        AutoCompleteTextViewSimple theActivity = getActivity();
-        final AutoCompleteTextView textView = theActivity.getTextView();
-        final Instrumentation instrumentation = getInstrumentation();
-
-        // focus and type
-        textView.requestFocus();
-        instrumentation.waitForIdleSync();
-        sendKeys("A");
-
-        // No initial selection
-        waitAssertListSelection(textView, ListView.INVALID_POSITION);
-
-        // check for selection position as expected
-        sendKeys("DPAD_DOWN");
-        waitAssertListSelection(textView, 0);
-
-        // clear it
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                textView.clearListSelection();
-            }
-        });
-        instrumentation.waitForIdleSync();
-        waitAssertListSelection("setListSelection(ListView.INVALID_POSITION)", textView,
-                ListView.INVALID_POSITION);
-
-        // TODO: FlakyTest repeat runs will not currently call setUp, clear state
-        clearText(textView);
-    }
-
-    /** Make sure we handle an empty adapter properly */
-    @FlakyTest(tolerance = 3)
-    public void testPopupNavigateNoAdapter() throws Throwable {
-        AutoCompleteTextViewSimple theActivity = getActivity();
-        final AutoCompleteTextView textView = theActivity.getTextView();
-        final Instrumentation instrumentation = getInstrumentation();
-
-        // focus and type
-        textView.requestFocus();
-        instrumentation.waitForIdleSync();
-        sendKeys("A");
-
-        // No initial selection
-         waitAssertListSelection(textView, ListView.INVALID_POSITION);
-
-        // check for selection position as expected
-        sendKeys("DPAD_DOWN");
-        waitAssertListSelection(textView, 0);
-
-        // Now get rid of the adapter
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                textView.setAdapter((ArrayAdapter<?>) null);
-            }
-        });
-        instrumentation.waitForIdleSync();
-
-        // now try moving "down" - nothing should happen since there's no longer an adapter
-        sendKeys("DPAD_DOWN");
-
-        // TODO: FlakyTest repeat runs will not currently call setUp, clear state
-        clearText(textView);
-    }
-
-    /** Test the show/hide behavior of the drop-down. */
-    @FlakyTest(tolerance = 3)
-    public void testPopupShow() throws Throwable {
-        AutoCompleteTextViewSimple theActivity = getActivity();
-        final AutoCompleteTextView textView = theActivity.getTextView();
-        final Instrumentation instrumentation = getInstrumentation();
-
-        // Drop-down should not be showing when no text has been entered
-        assertFalse("isPopupShowing() on start", textView.isPopupShowing());
-
-        // focus and type
-        textView.requestFocus();
-        instrumentation.waitForIdleSync();
-        sendKeys("A");
-
-        // Drop-down should now be visible
-        waitAssertPopupShowState("isPopupShowing() after typing", textView, true);
-
-        // Clear the text
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                textView.setText("");
-            }
-        });
-        instrumentation.waitForIdleSync();
-
-        // Drop-down should be hidden when text is cleared
-        waitAssertPopupShowState("isPopupShowing() after text cleared", textView, false);
-
-        // Set the text, without filtering
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                textView.setText("a", false);
-            }
-        });
-        instrumentation.waitForIdleSync();
-
-        // Drop-down should still be hidden
-        waitAssertPopupShowState("isPopupShowing() after setText(\"a\", false)", textView, false);
-
-        // Set the text, now with filtering
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                textView.setText("a");
-            }
-        });
-        instrumentation.waitForIdleSync();
-
-        // Drop-down should show up after setText() with filtering
-        waitAssertPopupShowState("isPopupShowing() after text set", textView, true);
-
-        // TODO: FlakyTest repeat runs will not currently call setUp, clear state
-        clearText(textView);
-    }
-
-    private void waitAssertPopupShowState(String message, AutoCompleteTextView textView,
-            boolean expected) throws InterruptedException {
-        for (int i = 0; i < LOOP_AMOUNT; i++) {
-            if (textView.isPopupShowing() == expected) {
-                return;
-            }
-            Thread.sleep(SLEEP_TIME);
-        }
-        assertEquals(message, expected, textView.isPopupShowing());
-    }
-
-    private void waitAssertListSelection(AutoCompleteTextView textView, int expected)
-            throws Exception {
-        waitAssertListSelection("getListSelection()", textView, expected);
-    }
-
-    private void waitAssertListSelection(String message, AutoCompleteTextView textView,
-            int expected) throws Exception {
-        int currentSelection = ListView.INVALID_POSITION;
-        for (int i = 0; i < LOOP_AMOUNT; i++) {
-            currentSelection = textView.getListSelection();
-            if (expected == currentSelection) {
-                return;
-            }
-            Thread.sleep(SLEEP_TIME);
-        }
-        assertEquals(message, expected, textView.getListSelection());
-    }
-
-    private void clearText(final AutoCompleteTextView textView) throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                textView.setText("");
-            }
-        });
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/AutoCompleteTextViewSimple.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/AutoCompleteTextViewSimple.java
deleted file mode 100755
index daf4211444cb8565923e887f3cbf9940f7c90da4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/AutoCompleteTextViewSimple.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.ArrayAdapter;
-
-import android.widget.AutoCompleteTextView;
-
-public class AutoCompleteTextViewSimple extends Activity
-        implements OnItemClickListener, OnItemSelectedListener {
-
-    private final String LOG_TAG = "AutoCompleteTextViewSimple";
-
-    private AutoCompleteTextView mTextView;
-
-    /** These are cleared by resetItemListeners(), and set by the callback listeners */
-    public boolean mItemClickCalled;
-    public int mItemClickPosition;
-    public boolean mItemSelectedCalled;
-    public int mItemSelectedPosition;
-    public boolean mNothingSelectedCalled;
-
-    @Override
-    protected void onCreate(Bundle icicle)
-    {
-        // Be sure to call the super class.
-        super.onCreate(icicle);
-
-        // setup layout & views
-        setContentView(R.layout.autocompletetextview_simple);
-        mTextView = (AutoCompleteTextView) findViewById(R.id.autocompletetextview1);
-
-        // configure callbacks used for monitoring
-        mTextView.setOnItemClickListener(this);
-        mTextView.setOnItemSelectedListener(this);
-        resetItemListeners();
-
-        setStringAdapter(5, "a");
-    }
-
-    /**
-     * @return The AutoCompleteTextView used in this test activity.
-     */
-    public AutoCompleteTextView getTextView() {
-        return mTextView;
-    }
-
-    /**
-     * Set the autocomplete data to an adapter containing 0..n strings with a consistent prefix.
-     */
-    public void setStringAdapter(int numSuggestions, String prefix) {
-        // generate the string array
-        String[] strings = new String[numSuggestions];
-        for (int i = 0; i < numSuggestions; ++i) {
-            strings[i] = prefix + String.valueOf(i);
-        }
-
-        // install it with an adapter
-        ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,
-                android.R.layout.simple_dropdown_item_1line, strings);
-        mTextView.setAdapter(adapter);
-    }
-
-    /**
-     * For monitoring OnItemClickListener & OnItemSelectedListener
-     *
-     * An alternative here would be to provide a set of pass-through callbacks
-     */
-    public void resetItemListeners() {
-        mItemClickCalled = false;
-        mItemClickPosition = -1;
-        mItemSelectedCalled = false;
-        mItemSelectedPosition = -1;
-        mNothingSelectedCalled = false;
-    }
-
-    /**
-     * Implements OnItemClickListener
-     */
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        Log.d(LOG_TAG, "onItemClick() position " + position);
-        mItemClickCalled = true;
-        mItemClickPosition = position;
-    }
-
-    /**
-     * Implements OnItemSelectedListener
-     */
-    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-        Log.d(LOG_TAG, "onItemSelected() position " + position);
-        mItemSelectedCalled = true;
-        mItemSelectedPosition = position;
-    }
-
-    /**
-     * Implements OnItemSelectedListener
-     */
-    public void onNothingSelected(AdapterView<?> parent) {
-        Log.d(LOG_TAG, "onNothingSelected()");
-        mNothingSelectedCalled = true;
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/DatePickerDialogActivity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/DatePickerDialogActivity.java
deleted file mode 100755
index 24223035650838f4ae245ecffb5c30b0a0f1039d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/DatePickerDialogActivity.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.app.Activity;
-import android.app.DatePickerDialog;
-import android.os.Bundle;
-import android.widget.DatePicker;
-
-public class DatePickerDialogActivity extends Activity implements DatePickerDialog.OnDateSetListener {
-
-    public DatePickerDialog mDatePickerDialog;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        // TODO Auto-generated method stub
-        super.onCreate(savedInstanceState);
-        mDatePickerDialog = new DatePickerDialog(DatePickerDialogActivity.this, this, 2012, 12, 21);
-        mDatePickerDialog.show();
-    }
-
-    public DatePickerDialog getDialog() {
-        return mDatePickerDialog;
-    }
-
-    @Override
-    public void onDateSet(DatePicker view, int year, int monthOfYear,
-        int dayOfMonth) {
-        // TODO Auto-generated method stub
-        // Do nothing
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/DatePickerDialogTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/DatePickerDialogTest.java
deleted file mode 100755
index 21bbc9e7732559be5139ebb372e0d0197ec316dd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/DatePickerDialogTest.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-
-import android.app.DatePickerDialog;
-import android.app.Instrumentation;
-import android.os.SystemClock;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.ViewConfiguration;
-import android.widget.DatePicker;
-
-public class DatePickerDialogTest extends ActivityInstrumentationTestCase2<DatePickerDialogActivity> {
-
-    DatePickerDialogActivity mActivity;
-    DatePickerDialog mDatePickerDialog;
-    DatePicker mDatePicker;
-
-    public DatePickerDialogTest() {
-        super("android.app.activity.DatePickerDialogActivity", DatePickerDialogActivity.class);
-        // TODO Auto-generated constructor stub
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        // TODO Auto-generated method stub
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = (DatePickerDialogActivity) getActivity();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        // TODO Auto-generated method stub
-        super.tearDown();
-        System.out.println("tearDown");
-    }
-
-    public void testBackKeyHoldInitValue() {
-        mActivity.runOnUiThread(new Runnable() {
-
-        @Override
-        public void run() {
-            // TODO Auto-generated method stub
-        }
-        });
-
-        mDatePickerDialog = mActivity.getDialog();
-        mDatePicker = mDatePickerDialog.getDatePicker();
-
-        // generate a fake click event to test
-        Instrumentation inst = getInstrumentation();
-        int[] xy = new int[2];
-        mDatePicker.getLocationOnScreen(xy);
-
-        final int viewWidth = mDatePicker.getWidth();
-        final int viewHeight = mDatePicker.getHeight();
-
-        final float x = xy[0] + (viewWidth / 6.0f);
-        final float y = xy[1] + (viewHeight / 6.0f);
-
-        long downTime = SystemClock.uptimeMillis();
-        long eventTime = SystemClock.uptimeMillis();
-
-        MotionEvent event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_DOWN, x, y, 0);
-        inst.sendPointerSync(event);
-        inst.waitForIdleSync();
-
-        eventTime = SystemClock.uptimeMillis();
-        final int touchSlop = ViewConfiguration.get(mDatePicker.getContext()).getScaledTouchSlop();
-        event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_MOVE, x , y , 0);
-        inst.sendPointerSync(event);
-        inst.waitForIdleSync();
-
-        try {
-            Thread.sleep((long) (ViewConfiguration.getLongPressTimeout() * 3.0f));
-            //Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        eventTime = SystemClock.uptimeMillis();
-        event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_UP, x, y, 0);
-        inst.sendPointerSync(event);
-        inst.waitForIdleSync();
-
-        try {
-            Thread.sleep(3000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        this.sendKeys(KeyEvent.KEYCODE_BACK);
-
-        try {
-            Thread.sleep(3000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public void testTouchOutSideHoldInitValue() {
-
-        mActivity.runOnUiThread(new Runnable() {
-
-            @Override
-            public void run() {
-                // TODO Auto-generated method stub
-            }
-        });
-
-        mDatePickerDialog = mActivity.getDialog();
-        mDatePickerDialog.setCanceledOnTouchOutside(true);
-        mDatePicker = mDatePickerDialog.getDatePicker();
-
-        if (!mDatePickerDialog.isShowing()) {
-            mDatePickerDialog.show();
-        }
-
-        // generate a fake click event to test
-        Instrumentation inst = getInstrumentation();
-
-        float x = 50.0f;
-        float y = 50.0f;
-
-        long downTime = SystemClock.uptimeMillis();
-        long eventTime = SystemClock.uptimeMillis();
-
-        MotionEvent event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_DOWN, x, y, 0);
-        inst.sendPointerSync(event);
-        inst.waitForIdleSync();
-
-        eventTime = SystemClock.uptimeMillis();
-        final int touchSlop = ViewConfiguration.get(mDatePicker.getContext()).getScaledTouchSlop();
-        event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_MOVE, x + (touchSlop / 2.0f), y + (touchSlop / 2.0f), 0);
-        inst.sendPointerSync(event);
-        inst.waitForIdleSync();
-
-        eventTime = SystemClock.uptimeMillis();
-        event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_UP, x, y, 0);
-        inst.sendPointerSync(event);
-        inst.waitForIdleSync();
-
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/DialogFragmentActivity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/DialogFragmentActivity.java
deleted file mode 100755
index eea510b6bac61bd29cd5cdd5d6032b738a8ab618..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/DialogFragmentActivity.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import com.mediatek.common.widget.tests.EditNameDialog.EditNameDialogListener;
-
-import android.os.Bundle;
-import android.app.Activity;
-import android.app.FragmentManager;
-import android.widget.TextView;
-import android.widget.Toast;
-
-public class DialogFragmentActivity extends Activity implements EditNameDialogListener {
-    private TextView mTextView;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.dialog_fragment_main);
-        mTextView = (TextView) findViewById(R.id.text);
-        showEditDialog();
-    }
-
-    private void showEditDialog() {
-        FragmentManager fm = getFragmentManager();
-        EditNameDialog editNameDialog = new EditNameDialog();
-        editNameDialog.show(fm, "fragment_edit_name");
-    }
-
-    public void onFinishEditDialog(String inputText) {
-        Toast.makeText(this, "Hi, " + inputText, Toast.LENGTH_SHORT).show();
-        mTextView.setText("Hi, " + inputText);
-    }
-}
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/DialogFragmentTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/DialogFragmentTest.java
deleted file mode 100755
index 1d8db76a33e6cb0c0988b5e7234c6dd77da4647c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/DialogFragmentTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.app.ActionBar;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.KeyCharacterMap;
-import android.view.KeyEvent;
-import android.widget.TextView;
-
-@SuppressLint("NewApi")
-@TargetApi(15)
-public class DialogFragmentTest extends ActivityInstrumentationTestCase2<DialogFragmentActivity> {
-    private DialogFragmentActivity mActivity;
-    private TextView mTextView;
-
-    private ActionBarUtils mActionBarUtils;
-
-    public DialogFragmentTest() {
-        super("com.mediatek.common.widget.tests", DialogFragmentActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        // TODO Auto-generated method stub
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = (DialogFragmentActivity) getActivity();
-        mActionBarUtils = new ActionBarUtils(mActivity, getInstrumentation());
-        mTextView = (TextView) mActivity.findViewById(R.id.text);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        // TODO Auto-generated method stub
-        super.tearDown();
-        System.out.println("tearDown");
-    }
-
-    public void testPreConditions() {
-        assertTrue(mActivity != null);
-        assertTrue(mTextView != null);
-    }
-
-    public void testDialogFragment() {
-        ActionBar actionBar = mActivity.getActionBar();
-
-        getInstrumentation().waitForIdleSync();
-
-        KeyCharacterMap keymap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);
-        for (KeyEvent key : keymap.getEvents("test".toCharArray())) {
-            getInstrumentation().sendKeySync(key);
-        }
-        getInstrumentation().sendCharacterSync(KeyEvent.KEYCODE_ENTER);
-        getInstrumentation().waitForIdleSync();
-
-        //assertTrue("the text is wrong", mTextView.getText().equals("Hi, " + "test"));
-        assertTrue("", true);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/EditNameDialog.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/EditNameDialog.java
deleted file mode 100755
index 515cbab54b3f0aa0d5a698ccf7db6c05f1982b9d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/EditNameDialog.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.annotation.TargetApi;
-import android.app.DialogFragment;
-import android.os.Bundle;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager.LayoutParams;
-import android.view.inputmethod.EditorInfo;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.TextView.OnEditorActionListener;
-
-@TargetApi(11)
-public class EditNameDialog extends DialogFragment implements OnEditorActionListener {
-
-    private EditText mEditText;
-
-    public interface EditNameDialogListener {
-        void onFinishEditDialog(String inputText);
-    }
-
-    public EditNameDialog() {
-        // Empty constructor required for DialogFragment
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_edit_name, container);
-        mEditText = (EditText) view.findViewById(R.id.txt_your_name);
-        getDialog().setTitle("Hello");
-
-        // Show soft keyboard automatically
-        mEditText.requestFocus();
-        getDialog().getWindow().setSoftInputMode(
-                LayoutParams.SOFT_INPUT_STATE_VISIBLE);
-        mEditText.setOnEditorActionListener(this);
-        return view;
-    }
-
-    public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-        if (EditorInfo.IME_ACTION_DONE == actionId) {
-            // Return input text to activity
-            EditNameDialogListener activity = (EditNameDialogListener) getActivity();
-            activity.onFinishEditDialog(mEditText.getText().toString());
-            this.dismiss();
-            return true;
-        }
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/GestureDetectorActivity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/GestureDetectorActivity.java
deleted file mode 100755
index 2e53853e1cf4a4319546d054fd1c94f3fff5ea73..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/GestureDetectorActivity.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.os.Bundle;
-import android.util.Log;
-import android.view.GestureDetector;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.app.Activity;
-import android.view.GestureDetector.OnGestureListener;
-import android.view.animation.AnimationUtils;
-
-public class GestureDetectorActivity extends Activity {
-
-    public ViewGroup container1, container2;
-
-    private GestureDetector gestureDetector;
-
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.gesture_detector_main);
-
-        // 监听屏幕动作事件
-        SampleGuest gestureListener = new SampleGuest(this);
-        gestureDetector = new GestureDetector(gestureListener);
-
-        container1 = (ViewGroup) findViewById(R.id.container1);
-        container2 = (ViewGroup) findViewById(R.id.container2);
-    }
-
-    // called automatically, any screen action will Triggered it
-    public boolean onTouchEvent(MotionEvent event) {
-        if (gestureDetector.onTouchEvent(event))
-            return true;
-        else
-            return false;
-    }
-
-    public class SampleGuest implements OnGestureListener {
-        GestureDetectorActivity se;
-
-        private static final int SWIPE_MAX_OFF_PATH = 100;
-
-        private static final int SWIPE_MIN_DISTANCE = 100;
-
-        private static final int SWIPE_THRESHOLD_VELOCITY = 100;
-
-        public SampleGuest(GestureDetectorActivity se) {
-            this.se = se;
-        }
-
-        public boolean onDown(MotionEvent e) {
-            Log.d("TAG", "[onDown]");
-            return true;
-        }
-
-        public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
-                float velocityY) {
-            if (Math.abs(e1.getY() - e2.getY()) > SWIPE_MAX_OFF_PATH)
-                return false;
-
-            if ((e1.getX() - e2.getX()) > SWIPE_MIN_DISTANCE
-                    && Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
-                se.container1.setAnimation(AnimationUtils.loadAnimation(se,
-                        R.anim.push_left_out));
-                se.container2.setVisibility(View.VISIBLE);
-                se.container2.setAnimation(AnimationUtils.loadAnimation(se,
-                        R.anim.push_right_in));
-                se.container1.setVisibility(View.GONE);
-
-            } else if ((e2.getX() - e1.getX()) > SWIPE_MIN_DISTANCE
-                    && Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
-                se.container1.setVisibility(View.VISIBLE);
-                se.container1.setAnimation(AnimationUtils.loadAnimation(se,
-                        R.anim.push_left_in));
-                se.container2.setAnimation(AnimationUtils.loadAnimation(se,
-                        R.anim.push_right_out));
-                se.container2.setVisibility(View.GONE);
-            }
-            return true;
-        }
-
-        public void onLongPress(MotionEvent e) {
-            Log.d("TAG", "[onLongPress]");
-        }
-
-        public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX,
-                float distanceY) {
-            Log.d("TAG", "[onScroll]");
-            return true;
-        }
-
-        public void onShowPress(MotionEvent e) {
-            Log.d("TAG", "[onShowPress]");
-
-        }
-
-        public boolean onSingleTapUp(MotionEvent e) {
-            Log.d("TAG", "[onSingleTapUp]");
-            return true;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/GestureDetectorTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/GestureDetectorTest.java
deleted file mode 100755
index d329411fa667e0a6227d300f9c64d0c0a6caa83b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/GestureDetectorTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.app.ActionBar;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.DisplayMetrics;
-
-@SuppressLint("NewApi")
-@TargetApi(15)
-public class GestureDetectorTest extends ActivityInstrumentationTestCase2<GestureDetectorActivity> {
-    private GestureDetectorActivity mActivity;
-
-    private ActionBarUtils mActionBarUtils;
-
-    public GestureDetectorTest() {
-        super("com.example.actionbaractivity", GestureDetectorActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        // TODO Auto-generated method stub
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = (GestureDetectorActivity) getActivity();
-        mActionBarUtils = new ActionBarUtils(mActivity, getInstrumentation());
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        // TODO Auto-generated method stub
-        super.tearDown();
-        System.out.println("tearDown");
-    }
-
-    public void testPreConditions() {
-        assertTrue(mActivity != null);
-    }
-
-    public void testActionProvider() {
-        ActionBar actionBar = mActivity.getActionBar();
-        int cx, cy;
-
-        DisplayMetrics metrics = new DisplayMetrics();
-        mActivity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
-
-        cy = metrics.heightPixels / 2;
-        cx = metrics.widthPixels / 2;
-
-        mActionBarUtils.drag(cx + 50, cx - 50, cy, cy, 10);
-        getInstrumentation().waitForIdleSync();
-
-        mActionBarUtils.drag(cx - 50, cx + 50, cy, cy, 10);
-        getInstrumentation().waitForIdleSync();
-
-        assertTrue("", true);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/LabelView.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/LabelView.java
deleted file mode 100755
index 23a88db70103c1368522ad41b967a2ddcc5a3d04..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/LabelView.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.view.View;
-
-/**
- * Example of how to write a custom subclass of View. LabelView
- * is used to draw simple text views. Note that it does not handle
- * styled text or right-to-left writing systems.
- *
- */
-public class LabelView extends View {
-    /**
-     * Constructor.  This version is only needed if you will be instantiating
-     * the object manually (not from a layout XML file).
-     * @param context the application environment
-     */
-    public LabelView(Context context) {
-        super(context);
-        initLabelView();
-    }
-
-    /**
-     * Construct object, initializing with any attributes we understand from a
-     * layout file. These attributes are defined in
-     * SDK/assets/res/any/classes.xml.
-     *
-     * @see android.view.View#View(android.content.Context, android.util.AttributeSet)
-    public LabelView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        initLabelView();
-
-        Resources.StyledAttributes a = context.obtainStyledAttributes(attrs,
-                R.styleable.LabelView);
-
-        CharSequence s = a.getString(R.styleable.LabelView_text);
-        if (s != null) {
-            setText(s.toString());
-        }
-
-        ColorStateList textColor = a.getColorList(R.styleable.
-                                                  LabelView_textColor);
-        if (textColor != null) {
-            setTextColor(textColor.getDefaultColor(0));
-        }
-
-        int textSize = a.getInt(R.styleable.LabelView_textSize, 0);
-        if (textSize > 0) {
-            setTextSize(textSize);
-        }
-
-        a.recycle();
-    }
-
-     */
-    private void initLabelView() {
-        mTextPaint = new Paint();
-        mTextPaint.setAntiAlias(true);
-        mTextPaint.setTextSize(16);
-        mTextPaint.setColor(0xFF000000);
-
-        mPaddingLeft = 3;
-        mPaddingTop = 3;
-        mPaddingRight = 3;
-        mPaddingBottom = 3;
-    }
-
-    /**
-     * Sets the text to display in this label
-     * @param text The text to display. This will be drawn as one line.
-     */
-    public void setText(String text) {
-        mText = text;
-        requestLayout();
-        invalidate();
-    }
-
-    /**
-     * Sets the text size for this label
-     * @param size Font size
-     */
-    public void setTextSize(int size) {
-        mTextPaint.setTextSize(size);
-        requestLayout();
-        invalidate();
-    }
-
-    /**
-     * Sets the text color for this label
-     * @param color ARGB value for the text
-     */
-    public void setTextColor(int color) {
-        mTextPaint.setColor(color);
-        invalidate();
-    }
-
-
-    /**
-     * @see android.view.View#measure(int, int)
-     */
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        setMeasuredDimension(measureWidth(widthMeasureSpec),
-                measureHeight(heightMeasureSpec));
-    }
-
-    /**
-     * Determines the width of this view
-     * @param measureSpec A measureSpec packed into an int
-     * @return The width of the view, honoring constraints from measureSpec
-     */
-    private int measureWidth(int measureSpec) {
-        int result;
-        int specMode = MeasureSpec.getMode(measureSpec);
-        int specSize = MeasureSpec.getSize(measureSpec);
-
-        if (specMode == MeasureSpec.EXACTLY) {
-            // We were told how big to be
-            result = specSize;
-        } else {
-            // Measure the text
-            result = (int) mTextPaint.measureText(mText) + mPaddingLeft
-                    + mPaddingRight;
-            if (specMode == MeasureSpec.AT_MOST) {
-                // Respect AT_MOST value if that was what is called for by measureSpec
-                result = Math.min(result, specSize);
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Determines the height of this view
-     * @param measureSpec A measureSpec packed into an int
-     * @return The height of the view, honoring constraints from measureSpec
-     */
-    private int measureHeight(int measureSpec) {
-        int result;
-        int specMode = MeasureSpec.getMode(measureSpec);
-        int specSize = MeasureSpec.getSize(measureSpec);
-
-        mAscent = (int) mTextPaint.ascent();
-        if (specMode == MeasureSpec.EXACTLY) {
-            // We were told how big to be
-            result = specSize;
-        } else {
-            // Measure the text (beware: ascent is a negative number)
-            result = (int) (-mAscent + mTextPaint.descent()) + mPaddingTop
-                    + mPaddingBottom;
-            if (specMode == MeasureSpec.AT_MOST) {
-                // Respect AT_MOST value if that was what is called for by measureSpec
-                result = Math.min(result, specSize);
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Render the text
-     *
-     * @see android.view.View#onDraw(android.graphics.Canvas)
-     */
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-        canvas.drawText(mText, mPaddingLeft, mPaddingTop - mAscent, mTextPaint);
-    }
-
-    private Paint mTextPaint;
-    private String mText;
-    private int mAscent;
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ListViewTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ListViewTest.java
deleted file mode 100755
index fc3b5cde6cccd2acb3188eedce63e9c4a6b38a32..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ListViewTest.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests;
-
-import com.google.android.collect.Lists;
-
-import junit.framework.Assert;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.test.InstrumentationTestCase;
-import android.test.mock.MockContext;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-
-import java.util.List;
-
-
-/// M: [ALPS00428138] fix error cases
-import android.content.pm.ApplicationInfo;
-import android.os.Looper;
-
-public class ListViewTest extends InstrumentationTestCase {
-
-    /**
-     * If a view in a ListView requests a layout it should be remeasured.
-     */
-    @MediumTest
-    public void testRequestLayout() throws Exception {
-        MockContext context = new MockContext2();
-        ListView listView = new ListView(context);
-        List<String> items = Lists.newArrayList("hello");
-        Adapter<String> adapter = new Adapter<String>(context, 0, items);
-        listView.setAdapter(adapter);
-
-        int measureSpec = View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.EXACTLY);
-
-        adapter.notifyDataSetChanged();
-        listView.measure(measureSpec, measureSpec);
-        listView.layout(0, 0, 100, 100);
-
-        MockView childView = (MockView) listView.getChildAt(0);
-
-        childView.requestLayout();
-        childView.onMeasureCalled = false;
-        listView.measure(measureSpec, measureSpec);
-        listView.layout(0, 0, 100, 100);
-        Assert.assertTrue(childView.onMeasureCalled);
-    }
-
-    /**
-     * The list view should handle the disappearance of the only selected item, even when that item
-     * was selected before its disappearance.
-     *
-     */
-    @MediumTest
-    public void testNoSelectableItems() throws Exception {
-        MockContext context = new MockContext2();
-        ListView listView = new ListView(context);
-        // We use a header as the unselectable item to remain after the selectable one is removed.
-        listView.addHeaderView(new View(context), null, false);
-        List<String> items = Lists.newArrayList("hello");
-        Adapter<String> adapter = new Adapter<String>(context, 0, items);
-        listView.setAdapter(adapter);
-
-        listView.setSelection(1);
-
-        int measureSpec = View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.EXACTLY);
-
-        adapter.notifyDataSetChanged();
-        listView.measure(measureSpec, measureSpec);
-        listView.layout(0, 0, 100, 100);
-
-        items.remove(0);
-
-        adapter.notifyDataSetChanged();
-        listView.measure(measureSpec, measureSpec);
-        listView.layout(0, 0, 100, 100);
-    }
-
-    private class MockContext2 extends MockContext {
-
-        @Override
-        public Resources getResources() {
-            return getInstrumentation().getTargetContext().getResources();
-        }
-
-        @Override
-        public Resources.Theme getTheme() {
-            return getInstrumentation().getTargetContext().getTheme();
-        }
-
-        @Override
-        public Object getSystemService(String name) {
-            /// M: fix error cases
-            return getInstrumentation().getTargetContext().getSystemService(name);
-//            if (Context.LAYOUT_INFLATER_SERVICE.equals(name)) {
-//                return getInstrumentation().getTargetContext().getSystemService(name);
-//            }
-//            return super.getSystemService(name);
-        }
-
-        /// M: [ALPS00428138] fix error cases
-        @Override
-        public ApplicationInfo getApplicationInfo() {
-            return getInstrumentation().getTargetContext().getApplicationInfo();
-        }
-
-        /// M: [ALPS00428138] fix error cases
-        @Override
-        public Looper getMainLooper() {
-            return getInstrumentation().getTargetContext().getMainLooper();
-        }
-
-        /// M: fix error cases
-        @Override
-        public int checkCallingOrSelfPermission(String permission) {
-            return getInstrumentation().getTargetContext().checkCallingOrSelfPermission(permission);
-        }
-    }
-
-    private class MockView extends View {
-
-        public boolean onMeasureCalled = false;
-
-        public MockView(Context context) {
-            super(context);
-        }
-
-        @Override
-        protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-            onMeasureCalled = true;
-        }
-    }
-
-    private class Adapter<T> extends ArrayAdapter<T> {
-
-        public Adapter(Context context, int resource, List<T> objects) {
-            super(context, resource, objects);
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            return new MockView(getContext());
-        }
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/NumberPickerActivity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/NumberPickerActivity.java
deleted file mode 100755
index 27e11a9ac4b8f36943808435d885af472b7937af..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/NumberPickerActivity.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.os.Bundle;
-import android.app.Activity;
-import android.widget.NumberPicker;
-
-public class NumberPickerActivity extends Activity {
-
-    NumberPicker mNumberPicker;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.numberpicker_layout);
-        mNumberPicker = (NumberPicker) findViewById(R.id.testNumberPicker);
-        mNumberPicker.setMaxValue(20);
-        mNumberPicker.setMinValue(0);
-        mNumberPicker.setValue(1);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/NumberPickerActivityTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/NumberPickerActivityTest.java
deleted file mode 100755
index 37451956ee0101f22ca4f2c4ee62fd148857d6e5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/NumberPickerActivityTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.app.Activity;
-import android.app.Instrumentation;
-import android.os.SystemClock;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.MotionEvent;
-import android.view.ViewConfiguration;
-import android.widget.NumberPicker;
-
-
-public class NumberPickerActivityTest extends ActivityInstrumentationTestCase2<NumberPickerActivity> {
-
-    Activity mActivity;
-    NumberPicker mNumberPicker;
-
-    public NumberPickerActivityTest() {
-        super("android.widget.NumberPickerActivity", NumberPickerActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        // TODO Auto-generated method stub
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = getActivity();
-        mNumberPicker = (NumberPicker) mActivity.findViewById(R.id.testNumberPicker);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        // TODO Auto-generated method stub
-        super.tearDown();
-        System.out.println("tearDown");
-    }
-
-    public void testLongPressIncrementBtn() {
-        mActivity.runOnUiThread(new Runnable() {
-
-            @Override
-            public void run() {
-                // TODO Auto-generated method stub
-                mNumberPicker.requestFocus();
-            }
-        });
-        // generate a fake click event to test
-        Instrumentation inst = getInstrumentation();
-
-        int[] xy = new int[2];
-        mNumberPicker.getLocationOnScreen(xy);
-
-        final int viewWidth = mNumberPicker.getWidth();
-        final int viewHeight = mNumberPicker.getHeight();
-
-        final float x = xy[0] + (viewWidth / 2.0f);
-        final float y = xy[1] + (viewHeight / 6.0f);
-
-        long downTime = SystemClock.uptimeMillis();
-        long eventTime = SystemClock.uptimeMillis();
-
-        MotionEvent event = MotionEvent.obtain(downTime, eventTime,
-                MotionEvent.ACTION_DOWN, x, y, 0);
-        inst.sendPointerSync(event);
-        inst.waitForIdleSync();
-
-        eventTime = SystemClock.uptimeMillis();
-        final int touchSlop = ViewConfiguration.get(mNumberPicker.getContext()).getScaledTouchSlop();
-        event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_MOVE,
-                x , y , 0);
-        inst.sendPointerSync(event);
-        inst.waitForIdleSync();
-
-        try {
-            Thread.sleep((long) (ViewConfiguration.getLongPressTimeout() * 3.0f));
-            //Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        eventTime = SystemClock.uptimeMillis();
-        event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_UP, x, y, 0);
-        inst.sendPointerSync(event);
-        inst.waitForIdleSync();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/PreferenceFragmentActivity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/PreferenceFragmentActivity.java
deleted file mode 100755
index a995f26ef06fa25793289ed4470c723b1d7fca64..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/PreferenceFragmentActivity.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.app.Activity;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.CheckBox;
-import android.widget.TextView;
-
-public class PreferenceFragmentActivity extends Activity {
-
-    CheckBox prefCheckBox;
-    TextView prefEditText;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.preference_fragment_main);
-
-        prefCheckBox = (CheckBox) findViewById(R.id.prefCheckBox);
-        prefEditText = (TextView) findViewById(R.id.prefEditText);
-
-        loadPref();
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.preference_fragment, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-
-        /*
-         * Because it's onlt ONE option in the menu.
-         * In order to make it simple, We always start SetPreferenceActivity
-         * without checking.
-         */
-
-        Intent intent = new Intent();
-        intent.setClass(PreferenceFragmentActivity.this, SetPreferenceActivity.class);
-        startActivityForResult(intent, 0);
-
-        return true;
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        // TODO Auto-generated method stub
-        //super.onActivityResult(requestCode, resultCode, data);
-
-        /*
-         * To make it simple, always re-load Preference setting.
-         */
-
-        loadPref();
-    }
-
-    private void loadPref() {
-        SharedPreferences mySharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-
-        boolean my_checkbox_preference = mySharedPreferences.getBoolean("checkbox_preference", false);
-        prefCheckBox.setChecked(my_checkbox_preference);
-
-        String my_edittext_preference = mySharedPreferences.getString("edittext_preference", "");
-        prefEditText.setText(my_edittext_preference);
-
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/PreferenceFragmentTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/PreferenceFragmentTest.java
deleted file mode 100755
index 740adf7df19e37a45c3757c9524c6c34ac2a4284..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/PreferenceFragmentTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.app.ActionBar;
-import android.test.ActivityInstrumentationTestCase2;
-
-@SuppressLint("NewApi")
-@TargetApi(15)
-public class PreferenceFragmentTest extends ActivityInstrumentationTestCase2<PreferenceFragmentActivity> {
-    private PreferenceFragmentActivity mActivity;
-
-    private ActionBarUtils mActionBarUtils;
-
-    public PreferenceFragmentTest() {
-        super("com.mediatek.common.widget.tests", PreferenceFragmentActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        // TODO Auto-generated method stub
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = (PreferenceFragmentActivity) getActivity();
-        mActionBarUtils = new ActionBarUtils(mActivity, getInstrumentation());
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        // TODO Auto-generated method stub
-        super.tearDown();
-        System.out.println("tearDown");
-    }
-
-    public void testPreConditions() {
-        assertTrue(mActivity != null);
-    }
-
-    public void testDialogFragment() {
-        ActionBar actionBar = mActivity.getActionBar();
-
-        assertTrue("", true);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/PrefsFragment.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/PrefsFragment.java
deleted file mode 100755
index 5d66a9e5557a4cba95d1a00790f87ebdda9ec665..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/PrefsFragment.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.annotation.TargetApi;
-import android.os.Bundle;
-import android.preference.PreferenceFragment;
-
-@TargetApi(11)
-public class PrefsFragment extends PreferenceFragment {
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        // TODO Auto-generated method stub
-        super.onCreate(savedInstanceState);
-
-        // Load the preferences from an XML resource
-        addPreferencesFromResource(R.xml.preferences);
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ProgressBarActivity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ProgressBarActivity.java
deleted file mode 100755
index d88073735eea58730edc2811f8b034ed6ef6e2b0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ProgressBarActivity.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class ProgressBarActivity extends Activity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        // TODO Auto-generated method stub
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.progressbar_layout);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ProgressBarActivityTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ProgressBarActivityTest.java
deleted file mode 100755
index 73a047873c109a56e6cb95cb8c88f358e6ea4118..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ProgressBarActivityTest.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.app.Activity;
-import android.test.ActivityInstrumentationTestCase2;
-import android.widget.ProgressBar;
-
-
-public class ProgressBarActivityTest extends ActivityInstrumentationTestCase2<ProgressBarActivity> {
-
-    Activity mActivity;
-    ProgressBar mProgressBar;
-
-    public ProgressBarActivityTest() {
-        super("android.widget.ProgressBarActivity", ProgressBarActivity.class);
-        // TODO Auto-generated constructor stub
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        // TODO Auto-generated method stub
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = getActivity();
-        mProgressBar = (ProgressBar) mActivity.findViewById(R.id.testProgressBar);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        // TODO Auto-generated method stub
-        super.tearDown();
-        System.out.println("tearDown");
-    }
-
-    public void testRefreshProgress() {
-        mActivity.runOnUiThread(new Runnable() {
-
-            @Override
-            public void run() {
-                // TODO Auto-generated method stub
-                mProgressBar.requestFocus();
-            }
-        });
-
-        mProgressBar.setSecondaryProgress(20);
-        mProgressBar.setProgress(10);
-
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        mProgressBar.setSecondaryProgress(30);
-        mProgressBar.setProgress(20);
-
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        mProgressBar.setSecondaryProgress(40);
-        mProgressBar.setProgress(30);
-
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        mProgressBar.setSecondaryProgress(50);
-        mProgressBar.setProgress(40);
-
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        mProgressBar.setSecondaryProgress(60);
-        mProgressBar.setProgress(50);
-
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        mProgressBar.setSecondaryProgress(70);
-        mProgressBar.setProgress(60);
-
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        mProgressBar.setSecondaryProgress(80);
-        mProgressBar.setProgress(70);
-
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        mProgressBar.setSecondaryProgress(90);
-        mProgressBar.setProgress(80);
-
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        mProgressBar.setSecondaryProgress(100);
-        mProgressBar.setProgress(90);
-
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        mProgressBar.setProgress(100);
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/RadioGroupActivity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/RadioGroupActivity.java
deleted file mode 100755
index 5eb7169b106f7e12595114ae25808221702e934e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/RadioGroupActivity.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package com.mediatek.common.widget.tests;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class RadioGroupActivity extends Activity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.radiogroup_checkedchild);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/RadioGroupPreCheckedTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/RadioGroupPreCheckedTest.java
deleted file mode 100755
index fdf402949887907447f72c4cea6986f1108c48ee..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/RadioGroupPreCheckedTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.TouchUtils;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
-
-/**
- * Exercises {@link android.widget.RadioGroup}'s check feature.
- */
-public class RadioGroupPreCheckedTest extends ActivityInstrumentationTestCase2<RadioGroupActivity> {
-    public RadioGroupPreCheckedTest() {
-        super(RadioGroupActivity.class);
-    }
-
-    @MediumTest
-    public void testRadioButtonPreChecked() throws Exception {
-        final RadioGroupActivity activity = getActivity();
-
-        RadioButton radio = (RadioButton) activity.findViewById(R.id.value_one);
-        assertTrue("The first radio button should be checked", radio.isChecked());
-
-        RadioGroup group = (RadioGroup) activity.findViewById(R.id.group);
-        assertEquals("The first radio button should be checked", R.id.value_one,
-                group.getCheckedRadioButtonId());
-    }
-
-    @LargeTest
-    public void testRadioButtonChangePreChecked() throws Exception {
-        final RadioGroupActivity activity = getActivity();
-
-        RadioButton radio = (RadioButton) activity.findViewById(R.id.value_two);
-        TouchUtils.clickView(this, radio);
-
-        RadioButton old = (RadioButton) activity.findViewById(R.id.value_one);
-
-        assertFalse("The first radio button should not be checked", old.isChecked());
-        assertTrue("The second radio button should be checked", radio.isChecked());
-
-        RadioGroup group = (RadioGroup) activity.findViewById(R.id.group);
-        assertEquals("The second radio button should be checked", R.id.value_two,
-                group.getCheckedRadioButtonId());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ScaleGestureDetectorActivity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ScaleGestureDetectorActivity.java
deleted file mode 100755
index 615a38245d1e11899a6f70d863258a6141dfaf7e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ScaleGestureDetectorActivity.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.os.Bundle;
-import android.app.Activity;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.drawable.Drawable;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.ScaleGestureDetector;
-import android.view.View;
-import android.view.ViewGroup;
-
-public class ScaleGestureDetectorActivity extends Activity {
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        TouchExampleView view = new TouchExampleView(this);
-        view.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT));
-
-        setContentView(view);
-    }
-
-    public class TouchExampleView extends View {
-        private static final int INVALID_POINTER_ID = -1;
-
-        private Drawable mIcon;
-        private float mPosX;
-        private float mPosY;
-
-        private float mLastTouchX;
-        private float mLastTouchY;
-        private int mActivePointerId = INVALID_POINTER_ID;
-
-        private ScaleGestureDetector mScaleDetector;
-        private float mScaleFactor = 1.f;
-
-        public TouchExampleView(Context context) {
-            this(context, null, 0);
-        }
-
-        public TouchExampleView(Context context, AttributeSet attrs) {
-            this(context, attrs, 0);
-        }
-
-        public TouchExampleView(Context context, AttributeSet attrs, int defStyle) {
-            super(context, attrs, defStyle);
-            mIcon = context.getResources().getDrawable(R.drawable.one);
-            mIcon.setBounds(0, 0, mIcon.getIntrinsicWidth(), mIcon.getIntrinsicHeight());
-
-            mScaleDetector = new ScaleGestureDetector(context, new ScaleListener());
-        }
-
-        @Override
-        public boolean onTouchEvent(MotionEvent ev) {
-            // Let the ScaleGestureDetector inspect all events.
-            mScaleDetector.onTouchEvent(ev);
-
-            final int action = ev.getAction();
-            switch (action & MotionEvent.ACTION_MASK) {
-            case MotionEvent.ACTION_DOWN: {
-                final float x = ev.getX();
-                final float y = ev.getY();
-
-                mLastTouchX = x;
-                mLastTouchY = y;
-                mActivePointerId = ev.getPointerId(0);
-                break;
-            }
-
-            case MotionEvent.ACTION_MOVE: {
-                final int pointerIndex = ev.findPointerIndex(mActivePointerId);
-                final float x = ev.getX(pointerIndex);
-                final float y = ev.getY(pointerIndex);
-
-                // Only move if the ScaleGestureDetector isn't processing a gesture.
-                if (!mScaleDetector.isInProgress()) {
-                    final float dx = x - mLastTouchX;
-                    final float dy = y - mLastTouchY;
-
-                    mPosX += dx;
-                    mPosY += dy;
-
-                    invalidate();
-                }
-
-                mLastTouchX = x;
-                mLastTouchY = y;
-
-                break;
-            }
-
-            case MotionEvent.ACTION_UP: {
-                mActivePointerId = INVALID_POINTER_ID;
-                break;
-            }
-
-            case MotionEvent.ACTION_CANCEL: {
-                mActivePointerId = INVALID_POINTER_ID;
-                break;
-            }
-
-            case MotionEvent.ACTION_POINTER_UP: {
-                final int pointerIndex = (ev.getAction() & MotionEvent.ACTION_POINTER_INDEX_MASK)
-                        >> MotionEvent.ACTION_POINTER_INDEX_SHIFT;
-                final int pointerId = ev.getPointerId(pointerIndex);
-                if (pointerId == mActivePointerId) {
-                    // This was our active pointer going up. Choose a new
-                    // active pointer and adjust accordingly.
-                    final int newPointerIndex = pointerIndex == 0 ? 1 : 0;
-                    mLastTouchX = ev.getX(newPointerIndex);
-                    mLastTouchY = ev.getY(newPointerIndex);
-                    mActivePointerId = ev.getPointerId(newPointerIndex);
-                }
-                break;
-            }
-            }
-
-            return true;
-        }
-
-        @Override
-        public void onDraw(Canvas canvas) {
-            super.onDraw(canvas);
-
-            canvas.save();
-            canvas.translate(mPosX, mPosY);
-            canvas.scale(mScaleFactor, mScaleFactor);
-            mIcon.draw(canvas);
-            canvas.restore();
-        }
-
-        private class ScaleListener extends ScaleGestureDetector.SimpleOnScaleGestureListener {
-            @Override
-            public boolean onScale(ScaleGestureDetector detector) {
-                mScaleFactor *= detector.getScaleFactor();
-
-                // Don't let the object get too small or too large.
-                mScaleFactor = Math.max(0.1f, Math.min(mScaleFactor, 5.0f));
-
-                invalidate();
-                return true;
-            }
-        }
-    }
-}
-
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ScaleGestureDetectorTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ScaleGestureDetectorTest.java
deleted file mode 100755
index 457ae9b64a544f7d265d773d70d6ab2cdb7981f9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/ScaleGestureDetectorTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.app.ActionBar;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.DisplayMetrics;
-
-@SuppressLint("NewApi")
-@TargetApi(15)
-public class ScaleGestureDetectorTest extends ActivityInstrumentationTestCase2<ScaleGestureDetectorActivity> {
-    private ScaleGestureDetectorActivity mActivity;
-
-    private ActionBarUtils mActionBarUtils;
-
-    public ScaleGestureDetectorTest() {
-        super("com.example.actionbaractivity", ScaleGestureDetectorActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        // TODO Auto-generated method stub
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = (ScaleGestureDetectorActivity) getActivity();
-        mActionBarUtils = new ActionBarUtils(mActivity, getInstrumentation());
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        // TODO Auto-generated method stub
-        super.tearDown();
-        System.out.println("tearDown");
-    }
-
-    public void testPreConditions() {
-        assertTrue(mActivity != null);
-    }
-
-    public void testActionProvider() {
-        ActionBar actionBar = mActivity.getActionBar();
-        int cx, cy;
-
-        DisplayMetrics metrics = new DisplayMetrics();
-        mActivity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
-
-        cy = metrics.heightPixels / 2;
-        cx = metrics.widthPixels / 2;
-
-        mActionBarUtils.drag(cx + 50, cx - 50, cy, cy, 10);
-        getInstrumentation().waitForIdleSync();
-
-        mActionBarUtils.drag(cx - 50, cx + 50, cy, cy, 10);
-        getInstrumentation().waitForIdleSync();
-
-        assertTrue("", true);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/SetPreferenceActivity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/SetPreferenceActivity.java
deleted file mode 100755
index e675cc32dc7d33286d1d8f5c32ddb43ff15a0778..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/SetPreferenceActivity.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class SetPreferenceActivity extends Activity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        // TODO Auto-generated method stub
-        super.onCreate(savedInstanceState);
-
-        getFragmentManager().beginTransaction().replace(android.R.id.content,
-                new PrefsFragment()).commit();
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/SimpleCursorAdapterTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/SimpleCursorAdapterTest.java
deleted file mode 100755
index e8e5f02a86a058f430139ed2d6e01b4f6558175d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/SimpleCursorAdapterTest.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests;
-
-import com.google.android.collect.Lists;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import android.widget.SimpleCursorAdapter;
-
-import java.util.ArrayList;
-import java.util.Random;
-
-/**
- * This is a series of tests of basic API contracts for SimpleCursorAdapter.  It is
- * incomplete and can use work.
- *
- * NOTE:  This contract holds for underlying cursor types too and these should
- * be extracted into a set of tests that can be run on any descendant of CursorAdapter.
- */
-public class SimpleCursorAdapterTest extends AndroidTestCase {
-
-    String[] mFrom;
-    int[] mTo;
-    int mLayout;
-    Context mContext;
-
-    ArrayList<ArrayList> mData2x2;
-    Cursor mCursor2x2;
-
-    /**
-     * Set up basic columns and cursor for the tests
-     */
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-
-        // all the pieces needed for the various tests
-        mFrom = new String[]{"Column1", "Column2", "_id"};
-        mTo = new int[]{com.android.internal.R.id.text1, com.android.internal.R.id.text2};
-        mLayout = com.android.internal.R.layout.simple_list_item_2;
-        mContext = getContext();
-
-        // raw data for building a basic test cursor
-        mData2x2 = createTestList(2, 2);
-        mCursor2x2 = createCursor(mFrom, mData2x2);
-    }
-
-    /**
-     * Borrowed from CursorWindowTest.java
-     */
-    private ArrayList<ArrayList> createTestList(int rows, int cols) {
-        ArrayList<ArrayList> list = Lists.newArrayList();
-        Random generator = new Random();
-
-        for (int i = 0; i < rows; i++) {
-            ArrayList<Integer> col = Lists.newArrayList();
-            list.add(col);
-            for (int j = 0; j < cols; j++) {
-                // generate random number
-                Integer r = generator.nextInt();
-                col.add(r);
-            }
-            col.add(i);
-        }
-        return list;
-    }
-
-    /**
-     * Test creating with a live cursor
-     */
-    @SmallTest
-    public void testCreateLive() {
-        SimpleCursorAdapter ca = new SimpleCursorAdapter(mContext, mLayout, mCursor2x2, mFrom, mTo);
-
-        // Now see if we can pull 2 rows from the adapter
-        assertEquals(2, ca.getCount());
-    }
-
-    /**
-     * Test creating with a null cursor
-     */
-    @SmallTest
-    public void testCreateNull() {
-        SimpleCursorAdapter ca = new SimpleCursorAdapter(mContext, mLayout, null, mFrom, mTo);
-
-        // The adapter should report zero rows
-        assertEquals(0, ca.getCount());
-    }
-
-    /**
-     * Test changeCursor() with live cursor
-     */
-    @SmallTest
-    public void testChangeCursorLive() {
-        SimpleCursorAdapter ca = new SimpleCursorAdapter(mContext, mLayout, mCursor2x2, mFrom, mTo);
-
-        // Now see if we can pull 2 rows from the adapter
-        assertEquals(2, ca.getCount());
-
-        // now put in a different cursor (5 rows)
-        ArrayList<ArrayList> data2 = createTestList(5, 2);
-        Cursor c2 = createCursor(mFrom, data2);
-        ca.changeCursor(c2);
-
-        // Now see if we can pull 5 rows from the adapter
-        assertEquals(5, ca.getCount());
-    }
-
-    /**
-     * Test changeCursor() with null cursor
-     */
-    @SmallTest
-    public void testChangeCursorNull() {
-        SimpleCursorAdapter ca = new SimpleCursorAdapter(mContext, mLayout, mCursor2x2, mFrom, mTo);
-
-        // Now see if we can pull 2 rows from the adapter
-        assertEquals(2, ca.getCount());
-
-        // now put in null
-        ca.changeCursor(null);
-
-        // The adapter should report zero rows
-        assertEquals(0, ca.getCount());
-    }
-
-    /**
-     * Test changeCursor() with differing column layout.  This confirms that the Adapter can
-     * deal with cursors that have the same essential data (as defined by the original mFrom
-     * array) but it's OK if the physical structure of the cursor changes (columns rearranged).
-     */
-    @SmallTest
-    public void testChangeCursorColumns() {
-        TestSimpleCursorAdapter ca = new TestSimpleCursorAdapter(mContext, mLayout, mCursor2x2,
-                mFrom, mTo);
-
-        // check columns of original - mFrom and mTo should line up
-        int[] columns = ca.getConvertedFrom();
-        assertEquals(columns[0], 0);
-        assertEquals(columns[1], 1);
-
-        // Now make a new cursor with similar data but rearrange the columns
-        String[] swappedFrom = new String[]{"Column2", "Column1", "_id"};
-        Cursor c2 = createCursor(swappedFrom, mData2x2);
-        ca.changeCursor(c2);
-        assertEquals(2, ca.getCount());
-
-        // check columns to see if rearrangement tracked (should be swapped now)
-        columns = ca.getConvertedFrom();
-        assertEquals(columns[0], 1);
-        assertEquals(columns[1], 0);
-    }
-
-    /**
-     * Test that you can safely construct with a null cursor *and* null to/from arrays.
-     * This is new functionality added in 12/2008.
-     */
-    @SmallTest
-    public void testNullConstructor() {
-        SimpleCursorAdapter ca = new SimpleCursorAdapter(mContext, mLayout, null, null, null);
-        assertEquals(0, ca.getCount());
-    }
-
-    /**
-     * Test going from a null cursor to a non-null cursor *and* setting the to/from arrays
-     * This is new functionality added in 12/2008.
-     */
-    @SmallTest
-    public void testChangeNullToMapped() {
-        TestSimpleCursorAdapter ca = new TestSimpleCursorAdapter(mContext, mLayout, null, null, null);
-        assertEquals(0, ca.getCount());
-
-        ca.changeCursorAndColumns(mCursor2x2, mFrom, mTo);
-        assertEquals(2, ca.getCount());
-
-        // check columns of original - mFrom and mTo should line up
-        int[] columns = ca.getConvertedFrom();
-        /// M: [ALPS00428138] fix failure cases
-        //assertEquals(2, columns.length);
-        assertEquals(3, columns.length);
-        assertEquals(0, columns[0]);
-        assertEquals(1, columns[1]);
-        int[] viewIds = ca.getTo();
-        assertEquals(2, viewIds.length);
-        assertEquals(com.android.internal.R.id.text1, viewIds[0]);
-        assertEquals(com.android.internal.R.id.text2, viewIds[1]);
-    }
-
-    /**
-     * Test going from one mapping to a different mapping
-     * This is new functionality added in 12/2008.
-     */
-    @SmallTest
-    public void testChangeMapping() {
-        TestSimpleCursorAdapter ca = new TestSimpleCursorAdapter(mContext, mLayout, mCursor2x2,
-                mFrom, mTo);
-        assertEquals(2, ca.getCount());
-
-        // Now create a new configuration with same cursor and just one column mapped
-        String[] singleFrom = new String[]{"Column1"};
-        int[] singleTo = new int[]{com.android.internal.R.id.text1};
-        ca.changeCursorAndColumns(mCursor2x2, singleFrom, singleTo);
-
-        // And examine the results, make sure they're still consistent
-        int[] columns = ca.getConvertedFrom();
-        assertEquals(1, columns.length);
-        assertEquals(0, columns[0]);
-        int[] viewIds = ca.getTo();
-        assertEquals(1, viewIds.length);
-        assertEquals(com.android.internal.R.id.text1, viewIds[0]);
-
-        // And again, same cursor, different map
-        singleFrom = new String[]{"Column2"};
-        singleTo = new int[]{com.android.internal.R.id.text2};
-        ca.changeCursorAndColumns(mCursor2x2, singleFrom, singleTo);
-
-        // And examine the results, make sure they're still consistent
-        columns = ca.getConvertedFrom();
-        assertEquals(1, columns.length);
-        assertEquals(1, columns[0]);
-        viewIds = ca.getTo();
-        assertEquals(1, viewIds.length);
-        assertEquals(com.android.internal.R.id.text2, viewIds[0]);
-    }
-
-    private static MatrixCursor createCursor(String[] columns, ArrayList<ArrayList> list) {
-        MatrixCursor cursor = new MatrixCursor(columns, list.size());
-        for (ArrayList row : list) {
-            cursor.addRow(row);
-        }
-        return cursor;
-    }
-
-    /**
-     * This is simply a way to sneak a look at the protected mFrom() array.  A more API-
-     * friendly way to do this would be to mock out a View and a ViewBinder and exercise
-     * it via those seams.
-     */
-    private static class TestSimpleCursorAdapter extends SimpleCursorAdapter {
-
-        public TestSimpleCursorAdapter(Context context, int layout, Cursor c,
-                String[] from, int[] to) {
-            super(context, layout, c, from, to);
-        }
-
-        int[] getConvertedFrom() {
-            return mFrom;
-        }
-
-        int[] getTo() {
-            return mTo;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/SpinnerOnGlobalLayout.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/SpinnerOnGlobalLayout.java
deleted file mode 100755
index 7f88ea3d24b83f10f5092dee320e42d4e21b9eca..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/SpinnerOnGlobalLayout.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.ArrayAdapter;
-import android.widget.Spinner;
-
-;
-
-public class SpinnerOnGlobalLayout extends Activity {
-
-    private Spinner mSpinner;
-
-
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.spinner);
-
-        mSpinner = (Spinner) findViewById(R.id.spinner);
-
-        List<String> list = new ArrayList<String>();
-        list.add("list 1");
-        list.add("list 2");
-        list.add("list 3");
-        ArrayAdapter<String> dataAdapter = new ArrayAdapter<String>(this,
-                android.R.layout.simple_spinner_item, list);
-        dataAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        mSpinner.setAdapter(dataAdapter);
-
-
-
-
-    }
-
-    public Spinner getSpinner() {
-        return mSpinner;
-    }
-
-
-}
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/SpinnerOnGlobalLayoutTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/SpinnerOnGlobalLayoutTest.java
deleted file mode 100755
index 2a40af96e70fbfafba2329bde3ede6813eed0cf0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/SpinnerOnGlobalLayoutTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.content.pm.ActivityInfo;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.KeyEvent;
-import android.widget.Spinner;
-
-
-
-public class SpinnerOnGlobalLayoutTest extends ActivityInstrumentationTestCase2<SpinnerOnGlobalLayout> {
-
-    SpinnerOnGlobalLayout mActivity;
-    Spinner mSpinner;
-
-    public SpinnerOnGlobalLayoutTest() {
-        super("com.mediatek.common.widget.tests", SpinnerOnGlobalLayout.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mSpinner = mActivity.getSpinner();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-
-
-    }
-
-
-    public void testPreconditions() {
-        assertTrue(mActivity != null);
-        assertTrue(mSpinner != null);
-
-    }
-
-    public void testOnGlobalLayoutChanged() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
-        getInstrumentation().waitForIdleSync();
-
-        assertTrue("popup should be shown", mSpinner.isPopupShowing());
-
-        mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-
-        try {
-            Thread.sleep(3000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        getInstrumentation().waitForIdleSync();
-
-
-        assertTrue("popup should still be shown", mSpinner.isPopupShowing());
-
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mSpinner.dismissPopup();
-            }
-        });
-
-        try {
-            Thread.sleep(3000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        getInstrumentation().waitForIdleSync();
-
-        assertTrue("popup should still not be shown", !mSpinner.isPopupShowing());
-
-
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/StackViewActivity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/StackViewActivity.java
deleted file mode 100755
index 9ee28478f33b37fef7d404a6c0bfd6b1197f2e08..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/StackViewActivity.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.StackView;
-
-import android.content.Context;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.LinearLayout;
-
-@TargetApi(11)
-public class StackViewActivity extends Activity {
-
-    private StackView mStackView;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.stack_view);
-
-        mStackView = (StackView) findViewById(R.id.stackView);
-
-        ColorAdapter colorAdapter = new ColorAdapter(this, mColors);
-        mStackView.setAdapter(colorAdapter);
-
-        final Button previousButon = (Button) findViewById(R.id.previousButton);
-        previousButon.setOnClickListener(new OnClickListener() {
-            public void onClick(View view) {
-                mStackView.showPrevious();
-            }
-        });
-
-        final Button nextButton = (Button) findViewById(R.id.nextButton);
-        nextButton.setOnClickListener(new OnClickListener() {
-            public void onClick(View view) {
-                mStackView.showNext();
-            }
-        });
-    }
-
-    public StackView getStackView() {
-        return mStackView;
-    }
-
-    private int[] mColors = {
-            Color.BLUE, Color.CYAN, Color.GRAY, Color.GREEN, Color.RED
-    };
-
-    private class ColorAdapter extends BaseAdapter {
-
-        private Context mContext;
-
-        private int[] mColors;
-
-        public ColorAdapter(Context context, int[] colors) {
-            mContext = context;
-            mColors = colors;
-        }
-
-        public int getCount() {
-            return mColors == null ? 0 : mColors.length;
-        }
-
-        public Object getItem(int position) {
-            return mColors == null ? null : mColors[position];
-        }
-
-        public long getItemId(int position) {
-            return position;
-        }
-
-        public View getView(int position, View cacheView, ViewGroup parent) {
-            LinearLayout.LayoutParams colorLayoutParams = new LinearLayout.LayoutParams(100, 100);
-
-            LinearLayout colorLayout = new LinearLayout(mContext);
-            colorLayout.setBackgroundColor(mColors[position]);
-            colorLayout.setLayoutParams(colorLayoutParams);
-
-            return colorLayout;
-        }
-
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/StackViewActivityTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/StackViewActivityTest.java
deleted file mode 100755
index 01e6c0b0a94bd8c8acb166481714c5e3e0870d8f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/StackViewActivityTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.widget.StackView;
-
-
-public class StackViewActivityTest extends ActivityInstrumentationTestCase2<StackViewActivity> {
-
-    StackViewActivity mActivity;
-    StackView mStackView;
-
-    public StackViewActivityTest() {
-        super("com.mediatek.common.widget.tests", StackViewActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mStackView = mActivity.getStackView();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-
-
-    }
-
-    public void testPreconditions() {
-        assertTrue(mActivity != null);
-        assertTrue(mStackView != null);
-    }
-
-
-}
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/SurfaceViewActivity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/SurfaceViewActivity.java
deleted file mode 100755
index e553d52e3d465baf46e8769e77a6f9476f595fc7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/SurfaceViewActivity.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.os.Bundle;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-
-public class SurfaceViewActivity extends Activity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        // TODO Auto-generated method stub
-        super.onCreate(savedInstanceState);
-        setContentView(new MySurfaceView(this));
-    }
-
-    private class MySurfaceView extends SurfaceView implements
-            SurfaceHolder.Callback, Runnable {
-        private SurfaceHolder mSurfaceHolder;
-        private Paint mPaint;
-        private Thread mThread;
-        private int mWidth;
-        private int mHeight;
-        private Canvas mCanvas;
-
-        public MySurfaceView(Context context) {
-            super(context);
-            mSurfaceHolder = this.getHolder();
-            mSurfaceHolder.addCallback(this);
-            mThread = new Thread(this);
-            mPaint = new Paint();
-            mPaint.setAntiAlias(true);
-            mPaint.setColor(Color.RED);
-
-            this.setKeepScreenOn(true);
-        }
-
-        public void surfaceChanged(SurfaceHolder holder, int format, int width,
-                int height) {
-            // TODO Auto-generated method stub
-
-        }
-
-        public void surfaceCreated(SurfaceHolder holder) {
-            mWidth = this.getWidth();
-            mHeight = this.getHeight();
-            mThread.start();
-        }
-
-        public void surfaceDestroyed(SurfaceHolder holder) {
-            // TODO Auto-generated method stub
-
-        }
-
-        public void run() {
-            while (true) {
-                draw();
-                try {
-                    Thread.sleep(100);
-                } catch (InterruptedException e) {
-                    // TODO Auto-generated catch block
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        private void draw() {
-            try {
-                mCanvas = mSurfaceHolder.lockCanvas();
-                int rand = (int) (Math.random() * 3);
-                switch(rand)
-                {
-                case 0:
-                    mCanvas.drawColor(Color.WHITE);
-                    break;
-                case 1:
-                    mCanvas.drawColor(Color.BLACK);
-                    break;
-                case 2:
-                    mCanvas.drawColor(Color.RED);
-                    break;
-                }
-                mCanvas.drawText("SurfaceViewTest", mWidth / 2, mHeight / 2, mPaint);
-            } catch (Exception e) {
-                // TODO: handle exception
-            } finally {
-                if (mCanvas != null) {
-                    mSurfaceHolder.unlockCanvasAndPost(mCanvas);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/SurfaceViewTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/SurfaceViewTest.java
deleted file mode 100755
index 3d2311b3d2b9a22c2e3ea14d2f911d94d26efc01..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/SurfaceViewTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.app.ActionBar;
-import android.test.ActivityInstrumentationTestCase2;
-
-
-@SuppressLint("NewApi")
-@TargetApi(15)
-public class SurfaceViewTest extends ActivityInstrumentationTestCase2<SurfaceViewActivity> {
-    private SurfaceViewActivity mActivity;
-
-    private ActionBarUtils mActionBarUtils;
-
-    public SurfaceViewTest() {
-        super("com.mediatek.common.widget.tests", SurfaceViewActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        // TODO Auto-generated method stub
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = (SurfaceViewActivity) getActivity();
-        mActionBarUtils = new ActionBarUtils(mActivity, getInstrumentation());
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        // TODO Auto-generated method stub
-        super.tearDown();
-        System.out.println("tearDown");
-    }
-
-    public void testPreConditions() {
-        assertTrue(mActivity != null);
-    }
-
-    public void testActionProvider() {
-        ActionBar actionBar = mActivity.getActionBar();
-
-        assertTrue("", true);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/TextViewPerformanceTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/TextViewPerformanceTest.java
deleted file mode 100755
index 435f89bc989350391a5414ea788be112a96f1c94..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/TextViewPerformanceTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.text.SpannedString;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-public class TextViewPerformanceTest extends AndroidTestCase {
-
-    private String mString = "The quick brown fox";
-    private Canvas mCanvas;
-    private PerformanceTextView mTextView;
-    private Paint mPaint;
-    private PerformanceLabelView mLabelView;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        Bitmap mBitmap = Bitmap.createBitmap(320, 240, Bitmap.Config.RGB_565);
-        mCanvas = new Canvas(mBitmap);
-
-        ViewGroup.LayoutParams p = new ViewGroup.LayoutParams(320, 240);
-
-        mLabelView = new PerformanceLabelView(mContext);
-        mLabelView.setText(mString);
-        mLabelView.measure(View.MeasureSpec.AT_MOST | 320, View.MeasureSpec.AT_MOST | 240);
-        mLabelView.mySetFrame(320, 240);
-        mLabelView.setLayoutParams(p);
-        mLabelView.myDraw(mCanvas);
-
-        mPaint = new Paint();
-        mCanvas.save();
-        mTextView = new PerformanceTextView(mContext);
-        mTextView.setLayoutParams(p);
-        mTextView.setText(mString);
-        mTextView.mySetFrame(320, 240);
-        mTextView.measure(View.MeasureSpec.AT_MOST | 320, View.MeasureSpec.AT_MOST | 240);
-    }
-
-    @MediumTest
-    public void testDrawTextViewLine() throws Exception {
-        mTextView.myDraw(mCanvas);
-        mTextView.myDraw(mCanvas);
-        mTextView.myDraw(mCanvas);
-        mTextView.myDraw(mCanvas);
-        mTextView.myDraw(mCanvas);
-        mTextView.myDraw(mCanvas);
-        mTextView.myDraw(mCanvas);
-        mTextView.myDraw(mCanvas);
-        mTextView.myDraw(mCanvas);
-        mTextView.myDraw(mCanvas);
-    }
-
-    @SmallTest
-    public void testSpan() throws Exception {
-        CharSequence charSeq = new SpannedString(mString);
-        mTextView.setText(charSeq);
-
-        mTextView.myDraw(mCanvas);
-        mTextView.myDraw(mCanvas);
-        mTextView.myDraw(mCanvas);
-        mTextView.myDraw(mCanvas);
-        mTextView.myDraw(mCanvas);
-        mTextView.myDraw(mCanvas);
-        mTextView.myDraw(mCanvas);
-        mTextView.myDraw(mCanvas);
-        mTextView.myDraw(mCanvas);
-        mTextView.myDraw(mCanvas);
-    }
-
-    @SmallTest
-    public void testCanvasDrawText() throws Exception {
-        mCanvas.drawText(mString, 30, 30, mPaint);
-    }
-
-    @SmallTest
-    public void testLabelViewDraw() throws Exception {
-        mLabelView.myDraw(mCanvas);
-    }
-
-    private class PerformanceTextView extends TextView {
-        public PerformanceTextView(Context context) {
-            super(context);
-        }
-
-        final void myDraw(Canvas c) {
-            super.onDraw(c);
-        }
-
-        final void mySetFrame(int w, int h) {
-            super.setFrame(0, 0, w, h);
-        }
-    }
-
-    private class PerformanceLabelView extends LabelView {
-        public PerformanceLabelView(Context context) {
-            super(context);
-        }
-
-        final void myDraw(Canvas c) {
-            super.onDraw(c);
-        }
-
-        final void mySetFrame(int w, int h) {
-            super.setFrame(0, 0, w, h);
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/TextViewTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/TextViewTest.java
deleted file mode 100755
index f3a73c3fe9658c21556647792be5af6358e038ba..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/TextViewTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.text.GetChars;
-import android.widget.TextView;
-import android.widget.EditText;
-import android.text.Selection;
-import android.text.Spannable;
-
-/**
- * TextViewTest tests {@link TextView}.
- */
-public class TextViewTest extends AndroidTestCase {
-
-    /**
-    * @hide
-    */
-    static final int PROCESS_TEXT_REQUEST_CODE = 100;
-
-    @SmallTest
-    public void testArray() throws Exception {
-        TextView tv = new TextView(mContext);
-
-        char[] c = new char[] { 'H', 'e', 'l', 'l', 'o', ' ',
-                                'W', 'o', 'r', 'l', 'd', '!' };
-
-        tv.setText(c, 1, 4);
-        CharSequence oldText = tv.getText();
-
-        tv.setText(c, 4, 5);
-        CharSequence newText = tv.getText();
-
-        assertTrue(newText == oldText);
-
-        assertEquals(5, newText.length());
-        assertEquals('o', newText.charAt(0));
-        assertEquals("o Wor", newText.toString());
-
-        assertEquals(" Wo", newText.subSequence(1, 4));
-
-        char[] c2 = new char[7];
-        ((GetChars) newText).getChars(1, 4, c2, 2);
-        assertEquals('\0', c2[1]);
-        assertEquals(' ', c2[2]);
-        assertEquals('W', c2[3]);
-        assertEquals('o', c2[4]);
-        assertEquals('\0', c2[5]);
-    }
-
-    public void testProcessTextActivityResultNonEditable() {
-        TextView tv = new TextView(mContext);
-        CharSequence originalText = "This is some text.";
-        tv.setText(originalText, TextView.BufferType.SPANNABLE);
-        assertEquals(originalText, tv.getText().toString());
-        tv.setTextIsSelectable(true);
-        Selection.setSelection((Spannable) tv.getText(), 0, tv.getText().length());
-
-        CharSequence newText = "Text is replaced.";
-        Intent data = new Intent();
-        data.putExtra(Intent.EXTRA_PROCESS_TEXT, newText);
-        tv.onActivityResult(PROCESS_TEXT_REQUEST_CODE, Activity.RESULT_OK, data);
-
-        // This is a TextView, which can't be modified. Hence no change should have been made.
-        assertEquals(originalText, tv.getText().toString());
-    }
-
-    public void testProcessTextActivityResultEditable() {
-        EditText tv = new EditText(mContext);
-        CharSequence originalText = "This is some text.";
-        tv.setText(originalText, TextView.BufferType.SPANNABLE);
-        assertEquals(originalText, tv.getText().toString());
-        tv.setTextIsSelectable(true);
-        Selection.setSelection(tv.getText(), 0, tv.getText().length());
-
-        CharSequence newText = "Text is replaced.";
-        Intent data = new Intent();
-        data.putExtra(Intent.EXTRA_PROCESS_TEXT, newText);
-        tv.onActivityResult(PROCESS_TEXT_REQUEST_CODE, Activity.RESULT_OK, data);
-
-        assertEquals(newText, tv.getText().toString());
-    }
-
-    public void testProcessTextActivityResultCancel() {
-        EditText tv = new EditText(mContext);
-        CharSequence originalText = "This is some text.";
-        tv.setText(originalText, TextView.BufferType.SPANNABLE);
-        assertEquals(originalText, tv.getText().toString());
-        tv.setTextIsSelectable(true);
-        Selection.setSelection(tv.getText(), 0, tv.getText().length());
-
-        CharSequence newText = "Text is replaced.";
-        Intent data = new Intent();
-        data.putExtra(Intent.EXTRA_PROCESS_TEXT, newText);
-        tv.onActivityResult(PROCESS_TEXT_REQUEST_CODE, Activity.RESULT_CANCELED, data);
-
-        assertEquals(originalText, tv.getText().toString());
-    }
-
-    public void testProcessTextActivityNoData() {
-        EditText tv = new EditText(mContext);
-        CharSequence originalText = "This is some text.";
-        tv.setText(originalText, TextView.BufferType.SPANNABLE);
-        assertEquals(originalText, tv.getText().toString());
-        tv.setTextIsSelectable(true);
-        Selection.setSelection(tv.getText(), 0, tv.getText().length());
-
-        tv.onActivityResult(PROCESS_TEXT_REQUEST_CODE, Activity.RESULT_OK, null);
-
-        assertEquals(originalText, tv.getText().toString());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/TextViewWordLimitsTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/TextViewWordLimitsTest.java
deleted file mode 100755
index 370215ecf131af9128c5491e5dee092a6e59f919..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/TextViewWordLimitsTest.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-
-//package com.mediatek.common.widget.tests;
-//
-//import android.test.AndroidTestCase;
-//import android.test.suitebuilder.annotation.LargeTest;
-//import android.text.InputType;
-//import android.text.Selection;
-//import android.text.Spannable;
-//import android.text.SpannableString;
-//
-//import android.widget.TextView;
-//
-//import java.lang.reflect.Field;
-//import java.lang.reflect.InvocationTargetException;
-//import java.lang.reflect.Method;
-//
-///**
-// * TextViewPatchTest tests {@link TextView}'s definition of word. Finds and
-// * verifies word limits to be in strings containing different kinds of
-// * characters.
-// */
-//public class TextViewWordLimitsTest extends AndroidTestCase {
-//
-//    TextView mTv = null;
-//    Method mGetWordLimits, mSelectCurrentWord;
-//    Field mContextMenuTriggeredByKey, mSelectionControllerEnabled;
-//
-//
-//    /**
-//     * Sets up common fields used in all test cases.
-//     * @throws NoSuchFieldException
-//     * @throws SecurityException
-//     */
-//    @Override
-//    protected void setUp() throws NoSuchMethodException, SecurityException, NoSuchFieldException {
-//        mTv = new TextView(getContext());
-//        mTv.setInputType(InputType.TYPE_CLASS_TEXT);
-//
-//        mGetWordLimits = mTv.getClass().getDeclaredMethod("getWordLimitsAt",
-//                new Class[] {int.class});
-//        mGetWordLimits.setAccessible(true);
-//
-//        mSelectCurrentWord = mTv.getClass().getDeclaredMethod("selectCurrentWord", new Class[] {});
-//        mSelectCurrentWord.setAccessible(true);
-//
-//        mContextMenuTriggeredByKey = mTv.getClass().getDeclaredField("mContextMenuTriggeredByKey");
-//        mContextMenuTriggeredByKey.setAccessible(true);
-//        mSelectionControllerEnabled = mTv.getClass().getDeclaredField("mSelectionControllerEnabled");
-//        mSelectionControllerEnabled.setAccessible(true);
-//    }
-//
-//    /**
-//     * Calculate and verify word limits. Depends on the TextView implementation.
-//     * Uses a private method and internal data representation.
-//     *
-//     * @param text         Text to select a word from
-//     * @param pos          Position to expand word around
-//     * @param correctStart Correct start position for the word
-//     * @param correctEnd   Correct end position for the word
-//     * @throws InvocationTargetException
-//     * @throws IllegalAccessException
-//     * @throws IllegalArgumentException
-//     * @throws InvocationTargetException
-//     * @throws IllegalAccessException
-//     */
-//    private void verifyWordLimits(String text, int pos, int correctStart, int correctEnd)
-//    throws IllegalArgumentException, IllegalAccessException, InvocationTargetException {
-//        mTv.setText(text, TextView.BufferType.SPANNABLE);
-//
-//        long limits = (Long)mGetWordLimits.invoke(mTv, new Object[] {new Integer(pos)});
-//        int actualStart = (int)(limits >>> 32);
-//        int actualEnd = (int)(limits & 0x00000000FFFFFFFFL);
-//        assertEquals(correctStart, actualStart);
-//        assertEquals(correctEnd, actualEnd);
-//    }
-//
-//
-//    private void verifySelectCurrentWord(Spannable text, int selectionStart, int selectionEnd, int correctStart,
-//            int correctEnd) throws InvocationTargetException, IllegalAccessException {
-//        mTv.setText(text, TextView.BufferType.SPANNABLE);
-//
-//        Selection.setSelection((Spannable)mTv.getText(), selectionStart, selectionEnd);
-//        mContextMenuTriggeredByKey.setBoolean(mTv, true);
-//        mSelectionControllerEnabled.setBoolean(mTv, true);
-//        mSelectCurrentWord.invoke(mTv);
-//
-//        assertEquals(correctStart, mTv.getSelectionStart());
-//        assertEquals(correctEnd, mTv.getSelectionEnd());
-//    }
-//
-//
-//    /**
-//     * Corner cases for string length.
-//     */
-//    @LargeTest
-//    public void testLengths() throws Exception {
-//        final String ONE_TWO = "one two";
-//        final String EMPTY   = "";
-//        final String TOOLONG = "ThisWordIsTooLongToBeDefinedAsAWordInTheSenseUsedInTextView";
-//
-//        // Select first word
-//        verifyWordLimits(ONE_TWO, 0, 0, 3);
-//        verifyWordLimits(ONE_TWO, 3, 0, 3);
-//
-//        // Select last word
-//        verifyWordLimits(ONE_TWO, 4, 4, 7);
-//        verifyWordLimits(ONE_TWO, 7, 4, 7);
-//
-//        // Empty string
-//        verifyWordLimits(EMPTY, 0, -1, -1);
-//
-//        // Too long word
-//        verifyWordLimits(TOOLONG, 0, -1, -1);
-//    }
-//
-//    /**
-//     * Unicode classes included.
-//     */
-//    @LargeTest
-//    public void testIncludedClasses() throws Exception {
-//        final String LOWER          = "njlj";
-//        final String UPPER          = "NJLJ";
-//        final String TITLECASE      = "\u01C8\u01CB\u01F2"; // Lj Nj Dz
-//        final String OTHER          = "\u3042\u3044\u3046"; // Hiragana AIU
-//        final String MODIFIER       = "\u02C6\u02CA\u02CB"; // Circumflex Acute Grave
-//
-//        // Each string contains a single valid word
-//        verifyWordLimits(LOWER, 1, 0, 4);
-//        verifyWordLimits(UPPER, 1, 0, 4);
-//        verifyWordLimits(TITLECASE, 1, 0, 3);
-//        verifyWordLimits(OTHER, 1, 0, 3);
-//        verifyWordLimits(MODIFIER, 1, 0, 3);
-//    }
-//
-//    /**
-//     * Unicode classes included if combined with a letter.
-//     */
-//    @LargeTest
-//    public void testPartlyIncluded() throws Exception {
-//        final String NUMBER           = "123";
-//        final String NUMBER_LOWER     = "1st";
-//        final String APOSTROPHE       = "''";
-//        final String APOSTROPHE_LOWER = "'Android's'";
-//
-//        // Pure decimal number is ignored
-//        verifyWordLimits(NUMBER, 1, -1, -1);
-//
-//        // Number with letter is valid
-//        verifyWordLimits(NUMBER_LOWER, 1, 0, 3);
-//
-//        // Stand apostrophes are ignore
-//        verifyWordLimits(APOSTROPHE, 1, -1, -1);
-//
-//        // Apostrophes are accepted if they are a part of a word
-//        verifyWordLimits(APOSTROPHE_LOWER, 1, 0, 11);
-//    }
-//
-//    /**
-//     * Unicode classes included if combined with a letter.
-//     */
-//    @LargeTest
-//    public void testFinalSeparator() throws Exception {
-//        final String PUNCTUATION = "abc, def.";
-//
-//        // Starting from the comma
-//        verifyWordLimits(PUNCTUATION, 3, 0, 3);
-//        verifyWordLimits(PUNCTUATION, 4, 0, 4);
-//
-//        // Starting from the final period
-//        verifyWordLimits(PUNCTUATION, 8, 5, 8);
-//        verifyWordLimits(PUNCTUATION, 9, 5, 9);
-//    }
-//
-//    /**
-//     * Unicode classes other than listed in testIncludedClasses and
-//     * testPartlyIncluded act as word separators.
-//     */
-//    @LargeTest
-//    public void testNotIncluded() throws Exception {
-//        // Selection of character classes excluded
-//        final String MARK_NONSPACING        = "a\u030A";       // a Combining ring above
-//        final String PUNCTUATION_OPEN_CLOSE = "(c)";           // Parenthesis
-//        final String PUNCTUATION_DASH       = "non-fiction";   // Hyphen
-//        final String PUNCTUATION_OTHER      = "b&b";           // Ampersand
-//        final String SYMBOL_OTHER           = "Android\u00AE"; // Registered
-//        final String SEPARATOR_SPACE        = "one two";       // Space
-//
-//        // "a"
-//        verifyWordLimits(MARK_NONSPACING, 1, 0, 1);
-//
-//        // "c"
-//        verifyWordLimits(PUNCTUATION_OPEN_CLOSE, 1, 1, 2);
-//
-//        // "non-"
-//        verifyWordLimits(PUNCTUATION_DASH, 3, 0, 3);
-//        verifyWordLimits(PUNCTUATION_DASH, 4, 4, 11);
-//
-//        // "b"
-//        verifyWordLimits(PUNCTUATION_OTHER, 0, 0, 1);
-//        verifyWordLimits(PUNCTUATION_OTHER, 1, 0, 1);
-//        verifyWordLimits(PUNCTUATION_OTHER, 2, 0, 3); // & is considered a punctuation sign.
-//        verifyWordLimits(PUNCTUATION_OTHER, 3, 2, 3);
-//
-//        // "Android"
-//        verifyWordLimits(SYMBOL_OTHER, 7, 0, 7);
-//        verifyWordLimits(SYMBOL_OTHER, 8, -1, -1);
-//
-//        // "one"
-//        verifyWordLimits(SEPARATOR_SPACE, 1, 0, 3);
-//    }
-//
-//    /**
-//     * Surrogate characters are treated as their code points.
-//     */
-//    @LargeTest
-//    public void testSurrogate() throws Exception {
-//        final String SURROGATE_LETTER   = "\uD800\uDC00\uD800\uDC01\uD800\uDC02"; // Linear B AEI
-//        final String SURROGATE_SYMBOL   = "\uD83D\uDE01\uD83D\uDE02\uD83D\uDE03"; // Three smileys
-//
-//        // Letter Other is included even when coded as surrogate pairs
-//        verifyWordLimits(SURROGATE_LETTER, 0, 0, 6);
-//        verifyWordLimits(SURROGATE_LETTER, 1, 0, 6);
-//        verifyWordLimits(SURROGATE_LETTER, 2, 0, 6);
-//        verifyWordLimits(SURROGATE_LETTER, 3, 0, 6);
-//        verifyWordLimits(SURROGATE_LETTER, 4, 0, 6);
-//        verifyWordLimits(SURROGATE_LETTER, 5, 0, 6);
-//        verifyWordLimits(SURROGATE_LETTER, 6, 0, 6);
-//
-//        // Not included classes are ignored even when coded as surrogate pairs
-//        verifyWordLimits(SURROGATE_SYMBOL, 0, -1, -1);
-//        verifyWordLimits(SURROGATE_SYMBOL, 1, -1, -1);
-//        verifyWordLimits(SURROGATE_SYMBOL, 2, -1, -1);
-//        verifyWordLimits(SURROGATE_SYMBOL, 3, -1, -1);
-//        verifyWordLimits(SURROGATE_SYMBOL, 4, -1, -1);
-//        verifyWordLimits(SURROGATE_SYMBOL, 5, -1, -1);
-//        verifyWordLimits(SURROGATE_SYMBOL, 6, -1, -1);
-//    }
-//
-//    /**
-//     * Selection is used if present and valid word.
-//     */
-//    @LargeTest
-//    public void testSelectCurrentWord() throws Exception {
-//        SpannableString textLower       = new SpannableString("first second");
-//        SpannableString textOther       = new SpannableString("\u3042\3044\3046"); // Hiragana AIU
-//        SpannableString textDash        = new SpannableString("non-fiction");      // Hyphen
-//        SpannableString textPunctOther  = new SpannableString("b&b");              // Ampersand
-//        SpannableString textSymbolOther = new SpannableString("Android\u00AE");    // Registered
-//
-//        // Valid selection - Letter, Lower
-//        verifySelectCurrentWord(textLower, 2, 5, 0, 5);
-//
-//        // Adding the space spreads to the second word
-//        verifySelectCurrentWord(textLower, 2, 6, 0, 12);
-//
-//        // Valid selection -- Letter, Other
-//        verifySelectCurrentWord(textOther, 1, 2, 0, 5);
-//
-//        // Zero-width selection is interpreted as a cursor and the selection is ignored
-//        verifySelectCurrentWord(textLower, 2, 2, 0, 5);
-//
-//        // Hyphen is part of selection
-//        verifySelectCurrentWord(textDash, 2, 5, 0, 11);
-//
-//        // Ampersand part of selection or not
-//        verifySelectCurrentWord(textPunctOther, 1, 2, 0, 3);
-//        verifySelectCurrentWord(textPunctOther, 1, 3, 0, 3);
-//
-//        // (R) part of the selection
-//        verifySelectCurrentWord(textSymbolOther, 2, 7, 0, 7);
-//        verifySelectCurrentWord(textSymbolOther, 2, 8, 0, 8);
-//    }
-//}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/TimePickerDialogActivity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/TimePickerDialogActivity.java
deleted file mode 100755
index 165767e2ed99b1288bf733149d68401b0af90251..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/TimePickerDialogActivity.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-import android.app.Activity;
-import android.app.TimePickerDialog;
-import android.os.Bundle;
-import android.widget.TimePicker;
-
-public class TimePickerDialogActivity extends Activity implements TimePickerDialog.OnTimeSetListener {
-
-    public TimePickerDialog mTimePickerDialog;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        // TODO Auto-generated method stub
-        super.onCreate(savedInstanceState);
-        mTimePickerDialog = new TimePickerDialog(TimePickerDialogActivity.this, this, 12, 12, false);
-        mTimePickerDialog.show();
-    }
-
-    public TimePickerDialog getDialog() {
-        return mTimePickerDialog;
-    }
-
-    @Override
-    public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
-        // TODO Auto-generated method stub
-        // Do nothing
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/TimePickerDialogTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/TimePickerDialogTest.java
deleted file mode 100755
index 75e3cc41f066d88288c396564010cbcc0b195ac6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/TimePickerDialogTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.mediatek.common.widget.tests;
-
-
-import android.app.TimePickerDialog;
-import android.app.Instrumentation;
-import android.os.SystemClock;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.widget.TimePicker;
-
-public class TimePickerDialogTest extends ActivityInstrumentationTestCase2<TimePickerDialogActivity> {
-
-    TimePickerDialogActivity mActivity;
-    TimePickerDialog mTimePickerDialog;
-    TimePicker mTimePicker;
-
-    public TimePickerDialogTest() {
-        super("android.app.activity.TimePickerDialogActivity", TimePickerDialogActivity.class);
-        // TODO Auto-generated constructor stub
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        // TODO Auto-generated method stub
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = (TimePickerDialogActivity) getActivity();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        // TODO Auto-generated method stub
-        super.tearDown();
-        System.out.println("tearDown");
-    }
-
-    public void testBackKeyHoldInitValue() {
-        mActivity.runOnUiThread(new Runnable() {
-
-        @Override
-        public void run() {
-            // TODO Auto-generated method stub
-        }
-        });
-
-        try {
-            Thread.sleep(3000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        this.sendKeys(KeyEvent.KEYCODE_BACK);
-
-        try {
-            Thread.sleep(3000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public void testTouchOutSideHoldInitValue() {
-
-        mActivity.runOnUiThread(new Runnable() {
-
-            @Override
-            public void run() {
-                // TODO Auto-generated method stub
-            }
-        });
-
-        mTimePickerDialog = mActivity.getDialog();
-        mTimePickerDialog.setCanceledOnTouchOutside(true);
-
-        if (!mTimePickerDialog.isShowing()) {
-            mTimePickerDialog.show();
-        }
-
-        // generate a fake click event to test
-        Instrumentation inst = getInstrumentation();
-
-        float x = 50.0f;
-        float y = 50.0f;
-
-        long downTime = SystemClock.uptimeMillis();
-        long eventTime = SystemClock.uptimeMillis();
-
-        MotionEvent event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_DOWN, x, y, 0);
-        inst.sendPointerSync(event);
-        inst.waitForIdleSync();
-
-        eventTime = SystemClock.uptimeMillis();
-        event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_MOVE, x, y, 0);
-        inst.sendPointerSync(event);
-        inst.waitForIdleSync();
-
-        eventTime = SystemClock.uptimeMillis();
-        event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_UP, x, y, 0);
-        inst.sendPointerSync(event);
-        inst.waitForIdleSync();
-
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/AdjacentVerticalRectLists.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/AdjacentVerticalRectLists.java
deleted file mode 100755
index b426779c3768217bdfeded103cee0318b40680de..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/AdjacentVerticalRectLists.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-import com.mediatek.common.widget.tests.util.InternalSelectionView;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.LinearLayout;
-import android.view.ViewGroup;
-
-/**
- * {@link android.view.FocusFinder#findNextFocus(android.view.ViewGroup, android.view.View, int)}
- * and
- * {@link android.view.View#requestFocus(int, android.graphics.Rect)}
- * work together to give a newly focused item a hint about the most interesting
- * rectangle of the previously focused view.  The view taking focus can use this
- * to set an internal selection more appropriate using this rect.
- *
- * This Activity excercises that behavior using three adjacent {@link android.util.InternalSelectionView}
- * that report interesting rects when giving up focus, and use interesting rects
- * when taking focus to best select the internal row to show as selected.
- */
-public class AdjacentVerticalRectLists extends Activity {
-
-    private LinearLayout mLayout;
-    private InternalSelectionView mLeftColumn;
-    private InternalSelectionView mMiddleColumn;
-    private InternalSelectionView mRightColumn;
-
-
-    public LinearLayout getLayout() {
-        return mLayout;
-    }
-
-    public InternalSelectionView getLeftColumn() {
-        return mLeftColumn;
-    }
-
-    public InternalSelectionView getMiddleColumn() {
-        return mMiddleColumn;
-    }
-
-    public InternalSelectionView getRightColumn() {
-        return mRightColumn;
-    }
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        mLayout = new LinearLayout(this);
-        mLayout.setOrientation(LinearLayout.HORIZONTAL);
-        mLayout.setLayoutParams(new ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT));
-
-        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0,
-                ViewGroup.LayoutParams.MATCH_PARENT, 1);
-
-        mLeftColumn = new InternalSelectionView(this, 5, "left column");
-        mLeftColumn.setLayoutParams(params);
-        mLeftColumn.setPadding(10, 10, 10, 10);
-        mLayout.addView(mLeftColumn);
-
-        mMiddleColumn = new InternalSelectionView(this, 5, "middle column");
-        mMiddleColumn.setLayoutParams(params);
-        mMiddleColumn.setPadding(10, 10, 10, 10);
-        mLayout.addView(mMiddleColumn);
-
-        mRightColumn = new InternalSelectionView(this, 5, "right column");
-        mRightColumn.setLayoutParams(params);
-        mRightColumn.setPadding(10, 10, 10, 10);
-        mLayout.addView(mRightColumn);
-
-        setContentView(mLayout);
-    }
-
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/DescendantFocusability.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/DescendantFocusability.java
deleted file mode 100755
index e6947bc04a4111661c8781f5f2b16befd249b02d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/DescendantFocusability.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.ViewGroup;
-import android.widget.Button;
-
-import com.mediatek.common.widget.tests.R;
-
-public class DescendantFocusability extends Activity {
-
-    public ViewGroup beforeDescendants;
-    public Button beforeDescendantsChild;
-
-    public ViewGroup afterDescendants;
-    public Button afterDescendantsChild;
-
-    public ViewGroup blocksDescendants;
-    public Button blocksDescendantsChild;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.descendant_focusability);
-
-        beforeDescendants = (ViewGroup) findViewById(R.id.beforeDescendants);
-        beforeDescendantsChild = (Button) beforeDescendants.getChildAt(0);
-
-        afterDescendants = (ViewGroup) findViewById(R.id.afterDescendants);
-        afterDescendantsChild = (Button) afterDescendants.getChildAt(0);
-
-        blocksDescendants = (ViewGroup) findViewById(R.id.blocksDescendants);
-        blocksDescendantsChild = (Button) blocksDescendants.getChildAt(0);
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/DescendantFocusabilityTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/DescendantFocusabilityTest.java
deleted file mode 100755
index 8d29cbf553cca61a5e1cccf8ed7b5b222e13ede1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/DescendantFocusabilityTest.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.UiThreadTest;
-import android.test.TouchUtils;
-import android.view.ViewGroup;
-
-public class DescendantFocusabilityTest extends ActivityInstrumentationTestCase<DescendantFocusability> {
-
-    private DescendantFocusability a;
-
-    public DescendantFocusabilityTest() {
-        super("com.mediatek.common.widget.tests", DescendantFocusability.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        a = getActivity();
-
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertEquals(ViewGroup.FOCUS_BEFORE_DESCENDANTS,
-            a.beforeDescendants.getDescendantFocusability());
-        assertEquals(ViewGroup.FOCUS_AFTER_DESCENDANTS,
-            a.afterDescendants.getDescendantFocusability());
-        assertEquals(ViewGroup.FOCUS_BLOCK_DESCENDANTS,
-            a.blocksDescendants.getDescendantFocusability());
-
-        assertTrue(a.beforeDescendantsChild.isFocusable());
-        assertTrue(a.afterDescendantsChild.isFocusable());
-        assertTrue(a.blocksDescendantsChild.isFocusable());
-    }
-
-    @UiThreadTest
-    @MediumTest
-    public void testBeforeDescendants() {
-        a.beforeDescendants.setFocusable(true);
-
-        assertTrue(a.beforeDescendants.requestFocus());
-        assertTrue(a.beforeDescendants.isFocused());
-
-        a.beforeDescendants.setFocusable(false);
-        a.beforeDescendants.requestFocus();
-        assertTrue(a.beforeDescendantsChild.isFocused());
-    }
-
-    @UiThreadTest
-    @MediumTest
-    public void testAfterDescendants() {
-        a.afterDescendants.setFocusable(true);
-
-        assertTrue(a.afterDescendants.requestFocus());
-        assertTrue(a.afterDescendantsChild.isFocused());
-
-        a.afterDescendants.setFocusable(false);
-        assertTrue(a.afterDescendants.requestFocus());
-        assertTrue(a.afterDescendantsChild.isFocused());
-    }
-
-    @UiThreadTest
-    @MediumTest
-    public void testBlocksDescendants() {
-        a.blocksDescendants.setFocusable(true);
-        assertTrue(a.blocksDescendants.requestFocus());
-        assertTrue(a.blocksDescendants.isFocused());
-        assertFalse(a.blocksDescendantsChild.isFocused());
-
-        a.blocksDescendants.setFocusable(false);
-        assertFalse(a.blocksDescendants.requestFocus());
-        assertFalse(a.blocksDescendants.isFocused());
-        assertFalse(a.blocksDescendantsChild.isFocused());
-    }
-
-    @UiThreadTest
-    @MediumTest
-    public void testChildOfDescendantBlockerRequestFocusFails() {
-        assertFalse(a.blocksDescendantsChild.requestFocus());
-    }
-
-    @LargeTest
-    public void testBeforeDescendantsEnterTouchMode() {
-        a.runOnUiThread(new Runnable() {
-            public void run() {
-                a.beforeDescendants.setFocusableInTouchMode(true);
-                a.beforeDescendantsChild.requestFocus();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-        assertTrue(a.beforeDescendantsChild.isFocused());
-        assertFalse(a.beforeDescendantsChild.isInTouchMode());
-
-        TouchUtils.clickView(this, a.beforeDescendantsChild);
-        assertTrue(a.beforeDescendantsChild.isInTouchMode());
-        assertFalse(a.beforeDescendants.isFocused());
-    }
-
-    @LargeTest
-    public void testAfterDescendantsEnterTouchMode() {
-        try {
-            Thread.sleep(3000);
-        } catch (InterruptedException ie) {
-            // Do nothing.
-        }
-        a.runOnUiThread(new Runnable() {
-            public void run() {
-                a.afterDescendants.setFocusableInTouchMode(true);
-                a.afterDescendantsChild.requestFocus();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-        assertTrue(a.afterDescendantsChild.isFocused());
-        assertFalse(a.afterDescendantsChild.isInTouchMode());
-
-        TouchUtils.clickView(this, a.afterDescendantsChild);
-        assertTrue(a.afterDescendantsChild.isInTouchMode());
-        assertTrue(a.afterDescendants.isFocused());
-    }
-
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/FocusAfterRemoval.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/FocusAfterRemoval.java
deleted file mode 100755
index 3ef8c912ae75f28cb5173c242da898f8a5aedba2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/FocusAfterRemoval.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.LinearLayout;
-import android.widget.Button;
-import android.view.View;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * Exercises cases where elements of the UI are removed (and
- * focus should go somewhere).
- */
-public class FocusAfterRemoval extends Activity {
-
-
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.focus_after_removal);
-
-        final LinearLayout left = (LinearLayout) findViewById(R.id.leftLayout);
-
-        // top left makes parent layout GONE
-        Button topLeftButton = (Button) findViewById(R.id.topLeftButton);
-        topLeftButton.setOnClickListener(new View.OnClickListener() {
-
-            public void onClick(View v) {
-                left.setVisibility(View.GONE);
-            }
-        });
-
-        // bottom left makes parent layout INVISIBLE
-        // top left makes parent layout GONE
-        Button bottomLeftButton = (Button) findViewById(R.id.bottomLeftButton);
-        bottomLeftButton.setOnClickListener(new View.OnClickListener() {
-
-            public void onClick(View v) {
-                left.setVisibility(View.INVISIBLE);
-            }
-        });
-
-        // top right button makes top right button GONE
-        final Button topRightButton = (Button) findViewById(R.id.topRightButton);
-        topRightButton.setOnClickListener(new View.OnClickListener() {
-
-            public void onClick(View v) {
-                topRightButton.setVisibility(View.GONE);
-            }
-        });
-
-        // bottom right button makes bottom right button INVISIBLE
-        final Button bottomRightButton = (Button) findViewById(R.id.bottomRightButton);
-        bottomRightButton.setOnClickListener(new View.OnClickListener() {
-
-            public void onClick(View v) {
-                bottomRightButton.setVisibility(View.INVISIBLE);
-            }
-        });
-
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/FocusAfterRemovalTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/FocusAfterRemovalTest.java
deleted file mode 100755
index f1532cfc6942a1c317b29acfd10e0c8454ee8e08..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/FocusAfterRemovalTest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.view.KeyEvent;
-import android.view.View;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * {@link FocusAfterRemoval} is set up to exercise cases where the views that
- * have focus become invisible or GONE.
- */
-public class FocusAfterRemovalTest extends ActivityInstrumentationTestCase<FocusAfterRemoval> {
-
-    private LinearLayout mLeftLayout;
-    private Button mTopLeftButton;
-    private Button mBottomLeftButton;
-    private Button mTopRightButton;
-    private Button mBottomRightButton;
-
-    public FocusAfterRemovalTest() {
-        super("com.mediatek.common.widget.tests", FocusAfterRemoval.class);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-
-        final FocusAfterRemoval a = getActivity();
-        mLeftLayout = (LinearLayout) a.findViewById(R.id.leftLayout);
-        mTopLeftButton = (Button) a.findViewById(R.id.topLeftButton);
-        mBottomLeftButton = (Button) a.findViewById(R.id.bottomLeftButton);
-        mTopRightButton = (Button) a.findViewById(R.id.topRightButton);
-        mBottomRightButton = (Button) a.findViewById(R.id.bottomRightButton);
-    }
-
-    // Test that setUp did what we expect it to do.  These asserts
-    // can't go in SetUp, or the test will hang.
-    @MediumTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mLeftLayout);
-        assertNotNull(mTopLeftButton);
-        assertNotNull(mTopRightButton);
-        assertNotNull(mBottomLeftButton);
-        assertNotNull(mBottomRightButton);
-
-        assertTrue(mTopLeftButton.hasFocus());
-    }
-
-    // if a parent layout becomes GONE when one of its children has focus,
-    // make sure the focus moves to something visible (bug 827087)
-    @MediumTest
-    public void testFocusLeavesWhenParentLayoutIsGone() throws Exception {
-
-        // clicking on this button makes its parent linear layout GONE
-        sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
-        assertEquals(View.GONE, mLeftLayout.getVisibility());
-
-        assertTrue("focus should jump to visible button",
-                mTopRightButton.hasFocus());
-
-    }
-
-    @MediumTest
-    public void testFocusLeavesWhenParentLayoutInvisible() throws Exception {
-
-        // move down to bottom left button
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        assertTrue(mBottomLeftButton.hasFocus());
-
-        // clicking on this button makes its parent linear layout INVISIBLE
-        sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
-        assertEquals(View.INVISIBLE,
-                getActivity().findViewById(R.id.leftLayout).getVisibility());
-
-        assertTrue("focus should jump to visible button",
-                mTopRightButton.hasFocus());
-    }
-
-    @MediumTest
-    public void testFocusLeavesWhenFocusedViewBecomesGone() throws Exception {
-
-        // move to top right
-        sendKeys(KeyEvent.KEYCODE_DPAD_RIGHT);
-        assertTrue(mTopRightButton.hasFocus());
-
-        // click making it GONE
-        sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
-        assertEquals(View.GONE, mTopRightButton.getVisibility());
-
-        assertTrue("focus should jump to visible button",
-                mTopLeftButton.hasFocus());
-    }
-
-    @MediumTest
-    public void testFocusLeavesWhenFocusedViewBecomesInvisible() throws Exception {
-
-        // move to bottom right
-        sendKeys(KeyEvent.KEYCODE_DPAD_RIGHT);
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        assertTrue(mBottomRightButton.hasFocus());
-
-        // click making it INVISIBLE
-        sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
-        assertEquals(View.INVISIBLE, mBottomRightButton.getVisibility());
-
-        assertTrue("focus should jump to visible button",
-                mTopLeftButton.hasFocus());
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/FocusChangeWithInterestingRectHintTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/FocusChangeWithInterestingRectHintTest.java
deleted file mode 100755
index b3ef2aa5bd73e48b11d2b5c8b240fa3d0e9c4751..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/FocusChangeWithInterestingRectHintTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-import com.mediatek.common.widget.tests.util.InternalSelectionView;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-
-/**
- * {@link android.view.FocusFinder#findNextFocus(android.view.ViewGroup, android.view.View, int)}
- * and
- * {@link android.view.View#requestFocus(int, android.graphics.Rect)}
- * work together to give a newly focused item a hint about the most interesting
- * rectangle of the previously focused view.  The view taking focus can use this
- * to set an internal selection more appropriate using this rect.
- *
- * This tests that behavior using three adjacent {@link android.util.InternalSelectionView}
- * that report interesting rects when giving up focus, and use interesting rects
- * when taking focus to best select the internal row to show as selected.
- *
- */
-public class FocusChangeWithInterestingRectHintTest extends ActivityInstrumentationTestCase<AdjacentVerticalRectLists> {
-
-    private InternalSelectionView mLeftColumn;
-    private InternalSelectionView mMiddleColumn;
-    private InternalSelectionView mRightColumn;
-
-    public FocusChangeWithInterestingRectHintTest() {
-        super("com.mediatek.common.widget.tests", AdjacentVerticalRectLists.class);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mLeftColumn = getActivity().getLeftColumn();
-        mMiddleColumn = getActivity().getMiddleColumn();
-        mRightColumn = getActivity().getRightColumn();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mLeftColumn);
-        assertNotNull(mMiddleColumn);
-        assertNotNull(mRightColumn);
-        assertTrue(mLeftColumn.hasFocus());
-        assertTrue("need at least 3 rows", mLeftColumn.getNumRows() > 2);
-        assertEquals(mLeftColumn.getNumRows(), mMiddleColumn.getNumRows());
-        assertEquals(mMiddleColumn.getNumRows(), mRightColumn.getNumRows());
-    }
-
-
-    @LargeTest
-    public void testSnakeBackAndForth() {
-        final int numRows = mLeftColumn.getNumRows();
-        for (int row = 0; row < numRows; row++) {
-
-            if ((row % 2) == 0) {
-                assertEquals("row " + row + ": should be at left column",
-                        row, mLeftColumn.getSelectedRow());
-
-                sendKeys(KeyEvent.KEYCODE_DPAD_RIGHT);
-                assertTrue("row " + row + ": should be at middle column",
-                        mMiddleColumn.hasFocus());
-                assertEquals(row, mMiddleColumn.getSelectedRow());
-
-                sendKeys(KeyEvent.KEYCODE_DPAD_RIGHT);
-                assertTrue("row " + row + ": should be at right column",
-                        mRightColumn.hasFocus());
-                assertEquals(row, mRightColumn.getSelectedRow());
-
-                if (row < numRows - 1) {
-                    sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-                    assertEquals(row + 1, mRightColumn.getSelectedRow());
-                }
-            } else {
-                assertTrue("row " + row + ": should be at right column",
-                        mRightColumn.hasFocus());
-
-                sendKeys(KeyEvent.KEYCODE_DPAD_LEFT);
-                assertTrue("row " + row + ": should be at middle column",
-                        mMiddleColumn.hasFocus());
-                assertEquals(row, mMiddleColumn.getSelectedRow());
-
-                sendKeys(KeyEvent.KEYCODE_DPAD_LEFT);
-                assertEquals("row " + row + ": should be at left column",
-                        row, mLeftColumn.getSelectedRow());
-
-                if (row < numRows - 1) {
-                    sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-                    assertEquals(row + 1, mLeftColumn.getSelectedRow());
-                }
-           }
-        }
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/GoneParentFocusedChild.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/GoneParentFocusedChild.java
deleted file mode 100755
index 17d32efcbc05822b8a5655c8cdbb7b44d0a3e8a7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/GoneParentFocusedChild.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.LinearLayout;
-
-/**
- * An activity that helps test the scenario where a parent is
- * GONE and one of its children has focus; the activity should get
- * the key event.  see bug 945150.
- */
-public class GoneParentFocusedChild extends Activity {
-    private LinearLayout mGoneGroup;
-    private Button mButton;
-
-    private boolean mUnhandledKeyEvent = false;
-    private LinearLayout mLayout;
-
-    public boolean isUnhandledKeyEvent() {
-        return mUnhandledKeyEvent;
-    }
-
-    public LinearLayout getLayout() {
-        return mLayout;
-    }
-
-    public LinearLayout getGoneGroup() {
-        return mGoneGroup;
-    }
-
-    public Button getButton() {
-        return mButton;
-    }
-
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        mLayout = new LinearLayout(this);
-        mLayout.setOrientation(LinearLayout.HORIZONTAL);
-        mLayout.setLayoutParams(new ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT));
-
-
-        mGoneGroup = new LinearLayout(this);
-        mGoneGroup.setOrientation(LinearLayout.HORIZONTAL);
-        mGoneGroup.setLayoutParams(new ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT));
-
-        mButton = new Button(this);
-        mButton.setLayoutParams(new LinearLayout.LayoutParams(
-                ViewGroup.LayoutParams.WRAP_CONTENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT));
-
-
-        mGoneGroup.addView(mButton);
-        setContentView(mLayout);
-
-        mGoneGroup.setVisibility(View.GONE);
-        mButton.requestFocus();
-    }
-
-    public boolean onKeyUp(int keyCode, KeyEvent event) {
-        mUnhandledKeyEvent = true;
-        return true;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/GoneParentFocusedChildTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/GoneParentFocusedChildTest.java
deleted file mode 100755
index 3831c47fc3ace72f839927ede5387388e1a0ced3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/GoneParentFocusedChildTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-import android.view.View;
-
-/**
- * When a parent is GONE, key events shouldn't go to its children, even if they
- * have focus. (part of investigation into issue 945150).
- */
-public class GoneParentFocusedChildTest
-        extends ActivityInstrumentationTestCase<GoneParentFocusedChild> {
-
-
-    public GoneParentFocusedChildTest() {
-        super("com.mediatek.common.widget.tests", GoneParentFocusedChild.class);
-    }
-
-    @MediumTest
-    public void testPreconditinos() {
-        assertNotNull(getActivity().getLayout());
-        assertNotNull(getActivity().getGoneGroup());
-        assertNotNull(getActivity().getButton());
-        assertTrue("button should have focus",
-                getActivity().getButton().hasFocus());
-        assertEquals("gone group should be, well, gone!",
-                View.GONE,
-                getActivity().getGoneGroup().getVisibility());
-        assertFalse("the activity should have received no key events",
-                getActivity().isUnhandledKeyEvent());
-    }
-
-    @MediumTest
-    public void testKeyEventGoesToActivity() {
-        sendKeys(KeyEvent.KEYCODE_J);
-        assertTrue(getActivity().isUnhandledKeyEvent());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/HorizontalFocusSearch.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/HorizontalFocusSearch.java
deleted file mode 100755
index 1f334fbc8f4c53771b58366acf95f8977062efad..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/HorizontalFocusSearch.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-import android.app.Activity;
-import android.widget.LinearLayout;
-import android.widget.Button;
-import android.widget.TextView;
-import android.os.Bundle;
-import android.view.ViewGroup;
-import android.content.Context;
-
-public class HorizontalFocusSearch extends Activity {
-
-    private LinearLayout mLayout;
-
-    private Button mLeftTall;
-    private Button mMidShort1Top;
-    private Button mMidShort2Bottom;
-    private Button mRightTall;
-
-
-    public LinearLayout getLayout() {
-        return mLayout;
-    }
-
-    public Button getLeftTall() {
-        return mLeftTall;
-    }
-
-    public Button getMidShort1Top() {
-        return mMidShort1Top;
-    }
-
-    public Button getMidShort2Bottom() {
-        return mMidShort2Bottom;
-    }
-
-    public Button getRightTall() {
-        return mRightTall;
-    }
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        mLayout = new LinearLayout(this);
-        mLayout.setOrientation(LinearLayout.HORIZONTAL);
-        mLayout.setLayoutParams(new ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT));
-
-        mLeftTall = makeTall("left tall");
-        mLayout.addView(mLeftTall);
-
-        mMidShort1Top = addShort(mLayout, "mid(1) top", false);
-        mMidShort2Bottom = addShort(mLayout, "mid(2) bottom", true);
-
-        mRightTall = makeTall("right tall");
-        mLayout.addView(mRightTall);
-
-        setContentView(mLayout);
-    }
-
-    // just to get toString non-sucky
-    private static class MyButton extends Button {
-
-        public MyButton(Context context) {
-            super(context);
-        }
-
-
-        @Override
-        public String toString() {
-            return getText().toString();
-        }
-    }
-
-    private Button makeTall(String label) {
-        Button button = new MyButton(this);
-        button.setText(label);
-        button.setLayoutParams(new LinearLayout.LayoutParams(
-                ViewGroup.LayoutParams.WRAP_CONTENT,
-                ViewGroup.LayoutParams.MATCH_PARENT));
-        return button;
-    }
-
-    private Button addShort(LinearLayout root, String label, boolean atBottom) {
-        Button button = new MyButton(this);
-        button.setText(label);
-        button.setLayoutParams(new LinearLayout.LayoutParams(
-                ViewGroup.LayoutParams.WRAP_CONTENT,
-                0, // height
-                490));
-
-        TextView filler = new TextView(this);
-        filler.setText("filler");
-        filler.setLayoutParams(new LinearLayout.LayoutParams(
-                ViewGroup.LayoutParams.WRAP_CONTENT,
-                0, // height
-                510));
-
-        LinearLayout ll = new LinearLayout(this);
-        ll.setOrientation(LinearLayout.VERTICAL);
-        ll.setLayoutParams(new LinearLayout.LayoutParams(
-            ViewGroup.LayoutParams.WRAP_CONTENT,
-            ViewGroup.LayoutParams.MATCH_PARENT));
-
-        if (atBottom) {
-            ll.addView(filler);
-            ll.addView(button);
-            root.addView(ll);
-        } else {
-            ll.addView(button);
-            ll.addView(filler);
-            root.addView(ll);
-        }
-        return button;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/HorizontalFocusSearchTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/HorizontalFocusSearchTest.java
deleted file mode 100755
index bcc7b6c78c4aef3f347eafd5b52f2a1b800d11b7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/HorizontalFocusSearchTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.Suppress;
-import android.widget.LinearLayout;
-import android.widget.Button;
-import android.view.View;
-
-import static com.mediatek.common.widget.tests.focus.VerticalFocusSearchTest.FocusSearchAlg;
-import static com.mediatek.common.widget.tests.focus.VerticalFocusSearchTest.NewFocusSearchAlg;
-
-/**
- * Tests that focus searching works on a horizontal linear layout of buttons of
- * various widths and vertical placements.
- */
-// Suppress until bug http://b/issue?id=1416545 is fixed.
-@Suppress
-public class HorizontalFocusSearchTest extends ActivityInstrumentationTestCase<HorizontalFocusSearch> {
-
-    private FocusSearchAlg mFocusFinder;
-
-    private LinearLayout mLayout;
-    private Button mLeftTall;
-    private Button mMidShort1Top;
-    private Button mMidShort2Bottom;
-    private Button mRightTall;
-
-
-    public HorizontalFocusSearchTest() {
-        super("com.mediatek.common.widget.tests", HorizontalFocusSearch.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mFocusFinder = new NewFocusSearchAlg();
-
-        mLayout = getActivity().getLayout();
-        mLeftTall = getActivity().getLeftTall();
-        mMidShort1Top = getActivity().getMidShort1Top();
-        mMidShort2Bottom = getActivity().getMidShort2Bottom();
-        mRightTall = getActivity().getRightTall();
-    }
-
-    public void testPreconditions() {
-        assertNotNull(mLayout);
-        assertNotNull(mLeftTall);
-        assertNotNull(mMidShort1Top);
-        assertNotNull(mMidShort2Bottom);
-        assertNotNull(mRightTall);
-    }
-
-    public void testSearchFromLeftButton() {
-        assertNull("going up from mLeftTall",
-                mFocusFinder.findNextFocus(mLayout, mLeftTall, View.FOCUS_UP));
-        assertNull("going down from mLeftTall",
-                mFocusFinder.findNextFocus(mLayout, mLeftTall, View.FOCUS_DOWN));
-        assertNull("going left from mLeftTall",
-                mFocusFinder.findNextFocus(mLayout, mLeftTall, View.FOCUS_LEFT));
-
-        assertEquals("going right from mLeftTall",
-                mMidShort1Top,
-                mFocusFinder.findNextFocus(mLayout, mLeftTall, View.FOCUS_RIGHT));
-    }
-
-    public void TODO_testSearchFromMiddleLeftButton() {
-        assertNull("going up from mMidShort1Top",
-                mFocusFinder.findNextFocus(mLayout, mMidShort1Top, View.FOCUS_UP));
-        assertEquals("going down from mMidShort1Top",
-                mMidShort2Bottom,
-                mFocusFinder.findNextFocus(mLayout, mMidShort1Top, View.FOCUS_DOWN));
-        assertEquals("going left from mMidShort1Top",
-                mLeftTall,
-                mFocusFinder.findNextFocus(mLayout, mMidShort1Top, View.FOCUS_LEFT));
-        assertEquals("going right from mMidShort1Top",
-                mMidShort2Bottom,
-                mFocusFinder.findNextFocus(mLayout, mMidShort1Top, View.FOCUS_RIGHT));
-    }
-
-    public void TODO_testSearchFromMiddleRightButton() {
-        assertEquals("going up from mMidShort2Bottom",
-                mMidShort1Top,
-                mFocusFinder.findNextFocus(mLayout, mMidShort2Bottom, View.FOCUS_UP));
-        assertNull("going down from mMidShort2Bottom",
-                mFocusFinder.findNextFocus(mLayout, mMidShort2Bottom, View.FOCUS_DOWN));
-        assertEquals("going left from mMidShort2Bottom",
-                mMidShort1Top,
-                mFocusFinder.findNextFocus(mLayout, mMidShort2Bottom, View.FOCUS_LEFT));
-        assertEquals("goind right from mMidShort2Bottom",
-                mRightTall,
-                mFocusFinder.findNextFocus(mLayout, mMidShort2Bottom, View.FOCUS_RIGHT));
-    }
-
-    public void testSearchFromRightButton() {
-        assertNull("going up from mRightTall",
-                mFocusFinder.findNextFocus(mLayout, mRightTall, View.FOCUS_UP));
-        assertNull("going down from mRightTall",
-                mFocusFinder.findNextFocus(mLayout, mRightTall, View.FOCUS_DOWN));
-        assertEquals("going left from mRightTall",
-                mMidShort2Bottom,
-                mFocusFinder.findNextFocus(mLayout, mRightTall, View.FOCUS_LEFT));
-        assertNull("going right from mRightTall",
-                mFocusFinder.findNextFocus(mLayout, mRightTall, View.FOCUS_RIGHT));
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/LinearLayoutGrid.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/LinearLayoutGrid.java
deleted file mode 100755
index 08b2a431973cfc593a6b3acee8c2e7293a935483..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/LinearLayoutGrid.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.LinearLayout;
-
-import com.mediatek.common.widget.tests.R;
-
-public class LinearLayoutGrid extends Activity {
-
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.linear_layout_grid);
-    }
-
-    public ViewGroup getRootView() {
-        return (ViewGroup) findViewById(R.id.layout);
-    }
-
-    public Button getButtonAt(int column, int row) {
-        if (row < 0 || row > 2) {
-            throw new IllegalArgumentException("row out of range");
-        }
-        if (column < 0 || column > 2) {
-            throw new IllegalArgumentException("column out of range");
-        }
-        return (Button) getColumn(column).getChildAt(row);
-    }
-
-
-
-    private LinearLayout getColumn(int column) {
-        switch (column) {
-            case 0:
-                return (LinearLayout) findViewById(R.id.column1);
-            case 1:
-                return (LinearLayout) findViewById(R.id.column2);
-            case 2:
-                return (LinearLayout) findViewById(R.id.column3);
-            default:
-                throw new IllegalArgumentException("column out of range");
-        }
-    }
-
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/LinearLayoutGridTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/LinearLayoutGridTest.java
deleted file mode 100755
index cf0f5e615d6e9ffcfdafd89c6105cec4ec0aef02..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/LinearLayoutGridTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-import android.test.SingleLaunchActivityTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.FocusFinder;
-import android.view.View;
-import android.view.ViewGroup;
-
-/**
- * Tests focus searching between buttons within a grid that are touching, for example,
- * two buttons next two each other would have the left button's right equal to the
- * right button's left.  Same goes for top and bottom edges.
- *
- * This exercises some edge cases of {@link android.view.FocusFinder}.
- */
-public class LinearLayoutGridTest extends SingleLaunchActivityTestCase<LinearLayoutGrid> {
-    private ViewGroup mRootView;
-
-    public LinearLayoutGridTest() {
-        super("com.mediatek.common.widget.tests", LinearLayoutGrid.class);
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        mRootView = getActivity().getRootView();
-    }
-
-    @MediumTest
-    public void testGoDownFromMiddle() {
-        assertEquals(getActivity().getButtonAt(2, 1),
-                FocusFinder.getInstance().findNextFocus(
-                        mRootView,
-                        getActivity().getButtonAt(1, 1),
-                        View.FOCUS_DOWN));
-    }
-
-    @MediumTest
-    public void testGoUpFromMiddle() {
-        assertEquals(getActivity().getButtonAt(0, 1),
-                FocusFinder.getInstance().findNextFocus(
-                        mRootView,
-                        getActivity().getButtonAt(1, 1),
-                        View.FOCUS_UP));
-    }
-
-    @MediumTest
-    public void testGoRightFromMiddle() {
-        assertEquals(getActivity().getButtonAt(1, 2),
-                FocusFinder.getInstance().findNextFocus(
-                        mRootView,
-                        getActivity().getButtonAt(1, 1),
-                        View.FOCUS_RIGHT));
-    }
-
-    @MediumTest
-    public void testGoLeftFromMiddle() {
-        assertEquals(getActivity().getButtonAt(1, 0),
-                FocusFinder.getInstance().findNextFocus(
-                        mRootView,
-                        getActivity().getButtonAt(1, 1),
-                        View.FOCUS_LEFT));
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ListOfButtons.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ListOfButtons.java
deleted file mode 100755
index 8b260620e714b46f108cbe7bc3c234373e7cc360..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ListOfButtons.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-import android.app.ListActivity;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * A layout with a ListView containing buttons.
- */
-public class ListOfButtons extends ListActivity {
-
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        setContentView(R.layout.list_with_button_above);
-        getListView().setItemsCanFocus(true);
-        setListAdapter(new MyAdapter(this, mLabels));
-    }
-
-    String[] mLabels = {
-            "Alabama", "Alaska", "Arizona", "apple sauce!",
-            "California", "Colorado", "Connecticut", "Delaware"
-    };
-
-
-    public String[] getLabels() {
-        return mLabels;
-    }
-
-    public static class MyAdapter extends ArrayAdapter<String> {
-
-
-        public MyAdapter(Context context, String[] labels) {
-            super(context, 0, labels);
-        }
-
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            String label = getItem(position);
-
-            Button button = new Button(parent.getContext());
-            button.setText(label);
-            return button;
-        }
-
-        @Override
-        public boolean areAllItemsEnabled() {
-            return false;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ListOfButtonsTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ListOfButtonsTest.java
deleted file mode 100755
index b20ade0cf2d2202bca6ba731336e36a874bc465e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ListOfButtonsTest.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.ListAdapter;
-import android.widget.Button;
-import android.widget.ListView;
-import android.view.KeyEvent;
-import android.view.View;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * Tests that focus works as expected when navigating into and out of
- * a {@link ListView} that has buttons in it.
- */
-public class ListOfButtonsTest extends ActivityInstrumentationTestCase2<ListOfButtons> {
-
-    private ListAdapter mListAdapter;
-    private Button mButtonAtTop;
-
-    private ListView mListView;
-
-    public ListOfButtonsTest() {
-        super(ListOfButtons.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        ListOfButtons a = getActivity();
-        getInstrumentation().waitForIdleSync();
-        mListAdapter = a.getListAdapter();
-        mButtonAtTop = (Button) a.findViewById(R.id.button);
-        mListView = a.getListView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mListAdapter);
-        assertNotNull(mButtonAtTop);
-        assertNotNull(mListView);
-
-        assertFalse(mButtonAtTop.hasFocus());
-        assertTrue(mListView.hasFocus());
-        assertEquals("expecting 0 index to be selected",
-                0, mListView.getSelectedItemPosition());
-    }
-
-    @MediumTest
-    public void testNavigateToButtonAbove() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-
-        assertTrue(mButtonAtTop.hasFocus());
-        assertFalse(mListView.hasFocus());
-    }
-
-    @MediumTest
-    public void testNavigateToSecondItem() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-
-        assertTrue(mListView.hasFocus());
-
-        View childOne = mListView.getChildAt(1);
-        assertNotNull(childOne);
-        assertEquals(childOne, mListView.getFocusedChild());
-        assertTrue(childOne.hasFocus());
-    }
-
-    @MediumTest
-    public void testNavigateUpAboveAndBackOut() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-
-        assertFalse("button at top should have focus back",
-                mButtonAtTop.hasFocus());
-        assertTrue(mListView.hasFocus());
-    }
-
-    // TODO: this reproduces bug 981791
-    public void TODO_testNavigateThroughAllButtonsAndBack() {
-
-        String[] labels = getActivity().getLabels();
-        for (int i = 0; i < labels.length; i++) {
-            String label = labels[i];
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-            getInstrumentation().waitForIdleSync();
-
-            String indexInfo = "index: " + i + ", label: " + label;
-
-            assertTrue(indexInfo, mListView.hasFocus());
-
-            Button button = (Button) mListView.getSelectedView();
-            assertNotNull(indexInfo, button);
-            assertEquals(indexInfo, label, button.getText().toString());
-            assertTrue(indexInfo, button.hasFocus());
-        }
-
-        // pressing down again shouldn't matter; make sure last item keeps focus
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-
-
-        for (int i = labels.length - 1; i >= 0; i--) {
-            String label = labels[i];
-
-            String indexInfo = "index: " + i + ", label: " + label;
-
-            assertTrue(indexInfo, mListView.hasFocus());
-
-            Button button = (Button) mListView.getSelectedView();
-            assertNotNull(indexInfo, button);
-            assertEquals(indexInfo, label, button.getText().toString());
-            assertTrue(indexInfo, button.hasFocus());
-
-            sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-            getInstrumentation().waitForIdleSync();
-        }
-
-        assertTrue("button at top should have focus back",
-                mButtonAtTop.hasFocus());
-        assertFalse(mListView.hasFocus());
-    }
-
-    @MediumTest
-    public void testGoInAndOutOfListWithItemsFocusable() {
-
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-
-        assertTrue(mButtonAtTop.hasFocus());
-
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-
-        final String firstButtonLabel = getActivity().getLabels()[0];
-        final Button firstButton = (Button) mListView.getSelectedView();
-
-        assertTrue(firstButton.isFocused());
-        assertEquals(firstButtonLabel, firstButton.getText());
-
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        assertTrue(mButtonAtTop.isFocused());
-
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        assertTrue(firstButton.isFocused());
-
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        assertTrue(mButtonAtTop.isFocused());
-
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        assertTrue(firstButton.isFocused());
-    }
-
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ListOfEditTexts.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ListOfEditTexts.java
deleted file mode 100755
index 62bde7d94f39956dc22983a5b68a03e4bce52027..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ListOfEditTexts.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.*;
-import com.google.android.collect.Lists;
-
-import java.util.List;
-
-public class ListOfEditTexts extends Activity {
-
-    private int mLinesPerEditText = 12;
-
-    private ListView mListView;
-    private LinearLayout mLinearLayout;
-
-    public ListView getListView() {
-        return mListView;
-    }
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        // create linear layout
-        mLinearLayout = new LinearLayout(this);
-        mLinearLayout.setOrientation(LinearLayout.VERTICAL);
-        mLinearLayout.setLayoutParams(new ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT));
-
-        // add a button above
-        Button buttonAbove = new Button(this);
-        buttonAbove.setLayoutParams(
-                new LinearLayout.LayoutParams(
-                        ViewGroup.LayoutParams.MATCH_PARENT,
-                        ViewGroup.LayoutParams.WRAP_CONTENT));
-        buttonAbove.setText("button above list");
-        mLinearLayout.addView(buttonAbove);
-
-        // add a list view to it
-        mListView = new ListView(this);
-        mListView.setLayoutParams(new ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT));
-        mListView.setDrawSelectorOnTop(false);
-        mListView.setItemsCanFocus(true);
-        mListView.setLayoutParams((new LinearLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                0,
-                1f)));
-
-        List<String> bodies = Lists.newArrayList(
-                getBody("zero hello, my name is android"),
-                getBody("one i'm a paranoid android"),
-                getBody("two i robot.  huh huh."),
-                getBody("three not the g-phone!"));
-
-        mListView.setAdapter(new MyAdapter(this, bodies));
-        mLinearLayout.addView(mListView);
-
-        // add button below
-        Button buttonBelow = new Button(this);
-        buttonBelow.setLayoutParams(
-                new LinearLayout.LayoutParams(
-                        ViewGroup.LayoutParams.MATCH_PARENT,
-                        ViewGroup.LayoutParams.WRAP_CONTENT));
-        buttonBelow.setText("button below list");
-        mLinearLayout.addView(buttonBelow);
-
-        setContentView(mLinearLayout);
-    }
-
-    String getBody(String line) {
-        StringBuilder sb = new StringBuilder((line.length() + 5) * mLinesPerEditText);
-        for (int i = 0; i < mLinesPerEditText; i++) {
-            sb.append(i + 1).append(' ').append(line);
-            if (i < mLinesPerEditText - 1) {
-                sb.append('\n'); // all but last line
-            }
-        }
-        return sb.toString();
-    }
-
-
-    private static class MyAdapter extends ArrayAdapter<String> {
-
-        public MyAdapter(Context context, List<String> bodies) {
-            super(context, 0, bodies);
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            String body = getItem(position);
-
-            if (convertView != null) {
-                ((EditText) convertView).setText(body);
-                return convertView;
-            }
-
-            EditText editText = new EditText(getContext());
-            editText.setText(body);
-            return editText;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ListOfInternalSelectionViews.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ListOfInternalSelectionViews.java
deleted file mode 100755
index e74496c75c7fff0c34d80be36302c60c6407223c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ListOfInternalSelectionViews.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-import android.app.Activity;
-import android.graphics.Point;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ListView;
-import com.mediatek.common.widget.tests.util.InternalSelectionView;
-
-/**
- * A list of {@link InternalSelectionView}s paramatarized by the number of items,
- * how many rows in each item, and how tall each item is.
- */
-public class ListOfInternalSelectionViews extends Activity {
-
-    private ListView mListView;
-
-
-    // keys for initializing via Intent params
-    public static final String BUNDLE_PARAM_NUM_ITEMS = "com.google.test.numItems";
-    public static final String BUNDLE_PARAM_NUM_ROWS_PER_ITEM = "com.google.test.numRowsPerItem";
-    public static final String BUNDLE_PARAM_ITEM_SCREEN_HEIGHT_FACTOR = "com.google.test.itemScreenHeightFactor";
-
-    private int mScreenHeight;
-
-    private int mNumItems = 5;
-    private int mNumRowsPerItem = 4;
-    private double mItemScreenSizeFactor = 5 / 4;
-
-    public ListView getListView() {
-        return mListView;
-    }
-
-    /**
-     * Each item is screen height * this factor tall.
-     */
-    public double getItemScreenSizeFactor() {
-        return mItemScreenSizeFactor;
-    }
-
-    /**
-     * @return The number of rows per item.
-     */
-    public int getNumRowsPerItem() {
-        return mNumRowsPerItem;
-    }
-
-    /**
-     * @return The number of items in the list.
-     */
-    public int getNumItems() {
-        return mNumItems;
-    }
-
-    /**
-     * @param position The position
-     * @return The label (closest thing to a value) for the item at position
-     */
-    public String getLabelForPosition(int position) {
-        return "position " + position;
-    }
-
-    /**
-     * Get the currently selected view.
-     */
-    public InternalSelectionView getSelectedView() {
-        return (InternalSelectionView) getListView().getSelectedView();
-    }
-
-    /**
-     * Get the screen height.
-     */
-    public int getScreenHeight() {
-        return mScreenHeight;
-    }
-
-    /**
-     * Initialize a bundle suitable for sending as the params of the intent that
-     * launches this activity.
-     * @param numItems The number of items in the list.
-     * @param numRowsPerItem The number of rows per item.
-     * @param itemScreenHeightFactor see {@link #getScreenHeight()}
-     * @return the intialized bundle.
-     */
-    public static Bundle getBundleFor(int numItems, int numRowsPerItem, double itemScreenHeightFactor) {
-        Bundle bundle = new Bundle();
-        bundle.putInt(BUNDLE_PARAM_NUM_ITEMS, numItems);
-        bundle.putInt(BUNDLE_PARAM_NUM_ROWS_PER_ITEM, numRowsPerItem);
-        bundle.putDouble(BUNDLE_PARAM_ITEM_SCREEN_HEIGHT_FACTOR, itemScreenHeightFactor);
-        return bundle;
-    }
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        Point size = new Point();
-        getWindowManager().getDefaultDisplay().getSize(size);
-        mScreenHeight = size.y;
-
-        Bundle extras = getIntent().getExtras();
-        if (extras != null) {
-            initFromBundle(extras);
-        }
-
-        mListView = new ListView(this);
-        mListView.setLayoutParams(new ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT));
-        mListView.setDrawSelectorOnTop(false);
-        mListView.setAdapter(new MyAdapter());
-        mListView.setItemsCanFocus(true);
-        setContentView(mListView);
-    }
-
-    private void initFromBundle(Bundle icicle) {
-
-        int numItems = icicle.getInt(BUNDLE_PARAM_NUM_ITEMS, -1);
-        if (numItems != -1) {
-            mNumItems = numItems;
-        }
-        int numRowsPerItem = icicle.getInt(BUNDLE_PARAM_NUM_ROWS_PER_ITEM, -1);
-        if (numRowsPerItem != -1) {
-            mNumRowsPerItem = numRowsPerItem;
-        }
-        double screenHeightFactor = icicle.getDouble(BUNDLE_PARAM_ITEM_SCREEN_HEIGHT_FACTOR, -1.0);
-        if (screenHeightFactor > 0) {
-            mItemScreenSizeFactor = screenHeightFactor;
-        }
-    }
-
-    private class MyAdapter extends BaseAdapter {
-
-        public int getCount() {
-            return mNumItems;
-        }
-
-        public Object getItem(int position) {
-            return getLabelForPosition(position);
-        }
-
-        public long getItemId(int position) {
-            return position;
-        }
-
-        public View getView(int position, View convertView, ViewGroup parent) {
-            InternalSelectionView item =
-                    new InternalSelectionView(
-                            parent.getContext(),
-                            mNumRowsPerItem,
-                            getLabelForPosition(position));
-            item.setDesiredHeight((int) (mScreenHeight * mItemScreenSizeFactor));
-            return item;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ListWithFooterViewAndNewLabels.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ListWithFooterViewAndNewLabels.java
deleted file mode 100755
index 54c2596fde91b89e55b0f26f6fc5c36a18c43514..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ListWithFooterViewAndNewLabels.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-import android.app.ListActivity;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AbsListView;
-import android.widget.BaseAdapter;
-import android.widget.Button;
-import android.widget.TextView;
-
-import com.google.android.collect.Lists;
-
-import java.util.List;
-
-import com.mediatek.common.widget.tests.R;
-
-public class ListWithFooterViewAndNewLabels extends ListActivity {
-
-    private MyAdapter mMyAdapter;
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        setContentView(R.layout.list_with_button_above);
-
-        Button footerButton = new Button(this);
-        footerButton.setText("hi");
-        footerButton.setLayoutParams(
-                new AbsListView.LayoutParams(
-                        ViewGroup.LayoutParams.WRAP_CONTENT,
-                        ViewGroup.LayoutParams.WRAP_CONTENT));
-        getListView().addFooterView(footerButton);
-
-        mMyAdapter = new MyAdapter(this);
-        setListAdapter(mMyAdapter);
-
-        // not in list
-        Button topButton = (Button) findViewById(R.id.button);
-        topButton.setText("click to add new item");
-        topButton.setOnClickListener(new View.OnClickListener() {
-
-            public void onClick(View v) {
-                mMyAdapter.addLabel("yo");
-            }
-        });
-
-        mMyAdapter.addLabel("first");
-    }
-
-    /**
-     * An adapter that can take new string labels.
-     */
-    static class MyAdapter extends BaseAdapter {
-
-        private final Context mContext;
-        private List<String> mLabels = Lists.newArrayList();
-
-        public MyAdapter(Context context) {
-            mContext = context;
-        }
-
-        public int getCount() {
-            return mLabels.size();
-        }
-
-        public Object getItem(int position) {
-            return mLabels.get(position);
-        }
-
-        public long getItemId(int position) {
-            return position;
-        }
-
-        public View getView(int position, View convertView, ViewGroup parent) {
-            String label = mLabels.get(position);
-
-            LayoutInflater inflater = (LayoutInflater)
-                    mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
-            TextView tv = (TextView) inflater.inflate(
-                    android.R.layout.simple_list_item_1,
-                    null);
-            tv.setText(label);
-            return tv;
-        }
-
-        public void addLabel(String s) {
-            mLabels.add(s + mLabels.size());
-            notifyDataSetChanged();
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ListWithFooterViewAndNewLabelsTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ListWithFooterViewAndNewLabelsTest.java
deleted file mode 100755
index 6ede215911c8426aa1e57ac9cd81de3a3192758c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ListWithFooterViewAndNewLabelsTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-
-import android.test.ActivityInstrumentationTestCase;
-import android.widget.Button;
-import android.widget.ListAdapter;
-import android.widget.ListView;
-
-import com.mediatek.common.widget.tests.R;
-
-public class ListWithFooterViewAndNewLabelsTest
-        extends ActivityInstrumentationTestCase<ListWithFooterViewAndNewLabels> {
-
-    private Button mButton;
-
-    private ListAdapter mAdapter;
-
-    private ListView mListView;
-
-
-    public ListWithFooterViewAndNewLabelsTest() {
-        super("com.mediatek.common.widget.tests",
-                ListWithFooterViewAndNewLabels.class);
-    }
-
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        ListWithFooterViewAndNewLabels a = getActivity();
-        mButton = (Button) a.findViewById(R.id.button);
-        mAdapter = a.getListAdapter();
-        mListView = a.getListView();
-    }
-
-    // bug 900885
-    public void FAILING_testPreconditions() {
-        assertNotNull(mButton);
-        assertNotNull(mAdapter);
-        assertNotNull(mListView);
-
-        assertTrue(mButton.hasFocus());
-        assertEquals("expected list adapter to have 1 item",
-                1, mAdapter.getCount());
-        assertEquals("expected list view to have 2 items (1 in adapter, plus "
-                + "the footer view).",
-                2, mListView.getCount());
-
-        // fails here!!!
-        assertEquals("Expecting the selected index to be 0, the first non footer "
-                + "view item.",
-                0, mListView.getSelectedItemPosition());
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ListWithMailMessages.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ListWithMailMessages.java
deleted file mode 100755
index ea415d22b1c9fb56a7e3b23092b320d66a6fa68e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ListWithMailMessages.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-import com.google.android.collect.Lists;
-
-import android.app.ListActivity;
-import android.os.Bundle;
-import android.widget.ArrayAdapter;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.LayoutInflater;
-import android.webkit.WebView;
-
-import java.util.List;
-
-import com.mediatek.common.widget.tests.R;
-
-public class ListWithMailMessages extends ListActivity {
-
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.list_with_button_above);
-
-        List<MailMessage> messages = Lists.newArrayList();
-        messages.add(new MailMessage("hello!", "<p>this is a test "
-                + "message, with a bunch of text and stuff.</p>", true));
-
-//        String android = "android";
-        String android = "<a href=\"www.android.com\">android</a>";
-
-        String sentance = "all work and no play makes "
-        + android + " a dull... robot!";
-        StringBuffer longBody = new StringBuffer().append("<ol>\n");
-        for (int i = 0; i < 12; i++) {
-            longBody.append("<li>").append(sentance).append("</li>");
-        }
-        longBody.append("</ol>");
-
-        messages.add(new MailMessage("hello2!", longBody.toString(), true));
-        messages.add(new MailMessage("phone number?", "<p>hey man, what's ur "
-                + "contact info? i need to mail you this photo of my two"
-                + " cats, they've gotten soooo fat!</p>", true));
-
-        setListAdapter(new MyAdapter(this, R.layout.mail_message, messages));
-        getListView().setItemsCanFocus(true);
-    }
-
-
-    /**
-     * POJO mail message.
-     */
-    static class MailMessage {
-        private String mSubject;
-        private String mBody;
-        private boolean mFocusable;
-
-
-        public MailMessage(String subject, String body) {
-            this(subject, body, false);
-        }
-
-
-        public MailMessage(String subject, String body, boolean focusable) {
-            mSubject = subject;
-            mBody = body;
-            mFocusable = focusable;
-        }
-
-        public String getSubject() {
-            return mSubject;
-        }
-
-        public void setSubject(String subject) {
-            this.mSubject = subject;
-        }
-
-        public String getBody() {
-            return mBody;
-        }
-
-        public void setBody(String body) {
-            this.mBody = body;
-        }
-
-
-        public boolean isFocusable() {
-            return mFocusable;
-        }
-
-        public void setFocusable(boolean focusable) {
-            mFocusable = focusable;
-        }
-    }
-
-
-    public static class MyAdapter extends ArrayAdapter<MailMessage> {
-
-        public MyAdapter(Context context, int resource,
-                List<MailMessage> objects) {
-            super(context, resource, objects);
-        }
-
-        final String mimeType = "text/html";
-
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            MailMessage message = getItem(position);
-
-            LayoutInflater inflater = (LayoutInflater)
-                    getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
-            LinearLayout messageUi = (LinearLayout) inflater
-                    .inflate(R.layout.mail_message, null);
-
-            TextView subject = (TextView) messageUi.findViewById(R.id.subject);
-            subject.setText(message.getSubject());
-
-            WebView body = (WebView) messageUi.findViewById(R.id.body);
-            body.loadData(message.getBody(), mimeType, null);
-//            body.setText(message.getBody());
-            body.setFocusable(message.isFocusable());
-
-            return messageUi;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/RequestFocus.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/RequestFocus.java
deleted file mode 100755
index a7f51d3fe3a6fde91820de41759fc122242b5cbf..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/RequestFocus.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.Handler;
-import android.widget.Button;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * Exercises cases where elements of the UI are requestFocus()ed.
- */
-public class RequestFocus extends Activity {
-    protected final Handler mHandler = new Handler();
-
-    @Override protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.focus_after_removal);
-
-        // bottom right button starts with the focus.
-        final Button bottomRightButton = (Button) findViewById(R.id.bottomRightButton);
-        bottomRightButton.requestFocus();
-        bottomRightButton.setText("I should have focus");
-    }
-
-    public Handler getHandler() {
-        return mHandler;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/RequestFocusTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/RequestFocusTest.java
deleted file mode 100755
index f84bef1e34819160bd005ebe7f95a42bc87c0044..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/RequestFocusTest.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-
-import android.os.Handler;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.util.AndroidRuntimeException;
-import android.view.View.OnFocusChangeListener;
-import android.view.ViewTreeObserver.OnGlobalFocusChangeListener;
-import android.widget.Button;
-
-//import com.google.testing.littlemock.LittleMock.InOrder;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * {@link RequestFocusTest} is set up to exercise cases where the views that
- * have focus become invisible or GONE.
- */
-public class RequestFocusTest extends ActivityInstrumentationTestCase2<RequestFocus> {
-
-    private Button mTopLeftButton;
-    private Button mBottomLeftButton;
-    private Button mTopRightButton;
-    private Button mBottomRightButton;
-    private Handler mHandler;
-
-    public RequestFocusTest() {
-        super(RequestFocus.class);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-
-        final RequestFocus a = getActivity();
-        mHandler = a.getHandler();
-        mTopLeftButton = (Button) a.findViewById(R.id.topLeftButton);
-        mBottomLeftButton = (Button) a.findViewById(R.id.bottomLeftButton);
-        mTopRightButton = (Button) a.findViewById(R.id.topRightButton);
-        mBottomRightButton = (Button) a.findViewById(R.id.bottomRightButton);
-    }
-
-    // Test that setUp did what we expect it to do.  These asserts
-    // can't go in SetUp, or the test will hang.
-    @MediumTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mHandler);
-        assertNotNull(mTopLeftButton);
-        assertNotNull(mTopRightButton);
-        assertNotNull(mBottomLeftButton);
-        assertNotNull(mBottomRightButton);
-        assertTrue("requestFocus() should work from onCreate.", mBottomRightButton.hasFocus());
-    }
-
-    // Test that a posted requestFocus works.
-    @LargeTest
-    public void testPostedRequestFocus() throws Exception {
-        mHandler.post(new Runnable() { public void run() {
-            mBottomLeftButton.requestFocus();
-        } });
-        synchronized (this) {
-            try {
-                wait(500);
-            } catch (InterruptedException e) {
-                // Don't care.
-            }
-        }
-        assertTrue("Focus should move to bottom left", mBottomLeftButton.hasFocus());
-    }
-
-    // Test that a requestFocus from the wrong thread fails.
-    @MediumTest
-    public void testWrongThreadRequestFocusFails() throws Exception {
-        try {
-            mTopRightButton.requestFocus();
-            fail("requestFocus from wrong thread should raise exception.");
-        } catch (AndroidRuntimeException e) {
-            // Expected.  The actual exception is not public, so we can't catch it.
-            assertEquals("android.view.ViewRootImpl$CalledFromWrongThreadException",
-                         e.getClass().getName());
-        }
-    }
-
-    /**
-     * This tests checks the case in which the first focusable View clears focus.
-     * In such a case the framework tries to give the focus to another View starting
-     * from the top. Hence, the framework will try to give focus to the view that
-     * wants to clear its focus.
-     *
-     * @throws Exception If an error occurs.
-     */
-     /* Test Case Fail
-    @UiThreadTest
-    public void testOnFocusChangeCallbackOrderWhenClearingFocusOfFirstFocusable()
-            throws Exception {
-        // Get the first focusable.
-        Button clearingFocusButton = mTopLeftButton;
-        Button gainingFocusButton = mTopLeftButton;
-
-        // Make sure that the clearing focus View is the first focusable.
-        View focusCandidate = clearingFocusButton.getRootView().getParent().focusSearch(null,
-                View.FOCUS_FORWARD);
-        assertSame("The clearing focus button is the first focusable.",
-                clearingFocusButton, focusCandidate);
-        assertSame("The gaining focus button is the first focusable.",
-                gainingFocusButton, focusCandidate);
-
-        // Focus the clearing focus button.
-        clearingFocusButton.requestFocus();
-        assertTrue(clearingFocusButton.hasFocus());
-
-        // Register the invocation order checker.
-        CombinedListeners mock = mock(CombinedListeners.class);
-        clearingFocusButton.setOnFocusChangeListener(mock);
-        gainingFocusButton.setOnFocusChangeListener(mock);
-        clearingFocusButton.getViewTreeObserver().addOnGlobalFocusChangeListener(mock);
-
-        // Try to clear focus.
-        clearingFocusButton.clearFocus();
-
-        // Check that no callback was invoked since focus did not move.
-        InOrder inOrder = inOrder(mock);
-        inOrder.verify(mock).onFocusChange(clearingFocusButton, false);
-        inOrder.verify(mock).onGlobalFocusChanged(clearingFocusButton, gainingFocusButton);
-        inOrder.verify(mock).onFocusChange(gainingFocusButton, true);
-    }
-    */
-
-    public interface CombinedListeners extends OnFocusChangeListener, OnGlobalFocusChangeListener { }
-
-    /**
-     * This tests check whether the on focus change callbacks are invoked in
-     * the proper order when a View loses focus and the framework gives it to
-     * the fist focusable one.
-     *
-     * @throws Exception
-     */
-    /* Test Case Fail
-    @UiThreadTest
-    public void testOnFocusChangeCallbackOrderWhenClearingFocusOfNotFirstFocusable()
-            throws Exception {
-        Button clearingFocusButton = mTopRightButton;
-        Button gainingFocusButton = mTopLeftButton;
-
-        // Make sure that the clearing focus View is not the first focusable.
-        View focusCandidate = clearingFocusButton.getRootView().getParent().focusSearch(null,
-                View.FOCUS_FORWARD);
-        assertNotSame("The clearing focus button is not the first focusable.",
-                clearingFocusButton, focusCandidate);
-        assertSame("The gaining focus button is the first focusable.",
-                gainingFocusButton, focusCandidate);
-
-        // Focus the clearing focus button.
-        clearingFocusButton.requestFocus();
-        assertTrue(clearingFocusButton.hasFocus());
-
-        // Register the invocation order checker.
-        CombinedListeners mock = mock(CombinedListeners.class);
-        clearingFocusButton.setOnFocusChangeListener(mock);
-        gainingFocusButton.setOnFocusChangeListener(mock);
-        clearingFocusButton.getViewTreeObserver().addOnGlobalFocusChangeListener(mock);
-
-        // Try to clear focus.
-        clearingFocusButton.clearFocus();
-
-        // Check that no callback was invoked since focus did not move.
-        InOrder inOrder = inOrder(mock);
-        inOrder.verify(mock).onFocusChange(clearingFocusButton, false);
-        inOrder.verify(mock).onGlobalFocusChanged(clearingFocusButton, gainingFocusButton);
-        inOrder.verify(mock).onFocusChange(gainingFocusButton, true);
-    }
-    */
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ScrollingThroughListOfFocusablesTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ScrollingThroughListOfFocusablesTest.java
deleted file mode 100755
index 177ee3075bf968ca518a15b62880d7c8b7b441ac..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/ScrollingThroughListOfFocusablesTest.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-import android.graphics.Rect;
-import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import com.mediatek.common.widget.tests.util.InternalSelectionView;
-import android.view.KeyEvent;
-import android.widget.ListView;
-
-
-/**
- * TODO: extract base test case that launches {@link ListOfInternalSelectionViews} with
- * bundle params.
- */
-public class ScrollingThroughListOfFocusablesTest extends InstrumentationTestCase {
-
-    Rect mTempRect = new Rect();
-
-    private ListOfInternalSelectionViews mActivity;
-    private ListView mListView;
-
-    private int mNumItems = 4;
-    private int mNumRowsPerItem = 5;
-    private double mScreenHeightFactor = 5 / 4;
-
-    @Override
-    protected void setUp() throws Exception {
-        mActivity = launchActivity(
-                "com.mediatek.common.widget.tests",
-                ListOfInternalSelectionViews.class,
-                ListOfInternalSelectionViews.getBundleFor(
-                    mNumItems,      // 4 items
-                    mNumRowsPerItem,      // 5 internally selectable rows per item
-                    mScreenHeightFactor)); // each item is 5 / 4 screen height tall
-        mListView = mActivity.getListView();
-        // Make sure we have some fading edge regardless of ListView style.
-        mListView.setVerticalFadingEdgeEnabled(true);
-        mListView.setFadingEdgeLength(10);
-        ensureNotInTouchMode();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mActivity.finish();
-        super.tearDown();
-    }
-
-    @MediumTest
-    public void testPreconditions() throws Exception {
-        assertNotNull(mActivity);
-        assertNotNull(mListView);
-        assertEquals(mNumItems, mActivity.getNumItems());
-        assertEquals(mNumRowsPerItem, mActivity.getNumRowsPerItem());
-    }
-
-    @MediumTest
-    public void testScrollingDownInFirstItem() throws Exception {
-
-        for (int i = 0; i < mNumRowsPerItem; i++) {
-            assertEquals(0, mListView.getSelectedItemPosition());
-
-            InternalSelectionView view = mActivity.getSelectedView();
-
-            assertInternallySelectedRowOnScreen(view, i);
-
-            // move to next row
-            if (i < mNumRowsPerItem - 1) {
-                sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-                getInstrumentation().waitForIdleSync();
-            }
-        }
-
-        {
-            assertEquals(0, mListView.getSelectedItemPosition());
-            InternalSelectionView view = (InternalSelectionView)
-                    mListView.getSelectedView();
-
-            // 1 pixel tolerance in case height / 4 is not an even number
-            final int bottomFadingEdgeTop =
-                mListView.getBottom() - mListView.getVerticalFadingEdgeLength();
-            assertTrue("bottom of view should be just above fading edge",
-                    view.getBottom() == bottomFadingEdgeTop);
-        }
-
-        // make sure fading edge is the expected view
-        {
-            assertEquals("should be a second view visible due to the fading edge",
-                            2, mListView.getChildCount());
-            InternalSelectionView peekingChild = (InternalSelectionView)
-                    mListView.getChildAt(1);
-            assertNotNull(peekingChild);
-            assertEquals("wrong value for peeking list item",
-                    mActivity.getLabelForPosition(1), peekingChild.getLabel());
-        }
-    }
-
-    @MediumTest
-    public void testScrollingToSecondItem() throws Exception {
-
-        for (int i = 0; i < mNumRowsPerItem; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-            getInstrumentation().waitForIdleSync();
-        }
-
-        assertEquals("should have moved to second item",
-                1, mListView.getSelectedItemPosition());
-    }
-
-    @LargeTest
-    public void testNoFadingEdgeAtBottomOfLastItem() {
-
-        // move down to last item
-        for (int i = 0; i < mNumItems; i++) {
-            for (int j = 0; j < mNumRowsPerItem; j++) {
-                if (i < mNumItems - 1 || j < mNumRowsPerItem - 1) {
-                    sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-                    getInstrumentation().waitForIdleSync();
-                }
-            }
-        }
-
-        assertEquals(mNumItems - 1, mListView.getSelectedItemPosition());
-        InternalSelectionView view = mActivity.getSelectedView();
-        assertEquals(mNumRowsPerItem - 1, view.getSelectedRow());
-
-        view.getRectForRow(mTempRect, mNumRowsPerItem - 1);
-        mListView.offsetDescendantRectToMyCoords(view, mTempRect);
-
-        assertTrue("bottom of last row of last item should be at " +
-                "the bottom of the list view (no fading edge)",
-                mListView.getBottom() - mListView.getVerticalFadingEdgeLength() < mTempRect.bottom);
-    }
-
-    @LargeTest
-    public void testNavigatingUpThroughInternalSelection() throws Exception {
-
-        // get to bottom of second item
-        for (int i = 0; i < 2; i++) {
-            for (int j = 0; j < mNumRowsPerItem; j++) {
-                if (i < 1 || j < mNumRowsPerItem - 1) {
-                    sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-                    getInstrumentation().waitForIdleSync();
-                }
-            }
-        }
-
-
-        // (make sure we are at last row of second item)
-        {
-            assertEquals(1, mListView.getSelectedItemPosition());
-            InternalSelectionView view = mActivity.getSelectedView();
-            assertEquals(mNumRowsPerItem - 1, view.getSelectedRow());
-        }
-
-        // go back up to the top of the second item
-        for (int i = mNumRowsPerItem - 1; i >= 0; i--) {
-            assertEquals(1, mListView.getSelectedItemPosition());
-            InternalSelectionView view = mActivity.getSelectedView();
-
-            assertInternallySelectedRowOnScreen(view, i);
-
-            // move up to next row
-            if (i > 0) {
-                sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-                getInstrumentation().waitForIdleSync();
-            }
-        }
-
-        // now we are at top row, should have caused scrolling, and fading edge...
-        {
-            assertEquals(1, mListView.getSelectedItemPosition());
-            InternalSelectionView view = mActivity.getSelectedView();
-            assertEquals(0, view.getSelectedRow());
-
-            view.getDrawingRect(mTempRect);
-            mListView.offsetDescendantRectToMyCoords(view, mTempRect);
-            assertEquals("top of selected row should be just below top vertical fading edge",
-                    mListView.getVerticalFadingEdgeLength(),
-                    view.getTop());
-        }
-
-        // make sure fading edge is the view we expect
-        {
-            final InternalSelectionView view =
-                    (InternalSelectionView) mListView.getChildAt(0);
-            assertEquals(mActivity.getLabelForPosition(0), view.getLabel());
-        }
-
-
-    }
-
-    /**
-     * @param internalFocused The view to check
-     * @param row
-     */
-    private void assertInternallySelectedRowOnScreen(
-            InternalSelectionView internalFocused,
-            int row) {
-        assertEquals("expecting selected row",
-                row, internalFocused.getSelectedRow());
-
-        internalFocused.getRectForRow(mTempRect, row);
-        mListView.offsetDescendantRectToMyCoords(internalFocused, mTempRect);
-
-        assertTrue("top of row " + row + " should be on sreen",
-                mTempRect.top >= 0);
-        assertTrue("bottom of row " + row + " should be on sreen",
-                mTempRect.bottom < mActivity.getScreenHeight());
-    }
-
-    private void ensureNotInTouchMode() {
-        // If in touch mode inject a DPAD down event to exit that mode.
-        if (mListView.isInTouchMode()) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-            getInstrumentation().waitForIdleSync();
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/VerticalFocusSearch.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/VerticalFocusSearch.java
deleted file mode 100755
index b862c5707591dcf08eafea6f678ff754eac633ac..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/VerticalFocusSearch.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.LinearLayout;
-import android.widget.Button;
-import android.widget.TextView;
-import android.view.Gravity;
-import android.view.ViewGroup;
-import android.content.Context;
-
-/**
- * Holds a few buttons of various sizes and horizontal placements in a
- * vertical layout to excercise some core focus searching.
- */
-public class VerticalFocusSearch extends Activity {
-
-    private LinearLayout mLayout;
-
-    private Button mTopWide;
-    private Button mMidSkinny1Left;
-    private Button mBottomWide;
-
-    private Button mMidSkinny2Right;
-
-
-    public LinearLayout getLayout() {
-        return mLayout;
-    }
-
-    public Button getTopWide() {
-        return mTopWide;
-    }
-
-    public Button getMidSkinny1Left() {
-        return mMidSkinny1Left;
-    }
-
-    public Button getMidSkinny2Right() {
-        return mMidSkinny2Right;
-    }
-
-    public Button getBottomWide() {
-        return mBottomWide;
-    }
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        mLayout = new LinearLayout(this);
-        mLayout.setOrientation(LinearLayout.VERTICAL);
-        mLayout.setHorizontalGravity(Gravity.LEFT);
-        mLayout.setLayoutParams(new ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT));
-
-        mTopWide = makeWide("top wide");
-        mLayout.addView(mTopWide);
-
-        mMidSkinny1Left = addSkinny(mLayout, "mid skinny 1(L)", false);
-
-        mMidSkinny2Right = addSkinny(mLayout, "mid skinny 2(R)", true);
-
-        mBottomWide = makeWide("bottom wide");
-        mLayout.addView(mBottomWide);
-
-        setContentView(mLayout);
-    }
-
-    // just to get toString non-sucky
-    private static class MyButton extends Button {
-
-        public MyButton(Context context) {
-            super(context);
-        }
-
-
-        @Override
-        public String toString() {
-            return getText().toString();
-        }
-    }
-
-    private Button makeWide(String label) {
-        Button button = new MyButton(this);
-        button.setText(label);
-        button.setLayoutParams(new LinearLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT));
-        return button;
-    }
-
-    /**
-     * Add a skinny button that takes up just less than half of the screen
-     * horizontally.
-     * @param root The layout to add the button to.
-     * @param label The label of the button.
-     * @param atRight Which side to put the button on.
-     * @return The newly created button.
-     */
-    private Button addSkinny(LinearLayout root, String label, boolean atRight) {
-        Button button = new MyButton(this);
-        button.setText(label);
-        button.setLayoutParams(new LinearLayout.LayoutParams(
-                0, // width
-                ViewGroup.LayoutParams.WRAP_CONTENT,
-                480));
-
-        TextView filler = new TextView(this);
-        filler.setText("filler");
-        filler.setLayoutParams(new LinearLayout.LayoutParams(
-                0, // width
-                ViewGroup.LayoutParams.WRAP_CONTENT,
-                520));
-
-        LinearLayout ll = new LinearLayout(this);
-        ll.setOrientation(LinearLayout.HORIZONTAL);
-        ll.setLayoutParams(new LinearLayout.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT,
-            ViewGroup.LayoutParams.WRAP_CONTENT));
-
-        if (atRight) {
-            ll.addView(filler);
-            ll.addView(button);
-            root.addView(ll);
-        } else {
-            ll.addView(button);
-            ll.addView(filler);
-            root.addView(ll);
-        }
-        return button;
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/VerticalFocusSearchTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/VerticalFocusSearchTest.java
deleted file mode 100755
index 10aa4784265086d6e4fbd1457db2334ab9fcafe7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/focus/VerticalFocusSearchTest.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.focus;
-
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.Suppress;
-import android.view.FocusFinder;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.LinearLayout;
-
-/**
- * Tests that focus searching works on a vertical linear layout of buttons of
- * various widths and horizontal placements.
- */
-// Suppress until bug http://b/issue?id=1416545 is fixed
-@Suppress
-public class VerticalFocusSearchTest extends ActivityInstrumentationTestCase<VerticalFocusSearch> {
-
-    private LinearLayout mLayout;
-
-    private Button mTopWide;
-    private Button mMidSkinny1Left;
-    private Button mMidSkinny2Right;
-    private Button mBottomWide;
-
-    private FocusSearchAlg mFocusFinder;
-
-    // helps test old and new impls when figuring out why something that used
-    // to work doesn't anymore (or verifying that new works as well as old).
-    interface FocusSearchAlg {
-        View findNextFocus(ViewGroup root, View focused, int direction);
-    }
-
-    // calls new impl
-    static class NewFocusSearchAlg implements FocusSearchAlg {
-
-        public View findNextFocus(ViewGroup root, View focused, int direction) {
-            return FocusFinder.getInstance()
-                    .findNextFocus(root, focused, direction);
-        }
-    }
-
-    public VerticalFocusSearchTest() {
-        super("com.mediatek.common.widget.tests", VerticalFocusSearch.class);
-    }
-
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mLayout = getActivity().getLayout();
-        mTopWide = getActivity().getTopWide();
-        mMidSkinny1Left = getActivity().getMidSkinny1Left();
-        mMidSkinny2Right = getActivity().getMidSkinny2Right();
-        mBottomWide = getActivity().getBottomWide();
-
-        mFocusFinder = new NewFocusSearchAlg();
-    }
-
-    public void testPreconditions() {
-        assertNotNull(mLayout);
-        assertNotNull(mTopWide);
-        assertNotNull(mMidSkinny1Left);
-        assertNotNull(mMidSkinny2Right);
-        assertNotNull(mBottomWide);
-    }
-
-    public void testSearchFromTopButton() {
-        assertNull("going up from mTopWide.",
-                mFocusFinder.findNextFocus(mLayout, mTopWide, View.FOCUS_UP));
-
-        assertNull("going left from mTopWide.",
-                mFocusFinder.findNextFocus(mLayout, mTopWide, View.FOCUS_LEFT));
-
-        assertNull("going right from mTopWide.",
-                mFocusFinder.findNextFocus(mLayout, mTopWide, View.FOCUS_RIGHT));
-
-        assertEquals("going down from mTopWide.",
-                mMidSkinny1Left,
-                mFocusFinder
-                .findNextFocus(mLayout, mTopWide, View.FOCUS_DOWN));
-    }
-
-    public void testSearchFromMidLeft() {
-        assertNull("going left should have no next focus",
-                mFocusFinder.findNextFocus(mLayout, mMidSkinny1Left, View.FOCUS_LEFT));
-
-        assertEquals("going right from mMidSkinny1Left should go to mMidSkinny2Right",
-                mMidSkinny2Right,
-                mFocusFinder.findNextFocus(mLayout, mMidSkinny1Left, View.FOCUS_RIGHT));
-
-        assertEquals("going up from mMidSkinny1Left should go to mTopWide",
-                mTopWide,
-                mFocusFinder.findNextFocus(mLayout, mMidSkinny1Left, View.FOCUS_UP));
-
-        assertEquals("going down from mMidSkinny1Left should go to mMidSkinny2Right",
-                mMidSkinny2Right,
-                mFocusFinder.findNextFocus(mLayout, mMidSkinny1Left, View.FOCUS_DOWN));
-    }
-
-    public void testSearchFromMidRight() {
-        assertEquals("going left from mMidSkinny2Right should go to mMidSkinny1Left",
-                mMidSkinny1Left,
-                mFocusFinder.findNextFocus(mLayout, mMidSkinny2Right, View.FOCUS_LEFT));
-
-        assertNull("going right should have no next focus",
-                mFocusFinder.findNextFocus(mLayout, mMidSkinny2Right, View.FOCUS_RIGHT));
-
-        assertEquals("going up from mMidSkinny2Right should go to mMidSkinny1Left",
-                mMidSkinny1Left,
-                mFocusFinder.findNextFocus(mLayout, mMidSkinny2Right, View.FOCUS_UP));
-
-        assertEquals("going down from mMidSkinny2Right should go to mBottomWide",
-                mBottomWide,
-                mFocusFinder.findNextFocus(mLayout, mMidSkinny2Right, View.FOCUS_DOWN));
-
-    }
-
-    public void testSearchFromFromBottom() {
-        assertNull("going down from bottom button should have no next focus.",
-                mFocusFinder.findNextFocus(mLayout, mBottomWide, View.FOCUS_DOWN));
-
-        assertNull("going left from bottom button should have no next focus.",
-                mFocusFinder.findNextFocus(mLayout, mBottomWide, View.FOCUS_LEFT));
-
-        assertNull("going right from bottom button should have no next focus.",
-                mFocusFinder.findNextFocus(mLayout, mBottomWide, View.FOCUS_RIGHT));
-
-        assertEquals("going up from bottom button should go to mMidSkinny2Right.",
-                mMidSkinny2Right,
-                mFocusFinder.findNextFocus(mLayout, mBottomWide, View.FOCUS_UP));
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridDelete.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridDelete.java
deleted file mode 100755
index 3311da7bd763baa353bbbcb7fd0e31e584899e47..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridDelete.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.GridView;
-import android.widget.ListAdapter;
-
-import com.mediatek.common.widget.tests.util.GridScenario;
-
-import java.util.ArrayList;
-
-/**
- * A grid with vertical spacing between rows
- */
-public class GridDelete extends GridScenario {
-    @Override
-    protected void init(Params params) {
-        params.setStartingSelectionPosition(-1)
-                .setMustFillScreen(false)
-                .setNumItems(1001)
-                .setNumColumns(4)
-                .setItemScreenSizeFactor(0.20)
-                .setVerticalSpacing(20);
-    }
-
-
-
-    @Override
-    protected ListAdapter createAdapter() {
-        return new DeleteAdapter(getInitialNumItems());
-    }
-
-
-
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_DEL) {
-            GridView g = getGridView();
-            ((DeleteAdapter) g.getAdapter()).deletePosition(g.getSelectedItemPosition());
-            return true;
-        } else {
-            return super.onKeyDown(keyCode, event);
-        }
-    }
-
-
-
-
-    private class DeleteAdapter extends BaseAdapter {
-
-        private ArrayList<Integer> mData;
-
-        public DeleteAdapter(int initialNumItems) {
-            super();
-            mData = new ArrayList<Integer>(initialNumItems);
-
-            int i;
-            for (i = 0; i < initialNumItems; ++i) {
-                mData.add(new Integer(10000 + i));
-            }
-
-        }
-
-        public void deletePosition(int selectedItemPosition) {
-            if (selectedItemPosition >= 0 && selectedItemPosition < mData.size()) {
-                mData.remove(selectedItemPosition);
-                notifyDataSetChanged();
-            }
-
-        }
-
-        public int getCount() {
-            return mData.size();
-        }
-
-        public Object getItem(int position) {
-            return mData.get(position);
-        }
-
-        public long getItemId(int position) {
-            return mData.get(position);
-        }
-
-        public View getView(int position, View convertView, ViewGroup parent) {
-            int desiredHeight = getDesiredItemHeight();
-            return createView(mData.get(position), parent, desiredHeight);
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridInHorizontal.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridInHorizontal.java
deleted file mode 100755
index 54bd8b725eefde164480358647acb9d6c9e9f563..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridInHorizontal.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.Handler;
-import android.widget.ArrayAdapter;
-import android.widget.GridView;
-import android.widget.TextView;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * Exercises a grid in a horizontal linear layout
- */
-public class GridInHorizontal extends Activity {
-    Handler mHandler = new Handler();
-    TextView mText;
-    GridView mGridView;
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        setContentView(R.layout.grid_in_horizontal);
-
-        String values[] = new String[1000];
-        int i = 0;
-        for (i = 0; i < 1000; i++) {
-            values[i] = ((Integer) i).toString();
-        }
-
-        mText = (TextView) findViewById(R.id.text);
-        mGridView = (GridView) findViewById(R.id.grid);
-        mGridView.setAdapter(new ArrayAdapter<String>(this,
-                android.R.layout.simple_list_item_1, values));
-
-    }
-
-    public GridView getGridView() {
-        return mGridView;
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridInHorizontalTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridInHorizontalTest.java
deleted file mode 100755
index a429b01e9a5fee47e6cc757fb0792094cc8d8adf..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridInHorizontalTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.GridView;
-
-
-public class GridInHorizontalTest extends ActivityInstrumentationTestCase<GridInHorizontal> {
-
-    private GridInHorizontal mActivity;
-    private GridView mGridView;
-
-    public GridInHorizontalTest() {
-        super("com.mediatek.common.widget.tests", GridInHorizontal.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mGridView = getActivity().getGridView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mGridView);
-        assertTrue("Grid has 0 width", mGridView.getMeasuredWidth() > 0);
-        assertTrue("Grid has 0 height", mGridView.getMeasuredHeight() > 0);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridInVertical.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridInVertical.java
deleted file mode 100755
index 792b2a57f677e6625136c780bd1ae53db158acd4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridInVertical.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.Handler;
-import android.widget.ArrayAdapter;
-import android.widget.GridView;
-import android.widget.TextView;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * Exercises a grid in a vertical linear layout
- */
-public class GridInVertical extends Activity {
-    Handler mHandler = new Handler();
-    TextView mText;
-    GridView mGridView;
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        setContentView(R.layout.grid_in_vertical);
-
-        String values[] = new String[1000];
-        int i = 0;
-        for (i = 0; i < 1000; i++) {
-            values[i] = ((Integer) i).toString();
-        }
-
-        mText = (TextView) findViewById(R.id.text);
-        mGridView = (GridView) findViewById(R.id.grid);
-        mGridView.setAdapter(new ArrayAdapter<String>(this,
-                android.R.layout.simple_list_item_1, values));
-
-    }
-
-    public GridView getGridView() {
-        return mGridView;
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridInVerticalTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridInVerticalTest.java
deleted file mode 100755
index 95115b9f291e7cc6a363c4daba3b7547563a4206..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridInVerticalTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.GridView;
-
-
-public class GridInVerticalTest extends ActivityInstrumentationTestCase<GridInVertical> {
-
-    private GridInVertical mActivity;
-    private GridView mGridView;
-
-    public GridInVerticalTest() {
-        super("com.mediatek.common.widget.tests", GridInVertical.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mGridView = getActivity().getGridView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mGridView);
-        assertTrue("Grid has 0 width", mGridView.getMeasuredWidth() > 0);
-        assertTrue("Grid has 0 height", mGridView.getMeasuredHeight() > 0);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridPadding.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridPadding.java
deleted file mode 100755
index 997d396b8e884ac7cf7e997906b6bd9678aefdf5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridPadding.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.ArrayAdapter;
-import android.widget.GridView;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * Exercises a grid with padding
- */
-public class GridPadding extends Activity {
-    private GridView mGridView;
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        setContentView(R.layout.grid_padding);
-
-        String values[] = new String[1000];
-        for (int i = 0; i < 1000; i++) {
-            values[i] = String.valueOf(i);
-        }
-
-        mGridView = (GridView) findViewById(R.id.grid);
-        mGridView.setAdapter(new ArrayAdapter<String>(this,
-                android.R.layout.simple_list_item_1, values));
-    }
-
-    public GridView getGridView() {
-        return mGridView;
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridPaddingTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridPaddingTest.java
deleted file mode 100755
index 55e47c2e2ae5fb8daab8e929c2bc601940c1a35c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridPaddingTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.GridView;
-
-public class GridPaddingTest extends ActivityInstrumentationTestCase2<GridPadding> {
-    private GridView mGridView;
-
-    public GridPaddingTest() {
-        super("com.mediatek.common.widget.tests", GridPadding.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        setActivityInitialTouchMode(true);
-        mGridView = getActivity().getGridView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mGridView);
-        assertTrue("Not in touch mode", mGridView.isInTouchMode());
-    }
-
-    @MediumTest
-    public void testResurrectSelection() {
-        sendKeys("DPAD_DOWN");
-        assertEquals("The first item should be selected", mGridView.getSelectedItemPosition(), 0);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridScrollListener.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridScrollListener.java
deleted file mode 100755
index 956b0c6f3e57aa5e49729bd0f02a07e46c9cb2ef..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridScrollListener.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.Handler;
-import android.widget.AbsListView;
-import android.widget.ArrayAdapter;
-import android.widget.GridView;
-import android.widget.TextView;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * Exercises change notification in a list
- */
-public class GridScrollListener extends Activity implements AbsListView.OnScrollListener {
-    Handler mHandler = new Handler();
-    TextView mText;
-    GridView mGridView;
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        setContentView(R.layout.grid_scroll_listener);
-
-        String values[] = new String[1000];
-        int i = 0;
-        for (i = 0; i < 1000; i++) {
-            values[i] = ((Integer) i).toString();
-        }
-
-        mText = (TextView) findViewById(R.id.text);
-        mGridView = (GridView) findViewById(R.id.grid);
-        mGridView.setAdapter(new ArrayAdapter<String>(this,
-                android.R.layout.simple_list_item_1, values));
-
-        mGridView.setOnScrollListener(this);
-    }
-
-    public GridView getGridView() {
-        return mGridView;
-    }
-
-    public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
-        int lastItem = firstVisibleItem + visibleItemCount - 1;
-        mText.setText("Showing " + firstVisibleItem + "-" + lastItem + "/" + totalItemCount);
-    }
-
-    public void onScrollStateChanged(AbsListView view, int scrollState) {
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridScrollListenerTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridScrollListenerTest.java
deleted file mode 100755
index 370e1786f6201bd3adf8a815219a6f8adb8c6f3e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridScrollListenerTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-import android.app.Instrumentation;
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.TouchUtils;
-import android.view.KeyEvent;
-import android.widget.AbsListView;
-import android.widget.GridView;
-
-
-public class GridScrollListenerTest extends ActivityInstrumentationTestCase<GridScrollListener> implements
-        AbsListView.OnScrollListener {
-    private GridScrollListener mActivity;
-    private GridView mGridView;
-    private int mFirstVisibleItem = -1;
-    private int mVisibleItemCount = -1;
-    private int mTotalItemCount = -1;
-
-    public GridScrollListenerTest() {
-        super("com.mediatek.common.widget.tests", GridScrollListener.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mGridView = getActivity().getGridView();
-        mGridView.setOnScrollListener(this);
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mGridView);
-
-        assertEquals(0, mFirstVisibleItem);
-    }
-
-    @LargeTest
-    public void testKeyScrolling() {
-        Instrumentation inst = getInstrumentation();
-
-        int firstVisibleItem = mFirstVisibleItem;
-        for (int i = 0; i < mVisibleItemCount * 2; i++) {
-            inst.sendCharacterSync(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-        inst.waitForIdleSync();
-
-        assertTrue("Arrow scroll did not happen", mFirstVisibleItem > firstVisibleItem);
-
-        firstVisibleItem = mFirstVisibleItem;
-        inst.sendCharacterSync(KeyEvent.KEYCODE_SPACE);
-        inst.waitForIdleSync();
-
-        assertTrue("Page scroll did not happen", mFirstVisibleItem > firstVisibleItem);
-
-        firstVisibleItem = mFirstVisibleItem;
-        KeyEvent down = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN,
-                KeyEvent.KEYCODE_DPAD_DOWN, 0, KeyEvent.META_ALT_ON);
-        KeyEvent up = new KeyEvent(0, 0, KeyEvent.ACTION_UP,
-                KeyEvent.KEYCODE_DPAD_DOWN, 0, KeyEvent.META_ALT_ON);
-        inst.sendKeySync(down);
-        inst.sendKeySync(up);
-        inst.waitForIdleSync();
-
-        assertTrue("Full scroll did not happen", mFirstVisibleItem > firstVisibleItem);
-        assertEquals("Full scroll did not happen", mTotalItemCount,
-                mFirstVisibleItem + mVisibleItemCount);
-    }
-
-    @LargeTest
-    public void testTouchScrolling() {
-        Instrumentation inst = getInstrumentation();
-
-        int firstVisibleItem = mFirstVisibleItem;
-        TouchUtils.dragQuarterScreenUp(this);
-        TouchUtils.dragQuarterScreenUp(this);
-        assertTrue("Touch scroll did not happen", mFirstVisibleItem > firstVisibleItem);
-    }
-
-
-    public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
-        mFirstVisibleItem = firstVisibleItem;
-        mVisibleItemCount = visibleItemCount;
-        mTotalItemCount = totalItemCount;
-    }
-
-    public void onScrollStateChanged(AbsListView view, int scrollState) {
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelection.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelection.java
deleted file mode 100755
index c1b3172e339bbcbb563db26ae56493bb6dc13a4c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelection.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-import com.mediatek.common.widget.tests.util.GridScenario;
-
-/**
- * Basic stacking from top scenario, nothing fancy. Items do not
- * fill the screen.
- */
-public class GridSetSelection extends GridScenario {
-    @Override
-    protected void init(Params params) {
-        params.setStackFromBottom(false)
-                .setStartingSelectionPosition(-1)
-                .setMustFillScreen(false)
-                .setNumItems(15)
-                .setNumColumns(4)
-                .setItemScreenSizeFactor(0.12);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionBaseTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionBaseTest.java
deleted file mode 100755
index 139331ba777fcfc46ec44b5ea9a61f44b53cc4e9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionBaseTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-import com.mediatek.common.widget.tests.util.GridScenario;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.ViewAsserts;
-import android.widget.GridView;
-
-public class GridSetSelectionBaseTest<T extends GridScenario> extends ActivityInstrumentationTestCase<T> {
-    private T mActivity;
-    private GridView mGridView;
-
-    protected GridSetSelectionBaseTest(Class<T> klass) {
-        super("com.mediatek.common.widget.tests", klass);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mGridView = getActivity().getGridView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mGridView);
-
-        // First item should be selected
-        if (mGridView.isStackFromBottom()) {
-            assertEquals(mGridView.getAdapter().getCount() - 1,
-                    mGridView.getSelectedItemPosition());
-        } else {
-            assertEquals(0, mGridView.getSelectedItemPosition());
-        }
-    }
-
-    @MediumTest
-    public void testSetSelectionToTheEnd() {
-        final int target = mGridView.getAdapter().getCount() - 1;
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setSelection(target);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-
-        assertEquals(mGridView.getSelectedItemPosition(), target);
-        assertNotNull(mGridView.getSelectedView());
-
-        ViewAsserts.assertOnScreen(mGridView, mGridView.getSelectedView());
-    }
-
-    @MediumTest
-    public void testSetSelectionToMiddle() {
-        final int target = mGridView.getAdapter().getCount() / 2;
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setSelection(target);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-
-        assertEquals(mGridView.getSelectedItemPosition(), target);
-        assertNotNull(mGridView.getSelectedView());
-
-        ViewAsserts.assertOnScreen(mGridView, mGridView.getSelectedView());
-    }
-
-    @MediumTest
-    public void testSetSelectionToTheTop() {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setSelection(0);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-
-        assertEquals(mGridView.getSelectedItemPosition(), 0);
-        assertNotNull(mGridView.getSelectedView());
-
-        ViewAsserts.assertOnScreen(mGridView, mGridView.getSelectedView());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionMany.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionMany.java
deleted file mode 100755
index a2941e3649e8bdb5732020bfb1d87f370f835237..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionMany.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-import com.mediatek.common.widget.tests.util.GridScenario;
-
-/**
- * Basic stacking from top scenario, nothing fancy. Items do
- * fill the screen.
- */
-public class GridSetSelectionMany extends GridScenario {
-    @Override
-    protected void init(Params params) {
-        params.setStackFromBottom(false)
-                .setStartingSelectionPosition(-1)
-                .setMustFillScreen(false)
-                .setNumItems(150)
-                .setNumColumns(4)
-                .setItemScreenSizeFactor(0.12);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionManyTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionManyTest.java
deleted file mode 100755
index f95cf62a9971486af21495dda5df30d1f0163295..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionManyTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-
-public class GridSetSelectionManyTest extends GridSetSelectionBaseTest<GridSetSelectionMany> {
-    public GridSetSelectionManyTest() {
-        super(GridSetSelectionMany.class);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionStackFromBottom.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionStackFromBottom.java
deleted file mode 100755
index b27ba67876a66c45641c6f2d15ebded6f828385e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionStackFromBottom.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-import com.mediatek.common.widget.tests.util.GridScenario;
-
-/**
- * Basic stacking from bottom scenario, nothing fancy. Items do not
- * fill the screen.
- */
-public class GridSetSelectionStackFromBottom extends GridScenario {
-    @Override
-    protected void init(Params params) {
-        params.setStackFromBottom(true)
-                .setStartingSelectionPosition(-1)
-                .setMustFillScreen(false)
-                .setNumItems(15)
-                .setNumColumns(4)
-                .setItemScreenSizeFactor(0.12);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionStackFromBottomMany.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionStackFromBottomMany.java
deleted file mode 100755
index ae3cb6d886d9a4b24fd64b09bf8fe763a381c485..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionStackFromBottomMany.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-import com.mediatek.common.widget.tests.util.GridScenario;
-
-/**
- * Basic stacking from bottom scenario, nothing fancy. Items do
- * fill the screen.
- */
-public class GridSetSelectionStackFromBottomMany extends GridScenario {
-    @Override
-    protected void init(Params params) {
-        params.setStackFromBottom(true)
-                .setStartingSelectionPosition(-1)
-                .setMustFillScreen(false)
-                .setNumItems(150)
-                .setNumColumns(4)
-                .setItemScreenSizeFactor(0.12);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionStackFromBottomManyTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionStackFromBottomManyTest.java
deleted file mode 100755
index a36cad74b492c28e717f084ebe6e67f0ab64894b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionStackFromBottomManyTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-
-public class GridSetSelectionStackFromBottomManyTest extends GridSetSelectionBaseTest<GridSetSelectionStackFromBottomMany> {
-    public GridSetSelectionStackFromBottomManyTest() {
-        super(GridSetSelectionStackFromBottomMany.class);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionStackFromBottomTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionStackFromBottomTest.java
deleted file mode 100755
index 90cf5ede8defeab65c24813b518d334fe9080ca3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionStackFromBottomTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-
-public class GridSetSelectionStackFromBottomTest extends GridSetSelectionBaseTest<GridSetSelectionStackFromBottom> {
-    public GridSetSelectionStackFromBottomTest() {
-        super(GridSetSelectionStackFromBottom.class);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionTest.java
deleted file mode 100755
index 3751d6703cd14d3c3d44185a3a07d655e46b2925..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSetSelectionTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-
-public class GridSetSelectionTest extends GridSetSelectionBaseTest<GridSetSelection> {
-    public GridSetSelectionTest() {
-        super(GridSetSelection.class);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSimple.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSimple.java
deleted file mode 100755
index 2ed17ab421edd27c6746bc8ba73a47ca75c45e45..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSimple.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-import android.graphics.drawable.PaintDrawable;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import com.mediatek.common.widget.tests.util.GridScenario;
-
-public class GridSimple extends GridScenario {
-    @Override
-    protected void init(Params params) {
-        params.setStackFromBottom(false)
-                .setStartingSelectionPosition(-1)
-                .setNumItems(1000)
-                .setNumColumns(3)
-                .setItemScreenSizeFactor(0.14);
-    }
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        getGridView().setSelector(new PaintDrawable(0xFFFF0000));
-        getGridView().setPadding(0, 0, 0, 0);
-        getGridView().setFadingEdgeLength(64);
-        getGridView().setVerticalFadingEdgeEnabled(true);
-        getGridView().setBackgroundColor(0xFFC0C0C0);
-    }
-
-    @Override
-    protected View createView(int position, ViewGroup parent, int desiredHeight) {
-        View view = super.createView(position, parent, desiredHeight);
-        view.setBackgroundColor(0xFF000000);
-        ((TextView) view).setTextSize(16.0f);
-        return view;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSingleColumn.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSingleColumn.java
deleted file mode 100755
index 25006176b5c690aca8eb1d452a32dcc7dc3e410e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSingleColumn.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-import com.mediatek.common.widget.tests.util.GridScenario;
-import android.widget.GridView;
-
-/**
- * A grid with vertical spacing between rows
- */
-public class GridSingleColumn extends GridScenario {
-    @Override
-    protected void init(Params params) {
-        params.setStartingSelectionPosition(-1)
-                .setMustFillScreen(false)
-                .setNumItems(101)
-                .setNumColumns(1)
-                .setColumnWidth(60)
-                .setItemScreenSizeFactor(0.20)
-                .setVerticalSpacing(20)
-                .setStretchMode(GridView.STRETCH_SPACING);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSingleColumnTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSingleColumnTest.java
deleted file mode 100755
index 4c0461c6fd9b08248172257920078c95373cd9c0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridSingleColumnTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.GridView;
-
-
-public class GridSingleColumnTest extends ActivityInstrumentationTestCase<GridSingleColumn> {
-    private GridSingleColumn mActivity;
-    private GridView mGridView;
-
-    public GridSingleColumnTest() {
-        super("com.mediatek.common.widget.tests", GridSingleColumn.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mGridView = getActivity().getGridView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mGridView);
-        assertEquals(0, mGridView.getSelectedItemPosition());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridStackFromBottom.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridStackFromBottom.java
deleted file mode 100755
index a3ebeb110d2aa07c00b861f392763e658cc36b04..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridStackFromBottom.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-import com.mediatek.common.widget.tests.util.GridScenario;
-
-/**
- * Basic bottom stacking from bottom scenario, nothing fancy. Items do not
- * fill the screen
- */
-public class GridStackFromBottom extends GridScenario {
-    @Override
-    protected void init(Params params) {
-        params.setStackFromBottom(true)
-                .setStartingSelectionPosition(-1)
-                .setMustFillScreen(false)
-                .setNumItems(15)
-                .setNumColumns(4)
-                .setItemScreenSizeFactor(0.12);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridStackFromBottomMany.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridStackFromBottomMany.java
deleted file mode 100755
index 8808a3911dd6affd74438c493e3d52e33f17032e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridStackFromBottomMany.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-import com.mediatek.common.widget.tests.util.GridScenario;
-
-/**
- * Basic bottom stacking from bottom scenario, nothing fancy. The grid items do not fit on the
- * screen (to exercise scrolling.)
- */
-public class GridStackFromBottomMany extends GridScenario {
-    @Override
-    protected void init(Params params) {
-        params.setStackFromBottom(true)
-                .setStartingSelectionPosition(-1)
-                .setMustFillScreen(false)
-                .setNumItems(54)
-                .setNumColumns(4)
-                .setItemScreenSizeFactor(0.12);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridStackFromBottomManyTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridStackFromBottomManyTest.java
deleted file mode 100755
index 0a4d6b2d60609759de04d695eceeb0faefa3647c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridStackFromBottomManyTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.GridView;
-import android.test.ActivityInstrumentationTestCase;
-
-public class GridStackFromBottomManyTest extends ActivityInstrumentationTestCase<GridStackFromBottomMany> {
-    private GridStackFromBottomMany mActivity;
-    private GridView mGridView;
-
-    public GridStackFromBottomManyTest() {
-        super("com.mediatek.common.widget.tests", GridStackFromBottomMany.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mGridView = getActivity().getGridView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mGridView);
-
-        // Last item should be selected
-        assertEquals(mGridView.getAdapter().getCount() - 1, mGridView.getSelectedItemPosition());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridStackFromBottomTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridStackFromBottomTest.java
deleted file mode 100755
index c27cc9c4feb7dc159bb0845d2ac8cc4dc4194cae..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridStackFromBottomTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.GridView;
-
-public class GridStackFromBottomTest extends ActivityInstrumentationTestCase<GridStackFromBottom> {
-    private GridStackFromBottom mActivity;
-    private GridView mGridView;
-
-    public GridStackFromBottomTest() {
-        super("com.mediatek.common.widget.tests", GridStackFromBottom.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mGridView = getActivity().getGridView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mGridView);
-
-        // Last item should be selected
-        assertEquals(mGridView.getAdapter().getCount() - 1, mGridView.getSelectedItemPosition());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridThrasher.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridThrasher.java
deleted file mode 100755
index e6d2d63c06e30d96ffdcf12609b0edf81316c00f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridThrasher.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.LayoutInflater;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.GridView;
-import android.widget.TextView;
-
-import java.util.Random;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * Exercises change notification in a list
- */
-public class GridThrasher extends Activity implements AdapterView.OnItemSelectedListener
-{
-    Handler mHandler = new Handler();
-    ThrashListAdapter mAdapter;
-    Random mRandomizer = new Random();
-    TextView mText;
-
-    Runnable mThrash = new Runnable() {
-        public void run() {
-            mAdapter.bumpVersion();
-            mHandler.postDelayed(mThrash, 500);
-        }
-    };
-
-    private class ThrashListAdapter extends BaseAdapter {
-        private LayoutInflater mInflater;
-
-        /**
-         * Our data, part 1.
-         */
-        private String[] mTitles = new String[100];
-
-        /**
-         * Our data, part 2.
-         */
-        private int[] mVersion = new int[100];
-
-        public ThrashListAdapter(Context context) {
-            mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            mTitles = new String[100];
-            mVersion = new int[100];
-
-            int i;
-            for (i = 0; i < 100; i++) {
-                mTitles[i] = "[" + i + "]";
-                mVersion[i] = 0;
-            }
-        }
-
-        public int getCount() {
-            return mTitles.length;
-        }
-
-        public Object getItem(int position) {
-            return position;
-        }
-
-        public long getItemId(int position) {
-            return position;
-        }
-
-        public View getView(int position, View convertView, ViewGroup parent) {
-            TextView view;
-
-            if (convertView == null) {
-                view = (TextView) mInflater.inflate(android.R.layout.simple_list_item_1, null);
-            } else {
-                view = (TextView) convertView;
-            }
-            view.setText(mTitles[position] + " " + mVersion[position]);
-            return view;
-        }
-
-
-        public void bumpVersion() {
-            int position = mRandomizer.nextInt(getCount());
-            mVersion[position]++;
-            notifyDataSetChanged();
-        }
-
-
-    }
-
-    @Override
-    public void onCreate(Bundle icicle)
-    {
-        super.onCreate(icicle);
-
-        setContentView(R.layout.grid_thrasher);
-
-        mText = (TextView) findViewById(R.id.text);
-        mAdapter = new ThrashListAdapter(this);
-        GridView g = (GridView) findViewById(R.id.grid);
-        g.setAdapter(mAdapter);
-
-        mHandler.postDelayed(mThrash, 5000);
-
-        g.setOnItemSelectedListener(this);
-    }
-
-    public void onItemSelected(AdapterView parent, View v, int position, long id) {
-        mText.setText("Position " + position);
-    }
-
-    public void onNothingSelected(AdapterView parent) {
-        mText.setText("Nothing");
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridVerticalSpacing.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridVerticalSpacing.java
deleted file mode 100755
index bc397825fd82b2b853fced123f7ccbb9a230b7fb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridVerticalSpacing.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-import com.mediatek.common.widget.tests.util.GridScenario;
-
-/**
- * A grid with vertical spacing between rows
- */
-public class GridVerticalSpacing extends GridScenario {
-    @Override
-    protected void init(Params params) {
-        params.setStartingSelectionPosition(-1)
-                .setMustFillScreen(false)
-                .setNumItems(101)
-                .setNumColumns(4)
-                .setItemScreenSizeFactor(0.20)
-                .setVerticalSpacing(20);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridVerticalSpacingStackFromBottom.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridVerticalSpacingStackFromBottom.java
deleted file mode 100755
index f83ade9281bd9319b94ad0c0972e86ad1cbb5c0a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/GridVerticalSpacingStackFromBottom.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview;
-
-import com.mediatek.common.widget.tests.util.GridScenario;
-
-/**
- * A grid with vertical spacing between rows that stacks from the bottom
- */
-public class GridVerticalSpacingStackFromBottom extends GridScenario {
-    @Override
-    protected void init(Params params) {
-        params.setStackFromBottom(true)
-                .setStartingSelectionPosition(-1)
-                .setMustFillScreen(false)
-                .setNumItems(101)
-                .setNumColumns(4)
-                .setItemScreenSizeFactor(0.20)
-                .setVerticalSpacing(20);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/touch/GridTouchSetSelectionTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/touch/GridTouchSetSelectionTest.java
deleted file mode 100755
index ff0fd8641fdf9d4f4bc2ba65ae8a155934b41a3f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/touch/GridTouchSetSelectionTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview.touch;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.TouchUtils;
-import android.view.View;
-import android.widget.GridView;
-
-import com.mediatek.common.widget.tests.gridview.GridSimple;
-
-/**
- * Tests setting the selection in touch mode
- */
-public class GridTouchSetSelectionTest extends ActivityInstrumentationTestCase<GridSimple> {
-    private GridSimple mActivity;
-    private GridView mGridView;
-
-    public GridTouchSetSelectionTest() {
-        super("com.mediatek.common.widget.tests", GridSimple.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mGridView = getActivity().getGridView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mGridView);
-    }
-
-    @LargeTest
-    public void testSetSelection() {
-        TouchUtils.dragQuarterScreenDown(this);
-        TouchUtils.dragQuarterScreenUp(this);
-
-        // Nothing should be selected
-        assertEquals("Selection still available after touch", -1,
-                mGridView.getSelectedItemPosition());
-
-        final int targetPosition = mGridView.getAdapter().getCount() / 2;
-
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setSelection(targetPosition);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-
-        boolean found = false;
-        int childCount = mGridView.getChildCount();
-        for (int i = 0; i < childCount; i++) {
-            View child = mGridView.getChildAt(i);
-            if (child.getId() == targetPosition) {
-                found = true;
-                break;
-            }
-        }
-        assertTrue("Selected item not visible in list", found);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/touch/GridTouchStackFromBottomManyTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/touch/GridTouchStackFromBottomManyTest.java
deleted file mode 100755
index 5afcc7f08819b043f40041330629d92de2fe51db..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/touch/GridTouchStackFromBottomManyTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview.touch;
-
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.TouchUtils;
-import com.mediatek.common.widget.tests.gridview.GridStackFromBottomMany;
-
-import android.widget.GridView;
-import android.view.View;
-import android.test.ActivityInstrumentationTestCase;
-
-public class GridTouchStackFromBottomManyTest extends ActivityInstrumentationTestCase<GridStackFromBottomMany> {
-    private GridStackFromBottomMany mActivity;
-    private GridView mGridView;
-
-    public GridTouchStackFromBottomManyTest() {
-        super("com.mediatek.common.widget.tests", GridStackFromBottomMany.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mGridView = getActivity().getGridView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mGridView);
-
-        // Last item should be selected
-        assertEquals(mGridView.getAdapter().getCount() - 1, mGridView.getSelectedItemPosition());
-    }
-
-    @LargeTest
-    public void testScrollToTop() {
-        View firstChild;
-        TouchUtils.scrollToTop(this, mGridView);
-
-        // Nothing should be selected
-        assertEquals("Selection still available after touch", -1,
-                mGridView.getSelectedItemPosition());
-
-        firstChild = mGridView.getChildAt(0);
-
-        assertEquals("Item zero not the first child in the grid", 0, firstChild.getId());
-
-        assertEquals("Item zero not at the top of the grid",
-                mGridView.getListPaddingTop(), firstChild.getTop());
-    }
-
-    @LargeTest
-    public void testScrollToBottom() {
-        TouchUtils.scrollToBottom(this, mGridView);
-
-        // Nothing should be selected
-        assertEquals("Selection still available after touch", -1,
-                mGridView.getSelectedItemPosition());
-
-        View lastChild = mGridView.getChildAt(mGridView.getChildCount() - 1);
-
-        assertEquals("Grid is not scrolled to the bottom", mGridView.getAdapter().getCount() - 1,
-                lastChild.getId());
-
-        assertEquals("Last item is not touching the bottom edge",
-                mGridView.getHeight() - mGridView.getListPaddingBottom(), lastChild.getBottom());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/touch/GridTouchStackFromBottomTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/touch/GridTouchStackFromBottomTest.java
deleted file mode 100755
index ace068c470c20de62183d63524da0105564c3a00..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/touch/GridTouchStackFromBottomTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview.touch;
-
-import com.mediatek.common.widget.tests.gridview.GridStackFromBottom;
-import android.test.TouchUtils;
-import android.test.suitebuilder.annotation.MediumTest;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.widget.GridView;
-import android.view.View;
-
-public class GridTouchStackFromBottomTest extends ActivityInstrumentationTestCase<GridStackFromBottom> {
-    private GridStackFromBottom mActivity;
-    private GridView mGridView;
-
-    public GridTouchStackFromBottomTest() {
-        super("com.mediatek.common.widget.tests", GridStackFromBottom.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mGridView = getActivity().getGridView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mGridView);
-
-        // First item should be selected
-        assertEquals(mGridView.getAdapter().getCount() - 1, mGridView.getSelectedItemPosition());
-    }
-
-    @MediumTest
-    public void testPushUp() {
-        TouchUtils.scrollToBottom(this, mGridView);
-
-        // Nothing should be selected
-        assertEquals("Selection still available after touch", -1,
-                mGridView.getSelectedItemPosition());
-
-        View lastChild = mGridView.getChildAt(mGridView.getChildCount() - 1);
-
-        assertEquals("Last item not the last child in the grid",
-                mGridView.getAdapter().getCount() - 1, lastChild.getId());
-
-        assertEquals("Last item not at the bottom of the grid",
-                mGridView.getHeight() - mGridView.getListPaddingBottom(), lastChild.getBottom());
-    }
-
-    @MediumTest
-    public void testPullDown() {
-        TouchUtils.scrollToTop(this, mGridView);
-
-        // Nothing should be selected
-        assertEquals("Selection still available after touch", -1,
-                mGridView.getSelectedItemPosition());
-
-        View lastChild = mGridView.getChildAt(mGridView.getChildCount() - 1);
-
-        assertEquals("Last item not the last child in the grid",
-                mGridView.getAdapter().getCount() - 1, lastChild.getId());
-
-        assertEquals("Last item not at the bottom of the grid",
-                mGridView.getHeight() - mGridView.getListPaddingBottom(), lastChild.getBottom());
-    }
-
-    @MediumTest
-    public void testPushUpFast() {
-        TouchUtils.dragViewToTop(this, mGridView.getChildAt(mGridView.getChildCount() - 1), 2);
-
-        // Nothing should be selected
-        assertEquals("Selection still available after touch", -1,
-                mGridView.getSelectedItemPosition());
-
-        View lastChild = mGridView.getChildAt(mGridView.getChildCount() - 1);
-
-        assertEquals("Last item not the last child in the grid",
-                mGridView.getAdapter().getCount() - 1, lastChild.getId());
-
-        assertEquals("Last item not at the bottom of the grid",
-                mGridView.getHeight() - mGridView.getListPaddingBottom(), lastChild.getBottom());
-    }
-
-    @MediumTest
-    public void testPullDownFast() {
-        TouchUtils.dragViewToBottom(this, mGridView.getChildAt(0), 2);
-
-        // Nothing should be selected
-        assertEquals("Selection still available after touch", -1,
-                mGridView.getSelectedItemPosition());
-
-        View lastChild = mGridView.getChildAt(mGridView.getChildCount() - 1);
-
-        assertEquals("Last item not the last child in the grid",
-                mGridView.getAdapter().getCount() - 1, lastChild.getId());
-
-        assertEquals("Last item not at the bottom of the grid",
-                mGridView.getHeight() - mGridView.getListPaddingBottom(), lastChild.getBottom());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/touch/GridTouchVerticalSpacingStackFromBottomTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/touch/GridTouchVerticalSpacingStackFromBottomTest.java
deleted file mode 100755
index d79ed2364380b093016fc2be05ec31e0fa35ad32..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/touch/GridTouchVerticalSpacingStackFromBottomTest.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview.touch;
-
-import android.content.Context;
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.TouchUtils;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.widget.GridView;
-
-import com.mediatek.common.widget.tests.gridview.GridVerticalSpacingStackFromBottom;
-
-public class GridTouchVerticalSpacingStackFromBottomTest extends ActivityInstrumentationTestCase<GridVerticalSpacingStackFromBottom> {
-    private GridVerticalSpacingStackFromBottom mActivity;
-    private GridView mGridView;
-    private ViewConfiguration mViewConfig;
-
-    public GridTouchVerticalSpacingStackFromBottomTest() {
-        super("com.mediatek.common.widget.tests", GridVerticalSpacingStackFromBottom.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mGridView = getActivity().getGridView();
-        final Context context = mActivity.getApplicationContext();
-        mViewConfig = ViewConfiguration.get(context);
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mGridView);
-
-        // Last item should be selected
-        assertEquals(mGridView.getAdapter().getCount() - 1, mGridView.getSelectedItemPosition());
-
-    }
-
-    @MediumTest
-    public void testNoScroll() {
-        View firstChild = mGridView.getChildAt(0);
-        View lastChild = mGridView.getChildAt(mGridView.getChildCount() - 1);
-
-        int lastTop = lastChild.getTop();
-
-        TouchUtils.dragViewBy(this, firstChild, Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL, 0,
-                ViewConfiguration.getTouchSlop());
-
-        View newLastChild = mGridView.getChildAt(mGridView.getChildCount() - 1);
-
-        assertEquals("View scrolled too early", lastTop, newLastChild.getTop());
-        assertEquals("Wrong view in last position", mGridView.getAdapter().getCount() - 1,
-                newLastChild.getId());
-    }
-
-    // TODO: needs to be adjusted to pass on non-HVGA displays
-    // @LargeTest
-    public void testShortScroll() {
-        View firstChild = mGridView.getChildAt(0);
-        if (firstChild.getTop() < this.mGridView.getListPaddingTop()) {
-            firstChild = mGridView.getChildAt(1);
-        }
-
-        View lastChild = mGridView.getChildAt(mGridView.getChildCount() - 1);
-
-        int lastTop = lastChild.getTop();
-
-        TouchUtils.dragViewBy(this, firstChild, Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL, 0,
-                mViewConfig.getScaledTouchSlop() + 1 + 10);
-
-        View newLastChild = mGridView.getChildAt(mGridView.getChildCount() - 1);
-
-        /// M: [ALPS00428138] fix failure cases @{
-        //assertEquals("View scrolled to wrong position", lastTop, newLastChild.getTop() - 10);
-        assertEquals("View scrolled to wrong position", lastTop, newLastChild.getTop() - 1 - 10);
-        /// @}
-
-        assertEquals("Wrong view in last position", mGridView.getAdapter().getCount() - 1,
-                newLastChild.getId());
-    }
-
-    // TODO: needs to be adjusted to pass on non-HVGA displays
-    // @LargeTest
-    public void testLongScroll() {
-        View firstChild = mGridView.getChildAt(0);
-        if (firstChild.getTop() < mGridView.getListPaddingTop()) {
-            firstChild = mGridView.getChildAt(1);
-        }
-
-        int firstTop = firstChild.getTop();
-
-        int distance = TouchUtils.dragViewBy(this, firstChild,
-                Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL, 0,
-                (int) (mActivity.getWindowManager().getDefaultDisplay().getHeight() * 0.75f));
-
-        /// M: [ALPS00428138] fix failure cases @{
-        //assertEquals("View scrolled to wrong position", firstTop
-        //              + (distance - mViewConfig.getScaledTouchSlop() - 1), firstChild.getTop());
-        assertEquals("View scrolled to wrong position", firstTop
-                + (distance - mViewConfig.getScaledTouchSlop()), firstChild.getTop());
-        /// @}
-    }
-
-    @LargeTest
-    public void testManyScrolls() {
-        int originalCount = mGridView.getChildCount();
-
-        View firstChild;
-        int firstId = Integer.MIN_VALUE;
-        int firstTop = Integer.MIN_VALUE;
-        int prevId;
-        int prevTop;
-        do {
-            prevId = firstId;
-            prevTop = firstTop;
-            TouchUtils.dragQuarterScreenDown(this);
-            assertTrue(String.format("Too many children created: %d expected no more than %d",
-                    mGridView.getChildCount(), originalCount + 4),
-                    mGridView.getChildCount() <= originalCount + 4);
-            firstChild = mGridView.getChildAt(0);
-            firstId = firstChild.getId();
-            firstTop = firstChild.getTop();
-        } while ((prevId != firstId) || (prevTop != firstTop));
-
-
-        firstChild = mGridView.getChildAt(0);
-        assertEquals("View scrolled to wrong position", 0, firstChild.getId());
-
-        firstId = Integer.MIN_VALUE;
-        firstTop = Integer.MIN_VALUE;
-        do {
-            prevId = firstId;
-            prevTop = firstTop;
-            TouchUtils.dragQuarterScreenUp(this);
-            assertTrue(String.format("Too many children created: %d expected no more than %d",
-                    mGridView.getChildCount(), originalCount + 4),
-                    mGridView.getChildCount() <= originalCount + 4);
-            firstChild = mGridView.getChildAt(0);
-            firstId = firstChild.getId();
-            firstTop = firstChild.getTop();
-        } while ((prevId != firstId) || (prevTop != firstTop));
-
-        View lastChild = mGridView.getChildAt(mGridView.getChildCount() - 1);
-        assertEquals("Grid is not scrolled to the bottom", mGridView.getAdapter().getCount() - 1,
-                lastChild.getId());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/touch/GridTouchVerticalSpacingTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/touch/GridTouchVerticalSpacingTest.java
deleted file mode 100755
index aa4bd9d74b5a98634601b72ebfd837c88bcaa928..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/gridview/touch/GridTouchVerticalSpacingTest.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.gridview.touch;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.TouchUtils;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.widget.GridView;
-
-/// M: [ALPS00428138] get context for ViewConfiguration
-import android.content.Context;
-
-import com.mediatek.common.widget.tests.gridview.GridVerticalSpacing;
-
-public class GridTouchVerticalSpacingTest extends ActivityInstrumentationTestCase<GridVerticalSpacing> {
-    private GridVerticalSpacing mActivity;
-    private GridView mGridView;
-
-    /// M: [ALPS00428138] get context for ViewConfiguration
-    private ViewConfiguration mViewConfig;
-
-    public GridTouchVerticalSpacingTest() {
-        super("com.mediatek.common.widget.tests", GridVerticalSpacing.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mGridView = getActivity().getGridView();
-
-        /// M: [ALPS00428138] get context for ViewConfiguration
-        final Context context = mActivity.getApplicationContext();
-        mViewConfig = ViewConfiguration.get(context);
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mGridView);
-
-        assertEquals(0, mGridView.getSelectedItemPosition());
-    }
-
-    @MediumTest
-    public void testNoScroll() {
-        View firstChild = mGridView.getChildAt(0);
-        View lastChild = mGridView.getChildAt(mGridView.getChildCount() - 1);
-
-        int firstTop = firstChild.getTop();
-
-        /// M: [ALPS00428138] fix failure cases @{
-        // TouchUtils.dragViewBy(this, lastChild, Gravity.TOP | Gravity.LEFT,
-        //        0, -(ViewConfiguration.getTouchSlop()));
-        TouchUtils.dragViewBy(this, lastChild, Gravity.TOP | Gravity.LEFT,
-                0, -(mViewConfig.getScaledTouchSlop() - 1));
-        /// @}
-
-        View newFirstChild = mGridView.getChildAt(0);
-
-        assertEquals("View scrolled too early", firstTop, newFirstChild.getTop());
-        assertEquals("Wrong view in first position", 0, newFirstChild.getId());
-    }
-
-    // TODO: needs to be adjusted to pass on non-HVGA displays
-    // @LargeTest
-    public void testShortScroll() {
-        View firstChild = mGridView.getChildAt(0);
-        View lastChild = mGridView.getChildAt(mGridView.getChildCount() - 1);
-
-        int firstTop = firstChild.getTop();
-
-        /// M: [ALPS00428138] fix failure cases @{
-        //TouchUtils.dragViewBy(this, lastChild, Gravity.TOP | Gravity.LEFT,
-        //        0, -(ViewConfiguration.getTouchSlop() + 1 + 10));
-        TouchUtils.dragViewBy(this, lastChild, Gravity.TOP | Gravity.LEFT,
-                0, -(mViewConfig.getScaledTouchSlop() + 10));
-        /// @}
-
-        View newFirstChild = mGridView.getChildAt(0);
-
-        assertEquals("View scrolled to wrong position", firstTop, newFirstChild.getTop() + 10 + 1);
-        assertEquals("Wrong view in first position", 0, newFirstChild.getId());
-    }
-
-    // TODO: needs to be adjusted to pass on non-HVGA displays
-    // @LargeTest
-    public void testLongScroll() {
-        View lastChild = mGridView.getChildAt(mGridView.getChildCount() - 1);
-
-        int lastTop = lastChild.getTop();
-
-        int distance = TouchUtils.dragViewToY(this, lastChild, Gravity.TOP | Gravity.LEFT,
-                mGridView.getTop());
-
-
-        /// M: [ALPS00428138] fix failure cases @{
-        //assertEquals("View scrolled to wrong position",
-        //        lastTop - (distance - ViewConfiguration.getTouchSlop() - 1), lastChild.getTop());
-        assertEquals("View scrolled to wrong position",
-                lastTop - (distance - mViewConfig.getScaledTouchSlop()), lastChild.getTop());
-        /// @}
-    }
-
-    @LargeTest
-    public void testManyScrolls() {
-        int originalCount = mGridView.getChildCount();
-
-        View firstChild;
-        int firstId = Integer.MIN_VALUE;
-        int firstTop = Integer.MIN_VALUE;
-        int prevId;
-        int prevTop;
-        do {
-            prevId = firstId;
-            prevTop = firstTop;
-            TouchUtils.dragQuarterScreenUp(this);
-            assertTrue(String.format("Too many children created: %d expected no more than %d",
-                    mGridView.getChildCount(), originalCount + 4),
-                    mGridView.getChildCount() <= originalCount + 4);
-            firstChild = mGridView.getChildAt(0);
-            firstId = firstChild.getId();
-            firstTop = firstChild.getTop();
-        } while ((prevId != firstId) || (prevTop != firstTop));
-
-
-        View lastChild = mGridView.getChildAt(mGridView.getChildCount() - 1);
-        assertEquals("Grid is not scrolled to the bottom", mGridView.getAdapter().getCount() - 1,
-                lastChild.getId());
-
-        firstId = Integer.MIN_VALUE;
-        firstTop = Integer.MIN_VALUE;
-        do {
-            prevId = firstId;
-            prevTop = firstTop;
-            TouchUtils.dragQuarterScreenDown(this);
-            assertTrue(String.format("Too many children created: %d expected no more than %d",
-                    mGridView.getChildCount(), originalCount + 4),
-                    mGridView.getChildCount() <= originalCount + 4);
-            firstChild = mGridView.getChildAt(0);
-            firstId = firstChild.getId();
-            firstTop = firstChild.getTop();
-        } while ((prevId != firstId) || (prevTop != firstTop));
-
-        firstChild = mGridView.getChildAt(0);
-        assertEquals("Grid is not scrolled to the top", 0, firstChild.getId());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/frame/FrameLayoutGravity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/frame/FrameLayoutGravity.java
deleted file mode 100755
index cab145a9ac70006ff7c6e5014ab5aa38307af6ee..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/frame/FrameLayoutGravity.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.frame;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-import com.mediatek.common.widget.tests.R;
-
-public class FrameLayoutGravity extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.framelayout_gravity);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/frame/FrameLayoutGravityTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/frame/FrameLayoutGravityTest.java
deleted file mode 100755
index 0c4f6f8ac00d1134ed764e21daae16334673f260..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/frame/FrameLayoutGravityTest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.frame;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.ViewAsserts;
-import android.app.Activity;
-import android.view.View;
-
-import com.mediatek.common.widget.tests.R;
-
-public class FrameLayoutGravityTest extends ActivityInstrumentationTestCase<FrameLayoutGravity> {
-    private View mLeftView;
-    private View mRightView;
-    private View mCenterHorizontalView;
-    private View mLeftCenterVerticalView;
-    private View mRighCenterVerticalView;
-    private View mCenterView;
-    private View mLeftBottomView;
-    private View mRightBottomView;
-    private View mCenterHorizontalBottomView;
-    private View mParent;
-
-    public FrameLayoutGravityTest() {
-        super("com.mediatek.common.widget.tests", FrameLayoutGravity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        final Activity activity = getActivity();
-
-        mParent = activity.findViewById(R.id.parent);
-
-        mLeftView = activity.findViewById(R.id.left);
-        mRightView = activity.findViewById(R.id.right);
-        mCenterHorizontalView = activity.findViewById(R.id.center_horizontal);
-
-        mLeftCenterVerticalView = activity.findViewById(R.id.left_center_vertical);
-        mRighCenterVerticalView = activity.findViewById(R.id.right_center_vertical);
-        mCenterView = activity.findViewById(R.id.center);
-
-        mLeftBottomView = activity.findViewById(R.id.left_bottom);
-        mRightBottomView = activity.findViewById(R.id.right_bottom);
-        mCenterHorizontalBottomView = activity.findViewById(R.id.center_horizontal_bottom);
-    }
-
-    @MediumTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mParent);
-        assertNotNull(mLeftView);
-        assertNotNull(mRightView);
-        assertNotNull(mCenterHorizontalView);
-        assertNotNull(mLeftCenterVerticalView);
-        assertNotNull(mRighCenterVerticalView);
-        assertNotNull(mCenterView);
-        assertNotNull(mLeftBottomView);
-        assertNotNull(mRightBottomView);
-        assertNotNull(mCenterHorizontalBottomView);
-    }
-
-    @MediumTest
-    public void testLeftTopAligned() throws Exception {
-        ViewAsserts.assertLeftAligned(mParent, mLeftView);
-        ViewAsserts.assertTopAligned(mParent, mLeftView);
-    }
-
-    @MediumTest
-    public void testRightTopAligned() throws Exception {
-        ViewAsserts.assertRightAligned(mParent, mRightView);
-        ViewAsserts.assertTopAligned(mParent, mRightView);
-    }
-
-    @MediumTest
-    public void testCenterHorizontalTopAligned() throws Exception {
-        ViewAsserts.assertHorizontalCenterAligned(mParent, mCenterHorizontalView);
-        ViewAsserts.assertTopAligned(mParent, mCenterHorizontalView);
-    }
-
-    @MediumTest
-    public void testLeftCenterVerticalAligned() throws Exception {
-        ViewAsserts.assertLeftAligned(mParent, mLeftCenterVerticalView);
-        ViewAsserts.assertVerticalCenterAligned(mParent, mLeftCenterVerticalView);
-    }
-
-    @MediumTest
-    public void testRightCenterVerticalAligned() throws Exception {
-        ViewAsserts.assertRightAligned(mParent, mRighCenterVerticalView);
-        ViewAsserts.assertVerticalCenterAligned(mParent, mRighCenterVerticalView);
-    }
-
-    @MediumTest
-    public void testCenterAligned() throws Exception {
-        ViewAsserts.assertHorizontalCenterAligned(mParent, mCenterView);
-        ViewAsserts.assertVerticalCenterAligned(mParent, mCenterView);
-    }
-
-    @MediumTest
-    public void testLeftBottomAligned() throws Exception {
-        ViewAsserts.assertLeftAligned(mParent, mLeftBottomView);
-        ViewAsserts.assertBottomAligned(mParent, mLeftBottomView);
-    }
-
-    @MediumTest
-    public void testRightBottomAligned() throws Exception {
-        ViewAsserts.assertRightAligned(mParent, mRightBottomView);
-        ViewAsserts.assertBottomAligned(mParent, mRightBottomView);
-    }
-
-    @MediumTest
-    public void testCenterHorizontalBottomAligned() throws Exception {
-        ViewAsserts.assertHorizontalCenterAligned(mParent, mCenterHorizontalBottomView);
-        ViewAsserts.assertBottomAligned(mParent, mCenterHorizontalBottomView);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/frame/FrameLayoutMargin.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/frame/FrameLayoutMargin.java
deleted file mode 100755
index c3784fe0ba504ab7a8df881d7c835ecfc2073af9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/frame/FrameLayoutMargin.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.frame;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-import com.mediatek.common.widget.tests.R;
-
-public class FrameLayoutMargin extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.framelayout_margin);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/frame/FrameLayoutMarginTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/frame/FrameLayoutMarginTest.java
deleted file mode 100755
index 1e398043b04b21882272631a032afc7b48d82ee6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/frame/FrameLayoutMarginTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.frame;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.ViewAsserts;
-import android.app.Activity;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.mediatek.common.widget.tests.R;
-
-public class FrameLayoutMarginTest extends ActivityInstrumentationTestCase<FrameLayoutMargin> {
-    private View mLeftView;
-    private View mRightView;
-    private View mTopView;
-    private View mBottomView;
-    private View mParent;
-
-    public FrameLayoutMarginTest() {
-        super("com.mediatek.common.widget.tests", FrameLayoutMargin.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        final Activity activity = getActivity();
-
-        mParent = activity.findViewById(R.id.parent);
-
-        mLeftView = activity.findViewById(R.id.left);
-        mRightView = activity.findViewById(R.id.right);
-        mTopView = activity.findViewById(R.id.top);
-        mBottomView = activity.findViewById(R.id.bottom);
-    }
-
-    @MediumTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mParent);
-        assertNotNull(mLeftView);
-        assertNotNull(mRightView);
-        assertNotNull(mTopView);
-        assertNotNull(mBottomView);
-    }
-
-    @MediumTest
-    public void testLeftMarginAligned() throws Exception {
-        ViewAsserts.assertLeftAligned(mParent, mLeftView,
-                ((ViewGroup.MarginLayoutParams) mLeftView.getLayoutParams()).leftMargin);
-    }
-
-    @MediumTest
-    public void testRightMarginAligned() throws Exception {
-        ViewAsserts.assertRightAligned(mParent, mRightView,
-                ((ViewGroup.MarginLayoutParams) mRightView.getLayoutParams()).rightMargin);
-    }
-
-    @MediumTest
-    public void testTopMarginAligned() throws Exception {
-        ViewAsserts.assertTopAligned(mParent, mTopView,
-                ((ViewGroup.MarginLayoutParams) mTopView.getLayoutParams()).topMargin);
-    }
-
-    @MediumTest
-    public void testBottomMarginAligned() throws Exception {
-        ViewAsserts.assertBottomAligned(mParent, mBottomView,
-                ((ViewGroup.MarginLayoutParams) mBottomView.getLayoutParams()).bottomMargin);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/BaselineAlignmentCenterGravity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/BaselineAlignmentCenterGravity.java
deleted file mode 100755
index 0642479c189440f39cac787e56c5332f60f6608d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/BaselineAlignmentCenterGravity.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.linear;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-import com.mediatek.common.widget.tests.R;
-
-public class BaselineAlignmentCenterGravity extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.baseline_center_gravity);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/BaselineAlignmentCenterGravityTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/BaselineAlignmentCenterGravityTest.java
deleted file mode 100755
index 1a1d4e016f7f2264c8234b4d7235acaaf2c55e1e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/BaselineAlignmentCenterGravityTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.linear;
-
-import android.app.Activity;
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.ViewAsserts;
-import android.view.View;
-import android.widget.Button;
-
-
-import com.mediatek.common.widget.tests.R;
-
-public class BaselineAlignmentCenterGravityTest extends ActivityInstrumentationTestCase<BaselineAlignmentCenterGravity> {
-    private Button mButton1;
-    private Button mButton2;
-    private Button mButton3;
-
-    public BaselineAlignmentCenterGravityTest() {
-        super("com.mediatek.common.widget.tests", BaselineAlignmentCenterGravity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        final Activity activity = getActivity();
-        mButton1 = (Button) activity.findViewById(R.id.button1);
-        mButton2 = (Button) activity.findViewById(R.id.button2);
-        mButton3 = (Button) activity.findViewById(R.id.button3);
-    }
-
-    @MediumTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mButton1);
-        assertNotNull(mButton2);
-        assertNotNull(mButton3);
-    }
-
-    @MediumTest
-    public void testChildrenAligned() throws Exception {
-        final View parent = (View) mButton1.getParent();
-        ViewAsserts.assertTopAligned(mButton1, parent);
-        ViewAsserts.assertTopAligned(mButton2, parent);
-        ViewAsserts.assertTopAligned(mButton3, parent);
-        ViewAsserts.assertBottomAligned(mButton1, parent);
-        ViewAsserts.assertBottomAligned(mButton2, parent);
-        ViewAsserts.assertBottomAligned(mButton3, parent);
-        ViewAsserts.assertTopAligned(mButton1, mButton2);
-        ViewAsserts.assertTopAligned(mButton2, mButton3);
-        ViewAsserts.assertBottomAligned(mButton1, mButton2);
-        ViewAsserts.assertBottomAligned(mButton2, mButton3);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/BaselineAlignmentSpinnerButton.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/BaselineAlignmentSpinnerButton.java
deleted file mode 100755
index f36abe393d68f1f2d2342618a60661841eb7d140..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/BaselineAlignmentSpinnerButton.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.linear;
-
-import android.app.Activity;
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.ViewAsserts;
-import android.view.View;
-
-
-import com.mediatek.common.widget.tests.R;
-
-public class BaselineAlignmentSpinnerButton extends ActivityInstrumentationTestCase<HorizontalOrientationVerticalAlignment> {
-    private View mSpinner;
-    private View mButton;
-
-    public BaselineAlignmentSpinnerButton() {
-        super("com.mediatek.common.widget.tests", HorizontalOrientationVerticalAlignment.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        final Activity activity = getActivity();
-        mSpinner = activity.findViewById(R.id.reminder_value);
-        mButton = activity.findViewById(R.id.reminder_remove);
-    }
-
-    @MediumTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mSpinner);
-        assertNotNull(mButton);
-    }
-
-    @MediumTest
-    public void testChildrenAligned() throws Exception {
-        ViewAsserts.assertBaselineAligned(mSpinner, mButton);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/BaselineAlignmentZeroWidthAndWeight.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/BaselineAlignmentZeroWidthAndWeight.java
deleted file mode 100755
index eb67d2cf569a9f6373fbc32c785147b607a125fa..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/BaselineAlignmentZeroWidthAndWeight.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.linear;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-
-import com.mediatek.common.widget.tests.R;
-
-public class BaselineAlignmentZeroWidthAndWeight extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.baseline_0width_and_weight);
-
-        findViewById(R.id.show).setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                findViewById(R.id.layout).setVisibility(View.VISIBLE);
-            }
-        });
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/BaselineAlignmentZeroWidthAndWeightTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/BaselineAlignmentZeroWidthAndWeightTest.java
deleted file mode 100755
index c2f85a5430792b87d47e7f17b046b1fd3a09a35c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/BaselineAlignmentZeroWidthAndWeightTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.linear;
-
-
-import android.app.Activity;
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-import android.widget.Button;
-
-import com.mediatek.common.widget.tests.R;
-
-public class BaselineAlignmentZeroWidthAndWeightTest extends ActivityInstrumentationTestCase<BaselineAlignmentZeroWidthAndWeight> {
-    private Button mShowButton;
-
-    public BaselineAlignmentZeroWidthAndWeightTest() {
-        super("com.mediatek.common.widget.tests", BaselineAlignmentZeroWidthAndWeight.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        final Activity activity = getActivity();
-        mShowButton = (Button) activity.findViewById(R.id.show);
-    }
-
-    @MediumTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mShowButton);
-    }
-
-    @MediumTest
-    public void testComputeTexViewWithoutIllegalArgumentException() throws Exception {
-        assertTrue(mShowButton.hasFocus());
-
-        // Pressing the button will show an ExceptionTextView that might set a failed bit if
-        // the test fails.
-        sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
-        getInstrumentation().waitForIdleSync();
-
-        final ExceptionTextView etv = (ExceptionTextView) getActivity()
-                .findViewById(R.id.routeToField);
-        assertFalse("exception test view should not fail", etv.isFailed());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/BaselineButtons.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/BaselineButtons.java
deleted file mode 100755
index 066296e4224401474f38affab9e22ea0d0cfc6ab..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/BaselineButtons.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.linear;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-import com.mediatek.common.widget.tests.R;
-
-public class BaselineButtons extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.baseline_buttons);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/BaselineButtonsTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/BaselineButtonsTest.java
deleted file mode 100755
index ec067ab7823faf65c836ad7b4d1341204f6b63e5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/BaselineButtonsTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.linear;
-
-import android.app.Activity;
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.View;
-import android.widget.ImageButton;
-
-
-import com.mediatek.common.widget.tests.R;
-
-public class BaselineButtonsTest extends ActivityInstrumentationTestCase<BaselineButtons> {
-    private View mCurrentTime;
-    private View mTotalTime;
-    private ImageButton mPrev;
-    private ImageButton mNext;
-    private ImageButton mPause;
-    private View mLayout;
-
-    public BaselineButtonsTest() {
-        super("com.mediatek.common.widget.tests", BaselineButtons.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        final Activity activity = getActivity();
-        mCurrentTime = activity.findViewById(R.id.currenttime);
-        mTotalTime = activity.findViewById(R.id.totaltime);
-        mPrev = (ImageButton) activity.findViewById(R.id.prev);
-        mNext = (ImageButton) activity.findViewById(R.id.next);
-        mPause = (ImageButton) activity.findViewById(R.id.pause);
-        mLayout = activity.findViewById(R.id.layout);
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mCurrentTime);
-        assertNotNull(mTotalTime);
-        assertNotNull(mPrev);
-        assertNotNull(mNext);
-        assertNotNull(mPause);
-        assertNotNull(mLayout);
-    }
-
-    @MediumTest
-    public void testLayout() {
-        int pauseHeight =  Math.max(mPause.getDrawable().getIntrinsicHeight()
-                + mPause.getPaddingTop() + mPause.getPaddingBottom(),
-                mPause.getBackground().getMinimumHeight());
-        int prevHeight = Math.max(mPrev.getDrawable().getIntrinsicHeight() + mPrev.getPaddingTop()
-                + mPrev.getPaddingBottom(),
-                mPrev.getBackground().getMinimumHeight());
-        int nextHeight = Math.max(mNext.getDrawable().getIntrinsicHeight() + mNext.getPaddingTop()
-                + mNext.getPaddingBottom(),
-                mNext.getBackground().getMinimumHeight());
-        assertEquals("Layout incorrect height", pauseHeight, mLayout.getHeight());
-        assertEquals("Pause incorrect height", pauseHeight, mPause.getHeight());
-        assertEquals("Prev incorrect height", prevHeight, mPrev.getHeight());
-        assertEquals("Next incorrect height", nextHeight, mNext.getHeight());
-        assertEquals("Pause wrong top", 0, mPause.getTop());
-        assertEquals("Prev wrong top", (pauseHeight - prevHeight) / 2, mPrev.getTop());
-        assertEquals("Next wrong top", (pauseHeight - nextHeight) / 2, mNext.getTop());
-        assertEquals("CurrentTime wrong bottom",  pauseHeight, mCurrentTime.getBottom());
-        assertEquals("TotalTime wrong bottom",  pauseHeight, mTotalTime.getBottom());
-        assertTrue("CurrentTime too tall", mCurrentTime.getTop() > 0);
-        assertTrue("TotalTime too tall", mTotalTime.getTop() > 0);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/ExceptionTextView.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/ExceptionTextView.java
deleted file mode 100755
index 063acc1bd26861001a9692b819e5784077d775b8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/ExceptionTextView.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.linear;
-
-
-import android.widget.EditText;
-import android.content.Context;
-import android.util.AttributeSet;
-import android.text.BoringLayout;
-
-
-/**
- * A special EditText that sets {@link #isFailed()} to true as its internal makeNewLayout() method is called
- * with a width lower than 0. This is used to fail the unit test in
- * BaselineAlignmentZeroWidthAndWeightTest.
- */
-public class ExceptionTextView extends EditText {
-
-    private boolean mFailed = false;
-
-    public ExceptionTextView(Context context) {
-        super(context);
-    }
-
-    public ExceptionTextView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public ExceptionTextView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    public boolean isFailed() {
-        return mFailed;
-    }
-
-    @Override
-    protected void makeNewLayout(int w, int hintWidth,
-                                 BoringLayout.Metrics boring,
-                                 BoringLayout.Metrics hintMetrics,
-                                 int ellipsizedWidth, boolean bringIntoView) {
-        if (w < 0) {
-            mFailed = true;
-            w = 100;
-        }
-
-        super.makeNewLayout(w, hintWidth, boring, hintMetrics, ellipsizedWidth,
-                            bringIntoView);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/FillInWrap.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/FillInWrap.java
deleted file mode 100755
index b8ce6548434844bb694cc953c3096216daac7c30..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/FillInWrap.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.linear;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.TextView;
-
-import com.mediatek.common.widget.tests.R;
-
-public class FillInWrap extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.fill_in_wrap);
-        ((TextView) findViewById(R.id.data)).setText("1\n2\n3\n4\n5");
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/FillInWrapTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/FillInWrapTest.java
deleted file mode 100755
index 6aa21d119fb11f484a386bf1816e0c2011795a4b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/FillInWrapTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.linear;
-
-import android.app.Activity;
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.View;
-
-import com.mediatek.common.widget.tests.R;
-
-public class FillInWrapTest extends ActivityInstrumentationTestCase<FillInWrap> {
-    private View mChild;
-    private View mContainer;
-
-    public FillInWrapTest() {
-        super("com.mediatek.common.widget.tests", FillInWrap.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        final Activity activity = getActivity();
-        mChild = activity.findViewById(R.id.data);
-        mContainer = activity.findViewById(R.id.layout);
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mChild);
-        assertNotNull(mContainer);
-    }
-
-    @MediumTest
-    public void testLayout() {
-        assertTrue("the child's height should be less than the parent's",
-                mChild.getMeasuredHeight() < mContainer.getMeasuredHeight());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/HorizontalOrientationVerticalAlignment.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/HorizontalOrientationVerticalAlignment.java
deleted file mode 100755
index e65a4aca7640affd1b8c7910f324da63104da6ed..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/HorizontalOrientationVerticalAlignment.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.linear;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-import com.mediatek.common.widget.tests.R;
-
-public class HorizontalOrientationVerticalAlignment extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.linear_layout_spinner_then_button);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/LLEditTextThenButton.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/LLEditTextThenButton.java
deleted file mode 100755
index 2cb653ecf59b4cb2231f34dc2b6afdb69811e36f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/LLEditTextThenButton.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.linear;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-
-import com.mediatek.common.widget.tests.R;
-
-public class LLEditTextThenButton extends Activity {
-    private EditText mEditText;
-    private Button mButton;
-
-    private LinearLayout mLayout;
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        setContentView(R.layout.linear_layout_edittext_then_button);
-
-        mLayout = (LinearLayout) findViewById(R.id.layout);
-        mEditText = (EditText) findViewById(R.id.editText);
-        mButton = (Button) findViewById(R.id.button);
-    }
-
-    public LinearLayout getLayout() {
-        return mLayout;
-    }
-
-    public EditText getEditText() {
-        return mEditText;
-    }
-
-    public Button getButton() {
-        return mButton;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/LLOfButtons1.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/LLOfButtons1.java
deleted file mode 100755
index 8bce12c8b6e3b383f236301a9848be8e27260f8a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/LLOfButtons1.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.linear;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.LinearLayout;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * One of two simple vertical linear layouts of buttons used to test out
- * the transistion between touch and focus mode.
- */
-public class LLOfButtons1 extends Activity {
-
-    private boolean mButtonPressed = false;
-    private Button mFirstButton;
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.linear_layout_buttons);
-        mFirstButton = (Button) findViewById(R.id.button1);
-
-        mFirstButton.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                mButtonPressed = true;
-            }
-        });
-
-    }
-
-    public LinearLayout getLayout() {
-        return (LinearLayout) findViewById(R.id.layout);
-    }
-
-    public Button getFirstButton() {
-        return mFirstButton;
-    }
-
-    public boolean buttonClickListenerFired() {
-        return mButtonPressed;
-    }
-
-    public boolean isInTouchMode() {
-        return mFirstButton.isInTouchMode();
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/LLOfButtons2.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/LLOfButtons2.java
deleted file mode 100755
index cac53c183e1f5a963bf7f07fd4fe9221a332b788..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/LLOfButtons2.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.linear;
-
-/**
- * One of two simple vertical linear layouts of buttons used to test out
- * the transistion between touch and focus mode.
- */
-public class LLOfButtons2  extends LLOfButtons1 {
-
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/LLOfTwoFocusableInTouchMode.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/LLOfTwoFocusableInTouchMode.java
deleted file mode 100755
index c976aa31afeaba6f067eeccf200175761a6040be..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/LLOfTwoFocusableInTouchMode.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.linear;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-
-import com.mediatek.common.widget.tests.R;
-
-public class LLOfTwoFocusableInTouchMode extends Activity {
-
-    private View mButton1;
-    private View mButton2;
-    private View mButton3;
-
-    private boolean mB1Fired = false;
-    private boolean mB2Fired = false;
-    private boolean mB3Fired = false;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.linear_layout_buttons);
-
-        mButton1 = findViewById(R.id.button1);
-        mButton2 = findViewById(R.id.button2);
-        mButton3 = findViewById(R.id.button3);
-
-        mButton1.setFocusableInTouchMode(true);
-        mButton2.setFocusableInTouchMode(true);
-        mButton3.setFocusableInTouchMode(true);
-
-        mButton1.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                mB1Fired = true;
-            }
-        });
-
-        mButton2.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                mB2Fired = true;
-            }
-        });
-
-        mButton3.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                mB3Fired = true;
-            }
-        });
-    }
-
-    public View getButton1() {
-        return mButton1;
-    }
-
-    public View getButton2() {
-        return mButton2;
-    }
-
-    public View getButton3() {
-        return mButton3;
-    }
-
-    public boolean isB1Fired() {
-        return mB1Fired;
-    }
-
-    public boolean isB2Fired() {
-        return mB2Fired;
-    }
-
-    public boolean isB3Fired() {
-        return mB3Fired;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/LinearLayoutEditTexts.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/LinearLayoutEditTexts.java
deleted file mode 100755
index 4f61d7375e0a82fd18547d1b04d5b0a3eee6f4cd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/LinearLayoutEditTexts.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.linear;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-import com.mediatek.common.widget.tests.R;
-
-public class LinearLayoutEditTexts extends Activity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.linear_layout_textviews);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/LinearLayoutEditTextsTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/LinearLayoutEditTextsTest.java
deleted file mode 100755
index 71786cd1fc0408ca7ea87c3ba62b2134e539de6b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/LinearLayoutEditTextsTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.linear;
-
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.View;
-import android.app.Activity;
-
-import com.mediatek.common.widget.tests.R;
-
-public class LinearLayoutEditTextsTest extends ActivityInstrumentationTestCase<LinearLayoutEditTexts> {
-    private View mChild;
-    private View mContainer;
-
-    public LinearLayoutEditTextsTest() {
-        super("com.mediatek.common.widget.tests", LinearLayoutEditTexts.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        final Activity activity = getActivity();
-        mChild = activity.findViewById(R.id.editText1);
-        mContainer = activity.findViewById(R.id.layout);
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mChild);
-        assertNotNull(mContainer);
-    }
-
-    @MediumTest
-    public void testLayout() {
-        final int childHeight = mChild.getHeight();
-        final int containerHeight = mContainer.getHeight();
-
-        assertEquals(containerHeight, childHeight);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/Weight.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/Weight.java
deleted file mode 100755
index 22b873eb2f086c56397ffc88131506227e08532c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/Weight.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.linear;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-import com.mediatek.common.widget.tests.R;
-
-public class Weight extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.linear_layout_weight);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/WeightSum.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/WeightSum.java
deleted file mode 100755
index 6f257b21135e1ef6c0bc1036641a34e594752a03..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/WeightSum.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.linear;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-import com.mediatek.common.widget.tests.R;
-
-public class WeightSum extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.weight_sum);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/WeightSumTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/WeightSumTest.java
deleted file mode 100755
index f05d336f77d34c56bdc370f81d56e34b6b72e77b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/WeightSumTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.linear;
-
-import android.app.Activity;
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.View;
-
-
-import com.mediatek.common.widget.tests.R;
-
-public class WeightSumTest extends ActivityInstrumentationTestCase<WeightSum> {
-    private View mChild;
-    private View mContainer;
-
-    public WeightSumTest() {
-        super("com.mediatek.common.widget.tests", WeightSum.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        final Activity activity = getActivity();
-        mChild = activity.findViewById(R.id.child);
-        mContainer = activity.findViewById(R.id.container);
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mChild);
-        assertNotNull(mContainer);
-    }
-
-    @MediumTest
-    public void testLayout() {
-        final int childWidth = mChild.getWidth();
-        final int containerWidth = mContainer.getWidth();
-
-        assertEquals(containerWidth / 2, childWidth);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/WeightTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/WeightTest.java
deleted file mode 100755
index 531bda3cd2260ed6f5883ded54c937707953c04d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/linear/WeightTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.linear;
-
-import android.app.Activity;
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.ViewAsserts;
-import android.view.View;
-
-
-import com.mediatek.common.widget.tests.R;
-
-public class WeightTest extends ActivityInstrumentationTestCase<Weight> {
-    private View mChild;
-    private View mContainer;
-
-    public WeightTest() {
-        super("com.mediatek.common.widget.tests", Weight.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        final Activity activity = getActivity();
-        mChild = activity.findViewById(R.id.child4);
-        mContainer = activity.findViewById(R.id.layout);
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mChild);
-        assertNotNull(mContainer);
-    }
-
-    @MediumTest
-    public void testLayout() {
-        ViewAsserts.assertRightAligned(mChild, mContainer);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/AddColumn.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/AddColumn.java
deleted file mode 100755
index 6c3dbca442fb9e4358bcfb9352b908bf05097541..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/AddColumn.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.table;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TableLayout;
-import android.widget.TableRow;
-import android.widget.TextView;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * This test adds an extra row with an extra column in the table.
- */
-public class AddColumn extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.add_column_in_table);
-
-        final Button addRowButton = (Button) findViewById(R.id.add_row_button);
-        addRowButton.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                final TableLayout table = (TableLayout) findViewById(R.id.table);
-                final TableRow newRow = new TableRow(AddColumn.this);
-                for (int i = 0; i < 4; i++) {
-                    final TextView view = new TextView(AddColumn.this);
-                    view.setText("Column " + (i + 1));
-                    view.setPadding(3, 3, 3, 3);
-                    newRow.addView(view, new TableRow.LayoutParams());
-                }
-                table.addView(newRow, new TableLayout.LayoutParams());
-                newRow.requestLayout();
-            }
-        });
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/AddColumnTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/AddColumnTest.java
deleted file mode 100755
index 4173c3d483e6ff53f0f81f7cf0aa7b1baaabf41a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/AddColumnTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.table;
-
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-import android.widget.Button;
-import android.widget.TableLayout;
-import android.widget.TableRow;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * {@link android.widget.layout.table.AddColumn} is
- * setup to exercise the case of adding row programmatically in a table.
- */
-public class AddColumnTest extends ActivityInstrumentationTestCase<AddColumn> {
-    private Button mAddRow;
-    private TableLayout mTable;
-
-    public AddColumnTest() {
-        super("com.mediatek.common.widget.tests", AddColumn.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        final AddColumn activity = getActivity();
-        mAddRow = (Button) activity.findViewById(R.id.add_row_button);
-        mTable = (TableLayout) activity.findViewById(R.id.table);
-    }
-
-    @MediumTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mAddRow);
-        assertNotNull(mTable);
-        assertTrue(mAddRow.hasFocus());
-    }
-
-    @MediumTest
-    public void testWidths() throws Exception {
-        sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
-        getInstrumentation().waitForIdleSync();
-
-        TableRow row1 = (TableRow) mTable.getChildAt(0);
-        TableRow row2 = (TableRow) mTable.getChildAt(1);
-
-        assertTrue(row1.getChildCount() < row2.getChildCount());
-
-        for (int i = 0; i < row1.getChildCount(); i++) {
-            assertEquals(row2.getChildAt(i).getWidth(), row1.getChildAt(i).getWidth());
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/CellSpan.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/CellSpan.java
deleted file mode 100755
index 39427ed4714338789cafd6ddf2b88e36d6d6c600..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/CellSpan.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.table;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * Exercise table layout with cells spanning.
- */
-public class CellSpan extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.table_layout_cell_span);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/CellSpanTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/CellSpanTest.java
deleted file mode 100755
index 053c23ed4e13c2508829c2b968dc7eef0057d525..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/CellSpanTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.table;
-
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.View;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * {@link android.widget.layout.table.CellSpan} is
- * setup to exercise tables in which cells use spanning.
- */
-public class CellSpanTest extends ActivityInstrumentationTestCase<CellSpan> {
-    private View mA;
-    private View mB;
-    private View mC;
-    private View mSpanThenCell;
-    private View mCellThenSpan;
-    private View mSpan;
-
-    public CellSpanTest() {
-        super("com.mediatek.common.widget.tests", CellSpan.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        final CellSpan activity = getActivity();
-        mA            = activity.findViewById(R.id.a);
-        mB            = activity.findViewById(R.id.b);
-        mC            = activity.findViewById(R.id.c);
-        mSpanThenCell = activity.findViewById(R.id.spanThenCell);
-        mCellThenSpan = activity.findViewById(R.id.cellThenSpan);
-        mSpan         = activity.findViewById(R.id.span);
-    }
-
-    @MediumTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mA);
-        assertNotNull(mB);
-        assertNotNull(mC);
-        assertNotNull(mSpanThenCell);
-        assertNotNull(mCellThenSpan);
-        assertNotNull(mSpan);
-    }
-
-    @MediumTest
-    public void testSpanThenCell() throws Exception {
-        int spanWidth = mA.getMeasuredWidth() + mB.getMeasuredWidth();
-        assertEquals("span followed by cell is broken", spanWidth,
-                mSpanThenCell.getMeasuredWidth());
-    }
-
-    @MediumTest
-    public void testCellThenSpan() throws Exception {
-        int spanWidth = mB.getMeasuredWidth() + mC.getMeasuredWidth();
-        assertEquals("cell followed by span is broken", spanWidth,
-                mCellThenSpan.getMeasuredWidth());
-    }
-
-    @MediumTest
-    public void testSpan() throws Exception {
-        int spanWidth = mA.getMeasuredWidth() + mB.getMeasuredWidth() +
-                mC.getMeasuredWidth();
-        assertEquals("span is broken", spanWidth, mSpan.getMeasuredWidth());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/FixedWidth.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/FixedWidth.java
deleted file mode 100755
index 620d20cc498863157cf2be14f3f3680c4350f006..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/FixedWidth.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.table;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * Exercise table layout with cells having a fixed width and height.
- */
-public class FixedWidth extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.table_layout_fixed_width);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/FixedWidthTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/FixedWidthTest.java
deleted file mode 100755
index 29d9a84ad23d01e51593f8c7b533663cd36a34f0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/FixedWidthTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.table;
-
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.View;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * {@link android.widget.layout.table.FixedWidth} is
- * setup to exercise tables in which cells use fixed width and height.
- */
-public class FixedWidthTest extends ActivityInstrumentationTestCase<FixedWidth> {
-    private View mFixedWidth;
-    private View mFixedHeight;
-    private View mNonFixedWidth;
-
-    public FixedWidthTest() {
-        super("com.mediatek.common.widget.tests", FixedWidth.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        final FixedWidth activity = getActivity();
-        mFixedWidth = activity.findViewById(R.id.fixed_width);
-        mNonFixedWidth = activity.findViewById(R.id.non_fixed_width);
-        mFixedHeight = activity.findViewById(R.id.fixed_height);
-    }
-
-    @MediumTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mFixedWidth);
-        assertNotNull(mFixedHeight);
-        assertNotNull(mNonFixedWidth);
-    }
-
-    // TODO: needs to be adjusted to pass on non-HVGA displays
-    // @MediumTest
-    /* Test Case Fail
-    public void testFixedWidth() throws Exception {
-        assertEquals(150, mFixedWidth.getWidth());
-        assertEquals(mFixedWidth.getWidth(), mNonFixedWidth.getWidth());
-    }
-    */
-
-    // TODO: needs to be adjusted to pass on non-HVGA displays
-    // @MediumTest
-    /* Test Case Fail
-    public void testFixedHeight() throws Exception {
-        assertEquals(48, mFixedHeight.getHeight());
-    }
-    */
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/HorizontalGravity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/HorizontalGravity.java
deleted file mode 100755
index 082a3b70d3dd55be4f7671370bf4211b648d3649..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/HorizontalGravity.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.table;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * Exercise table layout with cells using a horizontal gravity.
- */
-public class HorizontalGravity extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.table_layout_horizontal_gravity);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/HorizontalGravityTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/HorizontalGravityTest.java
deleted file mode 100755
index 9740dd6d1b7fcfe556c8ceee09efab8646533ef5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/HorizontalGravityTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.table;
-
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.ViewAsserts;
-import android.view.View;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * {@link android.widget.layout.table.HorizontalGravity} is
- * setup to exercise tables in which cells use horizontal gravity.
- */
-public class HorizontalGravityTest extends ActivityInstrumentationTestCase<HorizontalGravity> {
-    private View mReference;
-    private View mCenter;
-    private View mBottomRight;
-    private View mLeft;
-
-    public HorizontalGravityTest() {
-        super("com.mediatek.common.widget.tests", HorizontalGravity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        final HorizontalGravity activity = getActivity();
-        mReference   = activity.findViewById(R.id.reference);
-        mCenter      = activity.findViewById(R.id.center);
-        mBottomRight = activity.findViewById(R.id.bottomRight);
-        mLeft        = activity.findViewById(R.id.left);
-    }
-
-    @MediumTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mReference);
-        assertNotNull(mCenter);
-        assertNotNull(mBottomRight);
-        assertNotNull(mLeft);
-    }
-
-    @MediumTest
-    public void testCenterGravity() throws Exception {
-        ViewAsserts.assertHorizontalCenterAligned(mReference, mCenter);
-    }
-
-    @MediumTest
-    public void testLeftGravity() throws Exception {
-        ViewAsserts.assertLeftAligned(mReference, mLeft);
-    }
-
-    @MediumTest
-    public void testRightGravity() throws Exception {
-        ViewAsserts.assertRightAligned(mReference, mBottomRight);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/VerticalGravity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/VerticalGravity.java
deleted file mode 100755
index d86e38ad25cb3aa7daf7bde7b66ffebbb363d882..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/VerticalGravity.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.table;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * Exercise table layout with cells using a vertical gravity.
- */
-public class VerticalGravity extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.table_layout_vertical_gravity);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/VerticalGravityTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/VerticalGravityTest.java
deleted file mode 100755
index 04e056e3640ea58ebc169a60f834d8bbf4d6e02f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/VerticalGravityTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.table;
-
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.suitebuilder.annotation.Suppress;
-import android.test.ViewAsserts;
-import android.view.View;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * {@link android.widget.layout.table.VerticalGravity} is
- * setup to exercise tables in which cells use vertical gravity.
- */
-public class VerticalGravityTest extends ActivityInstrumentationTestCase<VerticalGravity> {
-    private View mReference1;
-    private View mReference2;
-    private View mReference3;
-    private View mTop;
-    private View mCenter;
-    private View mBottom;
-
-    public VerticalGravityTest() {
-        super("com.mediatek.common.widget.tests", VerticalGravity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        final VerticalGravity activity = getActivity();
-        mReference1 = activity.findViewById(R.id.reference1);
-        mReference2 = activity.findViewById(R.id.reference2);
-        mReference3 = activity.findViewById(R.id.reference3);
-        mTop        = activity.findViewById(R.id.cell_top);
-        mCenter     = activity.findViewById(R.id.cell_center);
-        mBottom     = activity.findViewById(R.id.cell_bottom);
-    }
-
-    @MediumTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mReference1);
-        assertNotNull(mReference2);
-        assertNotNull(mReference3);
-        assertNotNull(mTop);
-        assertNotNull(mCenter);
-        assertNotNull(mBottom);
-    }
-
-    @MediumTest
-    public void testTopGravity() throws Exception {
-        ViewAsserts.assertTopAligned(mReference1, mTop);
-    }
-
-    @MediumTest
-    public void testCenterGravity() throws Exception {
-        ViewAsserts.assertVerticalCenterAligned(mReference2, mCenter);
-    }
-
-    @Suppress
-    @MediumTest
-    public void testBottomGravity() throws Exception {
-        ViewAsserts.assertBottomAligned(mReference3, mBottom);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/Weight.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/Weight.java
deleted file mode 100755
index ed0e95cd6d8fff880e25808b1b56a246d15bb3d8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/Weight.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.table;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * Exercise table layout with cells having a weight.
- */
-public class Weight extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.table_layout_weight);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/WeightTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/WeightTest.java
deleted file mode 100755
index 40c81d1509dcac7dfd00e519a723d97c3a203276..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/layout/table/WeightTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.layout.table;
-
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.View;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * {@link android.widget.layout.table.Weight} is
- * setup to exercise tables in which cells use a weight.
- */
-public class WeightTest extends ActivityInstrumentationTestCase<Weight> {
-    private View mCell1;
-    private View mCell2;
-    private View mCell3;
-    private View mRow;
-
-    public WeightTest() {
-        super("com.mediatek.common.widget.tests", Weight.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        final Weight activity = getActivity();
-        mCell1 = activity.findViewById(R.id.cell1);
-        mCell3 = activity.findViewById(R.id.cell2);
-        mCell2 = activity.findViewById(R.id.cell3);
-        mRow = activity.findViewById(R.id.row);
-    }
-
-    @MediumTest
-    public void testSetUpConditions() throws Exception {
-        assertNotNull(mCell1);
-        assertNotNull(mCell2);
-        assertNotNull(mCell3);
-        assertNotNull(mRow);
-    }
-
-    @MediumTest
-    public void testAllCellsFillParent() throws Exception {
-        assertEquals(mCell1.getWidth() + mCell2.getWidth() + mCell3.getWidth(), mRow.getWidth());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/AdjacentListsWithAdjacentISVsInside.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/AdjacentListsWithAdjacentISVsInside.java
deleted file mode 100755
index 22631b448712fbaa781ecca8ced09661347295b6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/AdjacentListsWithAdjacentISVsInside.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import com.mediatek.common.widget.tests.util.InternalSelectionView;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.LinearLayout;
-import android.widget.ListView;
-
-/**
- * Most bodacious scenario yet!
- */
-public class AdjacentListsWithAdjacentISVsInside extends Activity {
-
-    private ListView mLeftListView;
-    private ListView mRightListView;
-
-    public ListView getLeftListView() {
-        return mLeftListView;
-    }
-
-    public ListView getRightListView() {
-        return mRightListView;
-    }
-
-    public InternalSelectionView getLeftIsv() {
-        return (InternalSelectionView)
-                ((ViewGroup) mLeftListView.getChildAt(0)).getChildAt(0);
-    }
-
-    public InternalSelectionView getLeftMiddleIsv() {
-        return (InternalSelectionView)
-                ((ViewGroup) mLeftListView.getChildAt(0)).getChildAt(1);
-    }
-
-    public InternalSelectionView getRightMiddleIsv() {
-        return (InternalSelectionView)
-                ((ViewGroup) mRightListView.getChildAt(0)).getChildAt(0);
-    }
-
-    public InternalSelectionView getRightIsv() {
-        return (InternalSelectionView)
-                ((ViewGroup) mRightListView.getChildAt(0)).getChildAt(1);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        final int desiredHeight = (int) (0.8 * getWindowManager().getDefaultDisplay().getHeight());
-
-        mLeftListView = new ListView(this);
-        mLeftListView.setAdapter(new AdjacentISVAdapter(desiredHeight));
-        mLeftListView.setItemsCanFocus(true);
-
-
-        mRightListView = new ListView(this);
-        mRightListView.setAdapter(new AdjacentISVAdapter(desiredHeight));
-        mRightListView.setItemsCanFocus(true);
-
-
-
-        setContentView(combineAdjacent(mLeftListView, mRightListView));
-    }
-
-    private static View combineAdjacent(View... views) {
-        if (views.length < 2) {
-            throw new IllegalArgumentException("you should pass at least 2 views in");
-        }
-
-        final LinearLayout ll = new LinearLayout(views[0].getContext());
-        ll.setOrientation(LinearLayout.HORIZONTAL);
-        final LinearLayout.LayoutParams lp =
-                new LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1.0f);
-
-        for (View view : views) {
-            ll.addView(view, lp);
-        }
-        return ll;
-    }
-
-    static class AdjacentISVAdapter extends BaseAdapter {
-
-        private final int mItemHeight;
-
-        AdjacentISVAdapter(int itemHeight) {
-            mItemHeight = itemHeight;
-        }
-
-        public int getCount() {
-            return 1;
-        }
-
-        public Object getItem(int position) {
-            return position;
-        }
-
-        public long getItemId(int position) {
-            return position;
-        }
-
-        public View getView(int position, View convertView, ViewGroup parent) {
-            final InternalSelectionView isvLeft = new InternalSelectionView(
-                    parent.getContext(), 5, "isv left");
-            isvLeft.setDesiredHeight(mItemHeight);
-            final InternalSelectionView isvRight = new InternalSelectionView(
-                    parent.getContext(), 5, "isv right");
-            isvRight.setDesiredHeight(mItemHeight);
-            return combineAdjacent(isvLeft, isvRight);
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListBottomGravity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListBottomGravity.java
deleted file mode 100755
index d6efe0648759aa31042697ff70a88c17ea66af87..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListBottomGravity.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-/**
- * Basic bottom gravity scenario, nothing fancy. Items do not
- * fill the screen
- */
-public class ListBottomGravity extends ListScenario {
-
-    @Override
-    protected void init(Params params) {
-        params.setStackFromBottom(true)
-                .setStartingSelectionPosition(-1)
-                .setMustFillScreen(false)
-                .setNumItems(2)
-                .setItemScreenSizeFactor(0.22);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListBottomGravityMany.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListBottomGravityMany.java
deleted file mode 100755
index 411978ea657d483d8426a5728fa7d3150666fa47..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListBottomGravityMany.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-/**
- * Basic bottom gravity scenario, nothing fancy. There are
- * more items than fit on the screen
- */
-public class ListBottomGravityMany extends ListScenario {
-
-    @Override
-    protected void init(Params params) {
-        params.setStackFromBottom(true)
-                .setStartingSelectionPosition(-1)
-                .setNumItems(10)
-                .setItemScreenSizeFactor(0.22);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListBottomGravityManyTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListBottomGravityManyTest.java
deleted file mode 100755
index 7f0745c1c31c1bbf6d8edcede90b80443914ac0c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListBottomGravityManyTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.ListView;
-
-
-public class ListBottomGravityManyTest extends ActivityInstrumentationTestCase<ListBottomGravityMany> {
-    private ListBottomGravityMany mActivity;
-    private ListView mListView;
-
-    public ListBottomGravityManyTest() {
-        super("com.mediatek.common.widget.tests", ListBottomGravityMany.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mListView = getActivity().getListView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mListView);
-
-        // Last item should be selected
-        assertEquals(mListView.getAdapter().getCount() - 1, mListView.getSelectedItemPosition());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListBottomGravityTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListBottomGravityTest.java
deleted file mode 100755
index 759ca78151c7263d90fe09c88ed4463ded54ccd4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListBottomGravityTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.ListView;
-
-
-public class ListBottomGravityTest extends ActivityInstrumentationTestCase<ListBottomGravity> {
-    private ListBottomGravity mActivity;
-    private ListView mListView;
-
-    public ListBottomGravityTest() {
-        super("com.mediatek.common.widget.tests", ListBottomGravity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mListView = getActivity().getListView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mListView);
-
-        // Last item should be selected
-        assertEquals(mListView.getAdapter().getCount() - 1, mListView.getSelectedItemPosition());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListButtonsDiagonalAcrossItems.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListButtonsDiagonalAcrossItems.java
deleted file mode 100755
index 1552bf3d1e5cd36a371d305052a021f978b55402..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListButtonsDiagonalAcrossItems.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import com.mediatek.common.widget.tests.util.ListItemFactory;
-import static com.mediatek.common.widget.tests.util.ListItemFactory.Slot;
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-
-public class ListButtonsDiagonalAcrossItems extends ListScenario {
-
-    @Override
-    protected void init(Params params) {
-        params.setItemsFocusable(true)
-                .setNumItems(3)
-                .setItemScreenSizeFactor(0.2)
-                .setMustFillScreen(false);
-    }
-
-    public Button getLeftButton() {
-        return (Button) ((ViewGroup) getListView().getChildAt(0)).getChildAt(0);
-    }
-
-    public Button getCenterButton() {
-        return (Button) ((ViewGroup) getListView().getChildAt(1)).getChildAt(1);
-    }
-
-    public Button getRightButton() {
-        return (Button) ((ViewGroup) getListView().getChildAt(2)).getChildAt(2);
-    }
-
-    @Override
-    protected View createView(int position, ViewGroup parent,
-            int desiredHeight) {
-        final Slot slot = position == 0 ? Slot.Left :
-                (position == 1 ? Slot.Middle : Slot.Right);
-        return ListItemFactory.horizontalButtonSlots(
-                parent.getContext(), desiredHeight, slot);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListDividers.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListDividers.java
deleted file mode 100755
index 69a46d9c36a18e46eb7ca6d904bac461e59eaca4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListDividers.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * Exercises a list width dividers and padding.
- */
-public class ListDividers extends Activity {
-    private ListView mListView;
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        setContentView(R.layout.list_dividers);
-
-        String values[] = new String[1000];
-        for (int i = 0; i < 1000; i++) {
-            values[i] = ((Integer) i).toString();
-        }
-
-        mListView = (ListView) findViewById(android.R.id.list);
-        mListView.setAdapter(new ArrayAdapter<String>(this,
-                android.R.layout.simple_list_item_1, values));
-
-    }
-
-    public ListView getListView() {
-        return mListView;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListEmptyViewTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListEmptyViewTest.java
deleted file mode 100755
index abd2b28fbbecb37d927ed1ce0d43c85185883248..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListEmptyViewTest.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-//package com.mediatek.common.widget.tests.listview;
-//
-//import android.app.Instrumentation;
-//import android.content.Intent;
-//import android.test.ActivityInstrumentationTestCase;
-//import android.test.suitebuilder.annotation.LargeTest;
-//import android.test.suitebuilder.annotation.MediumTest;
-//import android.view.KeyEvent;
-//import android.view.View;
-//import android.widget.ListView;
-//
-//public class ListEmptyViewTest extends ActivityInstrumentationTestCase<ListWithEmptyView> {
-//    private ListWithEmptyView mActivity;
-//    private ListView mListView;
-//
-//
-//    public ListEmptyViewTest() {
-//        super("com.mediatek.common.widget.tests", ListWithEmptyView.class);
-//    }
-//
-//    @Override
-//    protected void setUp() throws Exception {
-//        super.setUp();
-//
-//        mActivity = getActivity();
-//        mListView = getActivity().getListView();
-//    }
-//
-//    @MediumTest
-//    public void testPreconditions() {
-//        assertNotNull(mActivity);
-//        assertNotNull(mListView);
-//
-//        assertTrue("Empty view not shown", mListView.getVisibility() == View.GONE);
-//    }
-//
-//    @MediumTest
-//    public void testZeroToOne() {
-//        Instrumentation inst = getInstrumentation();
-//
-//        inst.invokeMenuActionSync(mActivity, mActivity.MENU_ADD, 0);
-//        inst.waitForIdleSync();
-//        assertTrue("Empty view still shown", mActivity.getEmptyView().getVisibility() == View.GONE);
-//        assertTrue("List not shown", mActivity.getListView().getVisibility() == View.VISIBLE);
-//    }
-//
-//    @MediumTest
-//    public void testZeroToOneForwardBack() {
-//        Instrumentation inst = getInstrumentation();
-//
-//        inst.invokeMenuActionSync(mActivity, mActivity.MENU_ADD, 0);
-//        inst.waitForIdleSync();
-//        assertTrue("Empty view still shown", mActivity.getEmptyView().getVisibility() == View.GONE);
-//        assertTrue("List not shown", mActivity.getListView().getVisibility() == View.VISIBLE);
-//
-//        // Navigate forward
-//        Intent intent = new Intent();
-//        intent.setClass(mActivity, ListWithEmptyView.class);
-//        mActivity.startActivity(intent);
-//
-//        // Navigate backward
-//        inst.sendCharacterSync(KeyEvent.KEYCODE_BACK);
-//        inst.waitForIdleSync();
-//        assertTrue("Empty view still shown", mActivity.getEmptyView().getVisibility() == View.GONE);
-//        assertTrue("List not shown", mActivity.getListView().getVisibility() == View.VISIBLE);
-//
-//    }
-//
-//    @LargeTest
-//    public void testZeroToManyToZero() {
-//        Instrumentation inst = getInstrumentation();
-//
-//        int i;
-//
-//        for (i = 0; i < 10; i++) {
-//            inst.invokeMenuActionSync(mActivity, mActivity.MENU_ADD, 0);
-//            inst.waitForIdleSync();
-//            assertTrue("Empty view still shown",
-//                    mActivity.getEmptyView().getVisibility() == View.GONE);
-//            assertTrue("List not shown", mActivity.getListView().getVisibility() == View.VISIBLE);
-//        }
-//
-//        for (i = 0; i < 10; i++) {
-//            inst.invokeMenuActionSync(mActivity, mActivity.MENU_REMOVE, 0);
-//            inst.waitForIdleSync();
-//            if (i < 9) {
-//                assertTrue("Empty view still shown",
-//                        mActivity.getEmptyView().getVisibility() == View.GONE);
-//                assertTrue("List not shown",
-//                        mActivity.getListView().getVisibility() == View.VISIBLE);
-//            } else {
-//                assertTrue("Empty view not shown",
-//                        mActivity.getEmptyView().getVisibility() == View.VISIBLE);
-//                assertTrue("List still shown",
-//                        mActivity.getListView().getVisibility() == View.GONE);
-//            }
-//        }
-//
-//        // Navigate forward
-//        Intent intent = new Intent();
-//        intent.setClass(mActivity, ListWithEmptyView.class);
-//        mActivity.startActivity(intent);
-//
-//        // Navigate backward
-//        inst.sendCharacterSync(KeyEvent.KEYCODE_BACK);
-//        inst.waitForIdleSync();
-//        assertTrue("Empty view not shown", mActivity.getEmptyView().getVisibility() == View.VISIBLE);
-//        assertTrue("List still shown", mActivity.getListView().getVisibility() == View.GONE);
-//    }
-//
-//
-//}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListEndingWithMultipleSeparators.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListEndingWithMultipleSeparators.java
deleted file mode 100755
index 8b0382e738c251f78e485da96f3a6f020042b802..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListEndingWithMultipleSeparators.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-public class ListEndingWithMultipleSeparators extends ListScenario {
-
-    protected void init(Params params) {
-        params.setItemsFocusable(false)
-                .setNumItems(5)
-                .setItemScreenSizeFactor(0.22)
-                .setPositionUnselectable(3)
-                .setPositionUnselectable(4);
-    }
-
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListFilter.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListFilter.java
deleted file mode 100755
index 5b8278a6e87182af765a259c61ac11eda49113c3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListFilter.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.app.ListActivity;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-
-import com.mediatek.common.widget.tests.R;
-
-
-/**
- * Tests hiding and showing the list filter by hiding and showing an ancestor of the
- * ListView
- */
-public class ListFilter extends ListActivity implements OnClickListener {
-
-    private View mFrame;
-    private Button mHide;
-    private Button mShow;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.list_filter);
-        setListAdapter(new ArrayAdapter<String>(this,
-                android.R.layout.simple_list_item_1, mStrings));
-        getListView().setTextFilterEnabled(true);
-        mFrame = findViewById(R.id.frame);
-
-        mHide = (Button) findViewById(R.id.hide);
-        mHide.setOnClickListener(this);
-
-        mShow = (Button) findViewById(R.id.show);
-        mShow.setOnClickListener(this);
-    }
-
-
-    public void onClick(View v) {
-        mFrame.setVisibility(v == mHide ? View.INVISIBLE : View.VISIBLE);
-    }
-
-    private String[] mStrings = {
-            "Abbaye de Belloc", "Abbaye du Mont des Cats", "Abertam", "Abondance", "Ackawi",
-            "Acorn", "Adelost", "Affidelice au Chablis", "Afuega'l Pitu", "Airag", "Airedale",
-            "Aisy Cendre", "Allgauer Emmentaler", "Alverca", "Ambert", "American Cheese",
-            "Ami du Chambertin", "Anejo Enchilado", "Anneau du Vic-Bilh", "Anthoriro", "Appenzell",
-            "Aragon", "Ardi Gasna", "Ardrahan", "Armenian String", "Aromes au Gene de Marc",
-            "Asadero", "Asiago", "Aubisque Pyrenees", "Autun", "Avaxtskyr", "Baby Swiss",
-            "Babybel", "Baguette Laonnaise", "Bakers", "Baladi", "Balaton", "Bandal", "Banon",
-            "Barry's Bay Cheddar", "Basing", "Basket Cheese", "Bath Cheese", "Bavarian Bergkase",
-            "Baylough", "Beaufort", "Beauvoorde", "Beenleigh Blue", "Beer Cheese", "Bel Paese",
-            "Bergader", "Bergere Bleue", "Berkswell", "Beyaz Peynir", "Bierkase", "Bishop Kennedy",
-            "Blarney", "Bleu d'Auvergne", "Bleu de Gex", "Bleu de Laqueuille",
-            "Bleu de Septmoncel", "Bleu Des Causses", "Blue", "Blue Castello", "Blue Rathgore",
-            "Blue Vein (Australian)", "Blue Vein Cheeses", "Bocconcini", "Bocconcini (Australian)",
-            "Boeren Leidenkaas", "Bonchester", "Bosworth", "Bougon", "Boule Du Roves",
-            "Boulette d'Avesnes", "Boursault", "Boursin", "Bouyssou", "Bra", "Braudostur",
-            "Breakfast Cheese", "Brebis du Lavort", "Brebis du Lochois", "Brebis du Puyfaucon",
-            "Bresse Bleu", "Brick", "Brie", "Brie de Meaux", "Brie de Melun", "Brillat-Savarin",
-            "Brin", "Brin d' Amour", "Brin d'Amour", "Brinza (Burduf Brinza)",
-            "Briquette de Brebis", "Briquette du Forez", "Broccio", "Broccio Demi-Affine",
-            "Brousse du Rove", "Bruder Basil", "Brusselae Kaas (Fromage de Bruxelles)", "Bryndza",
-            "Buchette d'Anjou", "Buffalo", "Burgos", "Butte", "Butterkase", "Button (Innes)",
-            "Buxton Blue", "Cabecou", "Caboc", "Cabrales", "Cachaille", "Caciocavallo", "Caciotta",
-            "Caerphilly", "Cairnsmore", "Calenzana", "Cambazola", "Camembert de Normandie",
-            "Canadian Cheddar", "Canestrato", "Cantal", "Caprice des Dieux", "Capricorn Goat",
-            "Capriole Banon", "Carre de l'Est", "Casciotta di Urbino", "Cashel Blue", "Castellano",
-            "Castelleno", "Castelmagno", "Castelo Branco", "Castigliano", "Cathelain",
-            "Celtic Promise", "Cendre d'Olivet", "Cerney", "Chabichou", "Chabichou du Poitou",
-            "Chabis de Gatine", "Chaource", "Charolais", "Chaumes", "Cheddar",
-            "Cheddar Clothbound", "Cheshire", "Chevres", "Chevrotin des Aravis", "Chontaleno",
-            "Civray", "Coeur de Camembert au Calvados", "Coeur de Chevre", "Colby", "Cold Pack",
-            "Comte", "Coolea", "Cooleney", "Coquetdale", "Corleggy", "Cornish Pepper",
-            "Cotherstone", "Cotija", "Cottage Cheese", "Cottage Cheese (Australian)",
-            "Cougar Gold", "Coulommiers", "Coverdale", "Crayeux de Roncq", "Cream Cheese",
-            "Cream Havarti", "Crema Agria", "Crema Mexicana", "Creme Fraiche", "Crescenza",
-            "Croghan", "Crottin de Chavignol", "Crottin du Chavignol", "Crowdie", "Crowley",
-            "Cuajada", "Curd", "Cure Nantais", "Curworthy", "Cwmtawe Pecorino",
-            "Cypress Grove Chevre", "Danablu (Danish Blue)", "Danbo", "Danish Fontina",
-            "Daralagjazsky", "Dauphin", "Delice des Fiouves", "Denhany Dorset Drum", "Derby",
-            "Dessertnyj Belyj", "Devon Blue", "Devon Garland", "Dolcelatte", "Doolin",
-            "Doppelrhamstufel", "Dorset Blue Vinney", "Double Gloucester", "Double Worcester",
-            "Dreux a la Feuille", "Dry Jack", "Duddleswell", "Dunbarra", "Dunlop", "Dunsyre Blue",
-            "Duroblando", "Durrus", "Dutch Mimolette (Commissiekaas)", "Edam", "Edelpilz",
-            "Emental Grand Cru", "Emlett", "Emmental", "Epoisses de Bourgogne", "Esbareich",
-            "Esrom", "Etorki", "Evansdale Farmhouse Brie", "Evora De L'Alentejo", "Exmoor Blue",
-            "Explorateur", "Feta", "Feta (Australian)", "Figue", "Filetta", "Fin-de-Siecle",
-            "Finlandia Swiss", "Finn", "Fiore Sardo", "Fleur du Maquis", "Flor de Guia",
-            "Flower Marie", "Folded", "Folded cheese with mint", "Fondant de Brebis",
-            "Fontainebleau", "Fontal", "Fontina Val d'Aosta", "Formaggio di capra", "Fougerus",
-            "Four Herb Gouda", "Fourme d' Ambert", "Fourme de Haute Loire", "Fourme de Montbrison",
-            "Fresh Jack", "Fresh Mozzarella", "Fresh Ricotta", "Fresh Truffles", "Fribourgeois",
-            "Friesekaas", "Friesian", "Friesla", "Frinault", "Fromage a Raclette", "Fromage Corse",
-            "Fromage de Montagne de Savoie", "Fromage Frais", "Fruit Cream Cheese",
-            "Frying Cheese", "Fynbo", "Gabriel", "Galette du Paludier", "Galette Lyonnaise",
-            "Galloway Goat's Milk Gems", "Gammelost", "Gaperon a l'Ail", "Garrotxa", "Gastanberra",
-            "Geitost", "Gippsland Blue", "Gjetost", "Gloucester", "Golden Cross", "Gorgonzola",
-            "Gornyaltajski", "Gospel Green", "Gouda", "Goutu", "Gowrie", "Grabetto", "Graddost",
-            "Grafton Village Cheddar", "Grana", "Grana Padano", "Grand Vatel",
-            "Grataron d' Areches", "Gratte-Paille", "Graviera", "Greuilh", "Greve",
-            "Gris de Lille", "Gruyere", "Gubbeen", "Guerbigny", "Halloumi",
-            "Halloumy (Australian)", "Haloumi-Style Cheese", "Harbourne Blue", "Havarti",
-            "Heidi Gruyere", "Hereford Hop", "Herrgardsost", "Herriot Farmhouse", "Herve",
-            "Hipi Iti", "Hubbardston Blue Cow", "Hushallsost", "Iberico", "Idaho Goatster",
-            "Idiazabal", "Il Boschetto al Tartufo", "Ile d'Yeu", "Isle of Mull", "Jarlsberg",
-            "Jermi Tortes", "Jibneh Arabieh", "Jindi Brie", "Jubilee Blue", "Juustoleipa",
-            "Kadchgall", "Kaseri", "Kashta", "Kefalotyri", "Kenafa", "Kernhem", "Kervella Affine",
-            "Kikorangi", "King Island Cape Wickham Brie", "King River Gold", "Klosterkaese",
-            "Knockalara", "Kugelkase", "L'Aveyronnais", "L'Ecir de l'Aubrac", "La Taupiniere",
-            "La Vache Qui Rit", "Laguiole", "Lairobell", "Lajta", "Lanark Blue", "Lancashire",
-            "Langres", "Lappi", "Laruns", "Lavistown", "Le Brin", "Le Fium Orbo", "Le Lacandou",
-            "Le Roule", "Leafield", "Lebbene", "Leerdammer", "Leicester", "Leyden", "Limburger",
-            "Lincolnshire Poacher", "Lingot Saint Bousquet d'Orb", "Liptauer", "Little Rydings",
-            "Livarot", "Llanboidy", "Llanglofan Farmhouse", "Loch Arthur Farmhouse",
-            "Loddiswell Avondale", "Longhorn", "Lou Palou", "Lou Pevre", "Lyonnais", "Maasdam",
-            "Macconais", "Mahoe Aged Gouda", "Mahon", "Malvern", "Mamirolle", "Manchego",
-            "Manouri", "Manur", "Marble Cheddar", "Marbled Cheeses", "Maredsous", "Margotin",
-            "Maribo", "Maroilles", "Mascares", "Mascarpone", "Mascarpone (Australian)",
-            "Mascarpone Torta", "Matocq", "Maytag Blue", "Meira", "Menallack Farmhouse",
-            "Menonita", "Meredith Blue", "Mesost", "Metton (Cancoillotte)", "Meyer Vintage Gouda",
-            "Mihalic Peynir", "Milleens", "Mimolette", "Mine-Gabhar", "Mini Baby Bells", "Mixte",
-            "Molbo", "Monastery Cheeses", "Mondseer", "Mont D'or Lyonnais", "Montasio",
-            "Monterey Jack", "Monterey Jack Dry", "Morbier", "Morbier Cru de Montagne",
-            "Mothais a la Feuille", "Mozzarella", "Mozzarella (Australian)",
-            "Mozzarella di Bufala", "Mozzarella Fresh, in water", "Mozzarella Rolls", "Munster",
-            "Murol", "Mycella", "Myzithra", "Naboulsi", "Nantais", "Neufchatel",
-            "Neufchatel (Australian)", "Niolo", "Nokkelost", "Northumberland", "Oaxaca",
-            "Olde York", "Olivet au Foin", "Olivet Bleu", "Olivet Cendre",
-            "Orkney Extra Mature Cheddar", "Orla", "Oschtjepka", "Ossau Fermier", "Ossau-Iraty",
-            "Oszczypek", "Oxford Blue", "P'tit Berrichon", "Palet de Babligny", "Paneer", "Panela",
-            "Pannerone", "Pant ys Gawn", "Parmesan (Parmigiano)", "Parmigiano Reggiano",
-            "Pas de l'Escalette", "Passendale", "Pasteurized Processed", "Pate de Fromage",
-            "Patefine Fort", "Pave d'Affinois", "Pave d'Auge", "Pave de Chirac", "Pave du Berry",
-            "Pecorino", "Pecorino in Walnut Leaves", "Pecorino Romano", "Peekskill Pyramid",
-            "Pelardon des Cevennes", "Pelardon des Corbieres", "Penamellera", "Penbryn",
-            "Pencarreg", "Perail de Brebis", "Petit Morin", "Petit Pardou", "Petit-Suisse",
-            "Picodon de Chevre", "Picos de Europa", "Piora", "Pithtviers au Foin",
-            "Plateau de Herve", "Plymouth Cheese", "Podhalanski", "Poivre d'Ane", "Polkolbin",
-            "Pont l'Eveque", "Port Nicholson", "Port-Salut", "Postel", "Pouligny-Saint-Pierre",
-            "Pourly", "Prastost", "Pressato", "Prince-Jean", "Processed Cheddar", "Provolone",
-            "Provolone (Australian)", "Pyengana Cheddar", "Pyramide", "Quark",
-            "Quark (Australian)", "Quartirolo Lombardo", "Quatre-Vents", "Quercy Petit",
-            "Queso Blanco", "Queso Blanco con Frutas --Pina y Mango", "Queso de Murcia",
-            "Queso del Montsec", "Queso del Tietar", "Queso Fresco", "Queso Fresco (Adobera)",
-            "Queso Iberico", "Queso Jalapeno", "Queso Majorero", "Queso Media Luna",
-            "Queso Para Frier", "Queso Quesadilla", "Rabacal", "Raclette", "Ragusano", "Raschera",
-            "Reblochon", "Red Leicester", "Regal de la Dombes", "Reggianito", "Remedou",
-            "Requeson", "Richelieu", "Ricotta", "Ricotta (Australian)", "Ricotta Salata", "Ridder",
-            "Rigotte", "Rocamadour", "Rollot", "Romano", "Romans Part Dieu", "Roncal", "Roquefort",
-            "Roule", "Rouleau De Beaulieu", "Royalp Tilsit", "Rubens", "Rustinu", "Saaland Pfarr",
-            "Saanenkaese", "Saga", "Sage Derby", "Sainte Maure", "Saint-Marcellin",
-            "Saint-Nectaire", "Saint-Paulin", "Salers", "Samso", "San Simon", "Sancerre",
-            "Sap Sago", "Sardo", "Sardo Egyptian", "Sbrinz", "Scamorza", "Schabzieger", "Schloss",
-            "Selles sur Cher", "Selva", "Serat", "Seriously Strong Cheddar", "Serra da Estrela",
-            "Sharpam", "Shelburne Cheddar", "Shropshire Blue", "Siraz", "Sirene", "Smoked Gouda",
-            "Somerset Brie", "Sonoma Jack", "Sottocenare al Tartufo", "Soumaintrain",
-            "Sourire Lozerien", "Spenwood", "Sraffordshire Organic", "St. Agur Blue Cheese",
-            "Stilton", "Stinking Bishop", "String", "Sussex Slipcote", "Sveciaost", "Swaledale",
-            "Sweet Style Swiss", "Swiss", "Syrian (Armenian String)", "Tala", "Taleggio", "Tamie",
-            "Tasmania Highland Chevre Log", "Taupiniere", "Teifi", "Telemea", "Testouri",
-            "Tete de Moine", "Tetilla", "Texas Goat Cheese", "Tibet", "Tillamook Cheddar",
-            "Tilsit", "Timboon Brie", "Toma", "Tomme Brulee", "Tomme d'Abondance",
-            "Tomme de Chevre", "Tomme de Romans", "Tomme de Savoie", "Tomme des Chouans", "Tommes",
-            "Torta del Casar", "Toscanello", "Touree de L'Aubier", "Tourmalet",
-            "Trappe (Veritable)", "Trois Cornes De Vendee", "Tronchon", "Trou du Cru", "Truffe",
-            "Tupi", "Turunmaa", "Tymsboro", "Tyn Grug", "Tyning", "Ubriaco", "Ulloa",
-            "Vacherin-Fribourgeois", "Valencay", "Vasterbottenost", "Venaco", "Vendomois",
-            "Vieux Corse", "Vignotte", "Vulscombe", "Waimata Farmhouse Blue",
-            "Washed Rind Cheese (Australian)", "Waterloo", "Weichkaese", "Wellington",
-            "Wensleydale", "White Stilton", "Whitestone Farmhouse", "Wigmore", "Woodside Cabecou",
-            "Xanadu", "Xynotyro", "Yarg Cornish", "Yarra Valley Pyramid", "Yorkshire Blue",
-            "Zamorano", "Zanetti Grana Padano", "Zanetti Parmigiano Reggiano"};
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListFocusableTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListFocusableTest.java
deleted file mode 100755
index 0962a8b6b760810ca45220e36574f525764f5d43..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListFocusableTest.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.ListView;
-import android.widget.ListAdapter;
-import android.widget.ArrayAdapter;
-
-public class ListFocusableTest extends ActivityInstrumentationTestCase<ListTopGravity> {
-    private ListTopGravity mActivity;
-    private ListView mListView;
-
-    public ListFocusableTest() {
-        super("com.mediatek.common.widget.tests", ListTopGravity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mListView = getActivity().getListView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mListView);
-
-        // First item should be selected
-        assertEquals(0, mListView.getSelectedItemPosition());
-    }
-
-    @MediumTest
-    public void testAdapterFull() {
-        setFullAdapter();
-        assertTrue(mListView.isFocusable());
-    }
-
-    @MediumTest
-    public void testAdapterEmpty() {
-        setEmptyAdapter();
-        assertFalse(mListView.isFocusable());
-    }
-
-    @MediumTest
-    public void testAdapterNull() {
-        setNullAdapter();
-        assertFalse(mListView.isFocusable());
-    }
-
-    @MediumTest
-    public void testAdapterFullSetFocusable() {
-        assertTrue(mListView.isFocusable());
-
-        setFocusable();
-        assertTrue(mListView.isFocusable());
-    }
-
-    @MediumTest
-    public void testAdapterFullSetNonFocusable() {
-        assertTrue(mListView.isFocusable());
-
-        setNonFocusable();
-        assertFalse(mListView.isFocusable());
-    }
-
-    @MediumTest
-    public void testAdapterEmptySetFocusable() {
-        setEmptyAdapter();
-        assertFalse(mListView.isFocusable());
-
-        setFocusable();
-        assertFalse(mListView.isFocusable());
-    }
-
-    @MediumTest
-    public void testAdapterEmptySetNonFocusable() {
-        setEmptyAdapter();
-        assertFalse(mListView.isFocusable());
-
-        setNonFocusable();
-        assertFalse(mListView.isFocusable());
-    }
-
-    @MediumTest
-    public void testAdapterNullSetFocusable() {
-        setNullAdapter();
-        assertFalse(mListView.isFocusable());
-
-        setFocusable();
-        assertFalse(mListView.isFocusable());
-    }
-
-    @MediumTest
-    public void testAdapterNullSetNonFocusable() {
-        setNullAdapter();
-        assertFalse(mListView.isFocusable());
-
-        setNonFocusable();
-        assertFalse(mListView.isFocusable());
-    }
-
-    @MediumTest
-    public void testFocusableSetAdapterFull() {
-        assertTrue(mListView.isFocusable());
-
-        setFullAdapter();
-        assertTrue(mListView.isFocusable());
-    }
-
-    @MediumTest
-    public void testNonFocusableSetAdapterFull() {
-        assertTrue(mListView.isFocusable());
-
-        setNonFocusable();
-        assertFalse(mListView.isFocusable());
-
-        setFullAdapter();
-        assertFalse(mListView.isFocusable());
-    }
-
-    @MediumTest
-    public void testFocusableSetAdapterEmpty() {
-        assertTrue(mListView.isFocusable());
-
-        setEmptyAdapter();
-        assertFalse(mListView.isFocusable());
-    }
-
-    @MediumTest
-    public void testNonFocusableSetAdapterEmpty() {
-        assertTrue(mListView.isFocusable());
-
-        setNonFocusable();
-        assertFalse(mListView.isFocusable());
-
-        setEmptyAdapter();
-        assertFalse(mListView.isFocusable());
-    }
-
-    @MediumTest
-    public void testFocusableSetAdapterNull() {
-        assertTrue(mListView.isFocusable());
-
-        setNullAdapter();
-        assertFalse(mListView.isFocusable());
-    }
-
-    @MediumTest
-    public void testNonFocusableSetAdapterNull() {
-        assertTrue(mListView.isFocusable());
-
-        setNonFocusable();
-        assertFalse(mListView.isFocusable());
-
-        setNullAdapter();
-        assertFalse(mListView.isFocusable());
-    }
-
-    private ListAdapter createFullAdapter() {
-        return new ArrayAdapter<String>(mActivity, android.R.layout.simple_list_item_1,
-                new String[] { "Android", "Robot" });
-    }
-
-    private ListAdapter createEmptyAdapter() {
-        return new ArrayAdapter<String>(mActivity, android.R.layout.simple_list_item_1,
-                new String[] { });
-    }
-
-
-    private void setFullAdapter() {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mListView.setAdapter(createFullAdapter());
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-    }
-
-    private void setEmptyAdapter() {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mListView.setAdapter(createEmptyAdapter());
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-    }
-
-    private void setNullAdapter() {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mListView.setAdapter(null);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-    }
-
-    private void setFocusable() {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mListView.setFocusable(true);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-    }
-
-    private void setNonFocusable() {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mListView.setFocusable(false);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListGetCheckItemIdsTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListGetCheckItemIdsTest.java
deleted file mode 100755
index 340315b87efbde2101a137b9cac4a3b62c96e475..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListGetCheckItemIdsTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.ListView;
-
-import java.util.Arrays;
-
-/**
- * Testing the ListView getCheckItemIds() method in different situations.
- */
-public class ListGetCheckItemIdsTest extends ActivityInstrumentationTestCase2<ListSimple> {
-    private ListView mListView;
-
-    public ListGetCheckItemIdsTest() {
-        super(ListSimple.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mListView = getActivity().getListView();
-    }
-
-    private void assertChecked(String message, long... expectedIds) {
-        // Sort the two arrays since we are actually doing a set equality.
-        long[] checkItemIds = mListView.getCheckItemIds();
-        long[] sortedCheckItemsIds = new long[checkItemIds.length];
-        System.arraycopy(checkItemIds, 0, sortedCheckItemsIds, 0, checkItemIds.length);
-        Arrays.sort(sortedCheckItemsIds);
-
-        long[] sortedExpectedIds = new long[expectedIds.length];
-        System.arraycopy(expectedIds, 0, sortedExpectedIds, 0, expectedIds.length);
-        Arrays.sort(sortedExpectedIds);
-
-        assertTrue(message, Arrays.equals(sortedExpectedIds, sortedCheckItemsIds));
-    }
-
-    @MediumTest
-    @UiThreadTest
-    public void testNoneCheck() {
-        mListView.setChoiceMode(ListView.CHOICE_MODE_NONE);
-
-        mListView.setItemChecked(0, true);
-        assertChecked("None check choice has item checked");
-    }
-
-    @MediumTest
-    @UiThreadTest
-    public void testSimpleCheck() {
-        mListView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
-        assertChecked("Item checked when setting Single mode");
-
-        // Test a check at each position
-        int childCount = mListView.getChildCount();
-        for (int i = 0; i < childCount; i++) {
-            mListView.setItemChecked(i, true);
-            assertChecked("Only element " + i + " should be checked", i);
-        }
-
-        // Check an element and uncheck some others
-        for (int i = 0; i < childCount; i++) {
-            mListView.setItemChecked(i, true);
-            mListView.setItemChecked((i - 3 + childCount) % childCount, false);
-            mListView.setItemChecked((i + 1) % childCount, false);
-            assertChecked("Only element " + i + " should be checked", i);
-        }
-    }
-
-    @MediumTest
-    @UiThreadTest
-    public void testMultipleCheck() {
-        mListView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
-        assertChecked("Item checked when setting Multiple mode");
-
-        int childCount = mListView.getChildCount();
-        assertTrue("Tests requires at least 4 items", childCount >= 4);
-
-        mListView.setItemChecked(1, true);
-        assertChecked("First element non checked", 1);
-
-        mListView.setItemChecked(3, true);
-        assertChecked("Second element not checked", 1, 3);
-
-        mListView.setItemChecked(0, true);
-        assertChecked("Third element not checked", 0, 1, 3);
-
-        mListView.setItemChecked(2, false);
-        assertChecked("Unchecked element appears checked", 0, 1, 3);
-
-        mListView.setItemChecked(1, false);
-        assertChecked("Unchecked element remains", 0, 3);
-
-        mListView.setItemChecked(2, false);
-        assertChecked("Already unchecked element appears", 0, 3);
-
-        mListView.setItemChecked(3, false);
-        assertChecked("Unchecked 3 remains", 0);
-
-        mListView.setItemChecked(3, false);
-        assertChecked("Twice unchecked 3 remains", 0);
-
-        mListView.setItemChecked(0, false);
-        assertChecked("Checked items after last element unchecked");
-    }
-
-    @MediumTest
-    @UiThreadTest
-    public void testClearChoices() {
-        mListView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
-        mListView.setItemChecked(0, true);
-        mListView.clearChoices();
-        assertChecked("Item checked after SINGLE clear choice");
-
-        mListView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
-        int childCount = mListView.getChildCount();
-        for (int i = 0; i < childCount; i++) {
-            mListView.setItemChecked(0, i % 3 == 0);
-        }
-        mListView.clearChoices();
-        assertChecked("Item checked after MULTIPLE clear choice");
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListGetSelectedView.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListGetSelectedView.java
deleted file mode 100755
index 0d0b628e329f328ed6dab7018bead0d524d7f2a4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListGetSelectedView.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-/**
- * Basic top gravity scenario. This test is made to check that getSelectedView() will return
- * null in touch mode.
- */
-public class ListGetSelectedView extends ListScenario {
-    @Override
-    protected void init(Params params) {
-        params.setMustFillScreen(false).setNumItems(2).setItemScreenSizeFactor(0.22);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListHeterogeneous.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListHeterogeneous.java
deleted file mode 100755
index 448a9a83225ea7779e65743694f304a0cfa9d7ac..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListHeterogeneous.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.mediatek.common.widget.tests.util.ListItemFactory;
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-/**
- * List that has different view types
- */
-public class ListHeterogeneous extends ListScenario {
-
-    @Override
-    protected void init(Params params) {
-        params.setNumItems(50)
-                .setItemScreenSizeFactor(1.0 / 8)
-                .setItemsFocusable(true)
-                .setHeaderViewCount(3)
-                .setFooterViewCount(2);
-    }
-
-    @Override
-    protected View createView(int position, ViewGroup parent, int desiredHeight) {
-        switch (position % 3) {
-        case 0:
-            return ListItemFactory.text(
-                    position, parent.getContext(), getValueAtPosition(position), desiredHeight);
-        case 1:
-            return ListItemFactory.button(
-                    position, parent.getContext(), getValueAtPosition(position), desiredHeight);
-        case 2:
-            return ListItemFactory.doubleText(
-                    position, parent.getContext(), getValueAtPosition(position), desiredHeight);
-        }
-
-        return null;
-    }
-
-    @Override
-    public View convertView(int position, View convertView, ViewGroup parent) {
-        switch (position % 3) {
-        case 0:
-            return ListItemFactory.convertText(convertView, getValueAtPosition(position), position);
-        case 1:
-            return ListItemFactory.convertButton(convertView, getValueAtPosition(position),
-                    position);
-        case 2:
-            return ListItemFactory.convertDoubleText(convertView, getValueAtPosition(position),
-                    position);
-        }
-
-        return null;
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        return position % 3;
-    }
-
-    @Override
-    public int getViewTypeCount() {
-        return 3;
-    }
-
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListHeterogeneousTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListHeterogeneousTest.java
deleted file mode 100755
index 79762aec2697808d6fae42acbe7a8564711e5242..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListHeterogeneousTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.app.Instrumentation;
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-import android.widget.ListView;
-
-
-public class ListHeterogeneousTest extends ActivityInstrumentationTestCase<ListHeterogeneous> {
-    private ListHeterogeneous mActivity;
-    private ListView mListView;
-
-
-    public ListHeterogeneousTest() {
-        super("com.mediatek.common.widget.tests", ListHeterogeneous.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mListView = getActivity().getListView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mListView);
-    }
-
-    @LargeTest
-    public void testKeyScrolling() {
-        Instrumentation inst = getInstrumentation();
-
-        int count = mListView.getAdapter().getCount();
-
-
-        for (int i = 0; i < count - 1; i++) {
-            inst.sendCharacterSync(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-        inst.waitForIdleSync();
-        int convertMissesBefore = mActivity.getConvertMisses();
-
-        assertEquals("Unexpected convert misses", 0, convertMissesBefore);
-
-        for (int i = 0; i < count - 1; i++) {
-            inst.sendCharacterSync(KeyEvent.KEYCODE_DPAD_UP);
-        }
-        inst.waitForIdleSync();
-        int convertMissesAfter = mActivity.getConvertMisses();
-
-        assertEquals("Unexpected convert misses", 0, convertMissesAfter);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListHorizontalFocusWithinItemWins.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListHorizontalFocusWithinItemWins.java
deleted file mode 100755
index 7f6cfd682cbf68c9f4d382a5cf0033f7f2dcf8c4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListHorizontalFocusWithinItemWins.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import com.mediatek.common.widget.tests.util.ListItemFactory;
-import static com.mediatek.common.widget.tests.util.ListItemFactory.Slot;
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-
-public class ListHorizontalFocusWithinItemWins extends ListScenario {
-
-    @Override
-    protected void init(Params params) {
-        params.setItemsFocusable(true)
-                .setNumItems(2)
-                .setItemScreenSizeFactor(0.2)
-                .setMustFillScreen(false);
-    }
-
-    public Button getTopLeftButton() {
-        return (Button) ((ViewGroup) getListView().getChildAt(0)).getChildAt(0);
-    }
-
-    public Button getTopRightButton() {
-        return (Button) ((ViewGroup) getListView().getChildAt(0)).getChildAt(2);
-    }
-
-    public Button getBottomMiddleButton() {
-        return (Button) ((ViewGroup) getListView().getChildAt(1)).getChildAt(1);
-    }
-
-    @Override
-    protected View createView(int position, ViewGroup parent,
-            int desiredHeight) {
-        final Context context = parent.getContext();
-        if (position == 0) {
-            return ListItemFactory.horizontalButtonSlots(
-                    context, desiredHeight, Slot.Left, Slot.Right);
-        } else if (position == 1) {
-            return ListItemFactory.horizontalButtonSlots(
-                    context, desiredHeight, Slot.Middle);
-        } else {
-            throw new IllegalArgumentException("expecting position 0 or 1");
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListInHorizontal.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListInHorizontal.java
deleted file mode 100755
index cf7a9283e6657a305c7b98f5175bfb888300a8b8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListInHorizontal.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * Exercises a list in a horizontal linear layout
- */
-public class ListInHorizontal extends Activity {
-    private ListView mListView;
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        setContentView(R.layout.list_in_horizontal);
-
-        String values[] = new String[1000];
-        for (int i = 0; i < 1000; i++) {
-            values[i] = ((Integer) i).toString();
-        }
-
-        mListView = (ListView) findViewById(R.id.list);
-        mListView.setAdapter(new ArrayAdapter<String>(this,
-                android.R.layout.simple_list_item_1, values));
-
-    }
-
-    public ListView getListView() {
-        return mListView;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListInHorizontalTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListInHorizontalTest.java
deleted file mode 100755
index b70fd9dc0125f61f85e5af354b6d3d866ec52fa1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListInHorizontalTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-
-public class ListInHorizontalTest extends ListUnspecifiedMeasure<ListInHorizontal> {
-    public ListInHorizontalTest() {
-        super(ListInHorizontal.class);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListInVertical.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListInVertical.java
deleted file mode 100755
index dd17f36c38c3ca5531185c9c5a1b53b55d69fe5e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListInVertical.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * Exercises a list in a vertical linear layout
- */
-public class ListInVertical extends Activity {
-    private ListView mListView;
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        setContentView(R.layout.list_in_vertical);
-
-        String values[] = new String[1000];
-        for (int i = 0; i < 1000; i++) {
-            values[i] = ((Integer) i).toString();
-        }
-
-        mListView = (ListView) findViewById(R.id.list);
-        mListView.setAdapter(new ArrayAdapter<String>(this,
-                android.R.layout.simple_list_item_1, values));
-
-    }
-
-    public ListView getListView() {
-        return mListView;
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListInVerticalTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListInVerticalTest.java
deleted file mode 100755
index 7bde489a5afd0a7d293a82165120e63142ae584e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListInVerticalTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-
-public class ListInVerticalTest extends ListUnspecifiedMeasure<ListInVertical> {
-    public ListInVerticalTest() {
-        super(ListInVertical.class);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListInterleaveFocusables.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListInterleaveFocusables.java
deleted file mode 100755
index b31dad83f30ab088f024462ac12a2a30b11e4be3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListInterleaveFocusables.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.view.View;
- import android.view.ViewGroup;
- import com.google.android.collect.Sets;
- import com.mediatek.common.widget.tests.util.ListScenario;
- import com.mediatek.common.widget.tests.util.ListItemFactory;
-
- import java.util.Set;
-
-/**
- * List that interleaves focusable items.
- */
-public class ListInterleaveFocusables extends ListScenario {
-
-    private Set<Integer> mFocusablePositions = Sets.newHashSet(1, 3, 6);
-
-    @Override
-    protected void init(Params params) {
-        params.setNumItems(7)
-                .setItemScreenSizeFactor(1.0 / 8)
-                .setItemsFocusable(true)
-                .setMustFillScreen(false);
-    }
-
-    @Override
-    protected View createView(int position, ViewGroup parent, int desiredHeight) {
-        if (mFocusablePositions.contains(position)) {
-            return ListItemFactory.button(
-                    position, parent.getContext(), getValueAtPosition(position), desiredHeight);
-        } else {
-            return super.createView(position, parent, desiredHeight);
-        }
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        return mFocusablePositions.contains(position) ? 0 : 1;
-    }
-
-    @Override
-    public int getViewTypeCount() {
-        return 2;
-    }
-
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListItemFocusableAboveUnfocusable.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListItemFocusableAboveUnfocusable.java
deleted file mode 100755
index 6aa56068c8a16a28dd6320b43320b9f25f956c01..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListItemFocusableAboveUnfocusable.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.view.View;
-import android.view.ViewGroup;
-import com.mediatek.common.widget.tests.util.ListItemFactory;
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-/**
- * A list where the items may befocusable, but the second item isn't actually focusabe.
- */
-public class ListItemFocusableAboveUnfocusable extends ListScenario {
-
-
-    protected void init(Params params) {
-        params.setNumItems(2)
-                .setItemsFocusable(true)
-                .setItemScreenSizeFactor(0.2)
-                .setMustFillScreen(false);
-    }
-
-    @Override
-    protected View createView(int position, ViewGroup parent, int desiredHeight) {
-        if (position == 0) {
-            return ListItemFactory.button(
-                    position, parent.getContext(), getValueAtPosition(position), desiredHeight);
-        } else {
-            return super.createView(position, parent, desiredHeight);
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListItemFocusablesClose.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListItemFocusablesClose.java
deleted file mode 100755
index 3438127086e02b21e13fbfe00186320c22be362e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListItemFocusablesClose.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-import com.mediatek.common.widget.tests.util.ListItemFactory;
-import android.view.View;
-import android.view.ViewGroup;
-
-/**
- * Each list item has two focusables that are close enough together that
- * it shouldn't require panning to move focus.
- */
-public class ListItemFocusablesClose extends ListScenario {
-
-
-    /**
-     * Get the child of a list item.
-     * @param listIndex The index of the currently visible items
-     * @param index The index of the child.
-     */
-    public View getChildOfItem(int listIndex, int index) {
-        return ((ViewGroup) getListView().getChildAt(listIndex)).getChildAt(index);
-
-    }
-
-    @Override
-    protected void init(Params params) {
-        params.setItemsFocusable(true)
-                .setNumItems(2)
-                .setItemScreenSizeFactor(0.55);
-    }
-
-
-    @Override
-    protected View createView(int position, ViewGroup parent, int desiredHeight) {
-        return ListItemFactory.twoButtonsSeparatedByFiller(
-                position, parent.getContext(), desiredHeight);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListItemFocusablesFarApart.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListItemFocusablesFarApart.java
deleted file mode 100755
index 5b9b88a45debdba712374b71974173c8db56fc65..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListItemFocusablesFarApart.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.view.View;
-import android.view.ViewGroup;
-import com.mediatek.common.widget.tests.util.ListItemFactory;
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-/**
- * A list where each item is tall with buttons that are farther apart than the screen
- * size.  We don't want to jump over content off screen to the next button, we need to
- * pan across the intermediate part.
- */
-public class ListItemFocusablesFarApart extends ListScenario  {
-
-
-    @Override
-    protected void init(Params params) {
-        params.setItemsFocusable(true)
-                .setNumItems(2)
-                .setItemScreenSizeFactor(2);
-    }
-
-    @Override
-    protected View createView(int position, ViewGroup parent, int desiredHeight) {
-        return ListItemFactory.twoButtonsSeparatedByFiller(
-                position, parent.getContext(), desiredHeight);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListItemISVAndButton.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListItemISVAndButton.java
deleted file mode 100755
index bf1b5ba8b897542380f7af8454b88e98163a21d4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListItemISVAndButton.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import com.mediatek.common.widget.tests.util.InternalSelectionView;
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-/**
- * Each item is an internal selection view, a button, and some filler
- */
-public class ListItemISVAndButton extends ListScenario {
-
-
-    @Override
-    protected void init(Params params) {
-        params.setItemScreenSizeFactor(2.0)
-                .setNumItems(3)
-                .setItemsFocusable(true);
-    }
-
-    @Override
-    protected View createView(int position, ViewGroup parent, int desiredHeight) {
-        Context context = parent.getContext();
-
-        final LinearLayout ll = new LinearLayout(context);
-        ll.setOrientation(LinearLayout.VERTICAL);
-
-        final InternalSelectionView isv = new InternalSelectionView(context, 8, "ISV postion " + position);
-        isv.setLayoutParams(new LinearLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                desiredHeight - 240));
-        ll.addView(isv);
-
-        final LinearLayout.LayoutParams buttonLp =
-                new LinearLayout.LayoutParams(
-                        ViewGroup.LayoutParams.MATCH_PARENT,
-                        40);
-        final Button topButton = new Button(context);
-        topButton.setLayoutParams(
-                buttonLp);
-        topButton.setText("button " + position + ")");
-        ll.addView(topButton);
-
-        final TextView filler = new TextView(context);
-        filler.setLayoutParams(new LinearLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                200));
-        filler.setText("filler");
-        ll.addView(filler);
-
-
-        return ll;
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListItemRequestRectAboveThinFirstItemTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListItemRequestRectAboveThinFirstItemTest.java
deleted file mode 100755
index 2bbbe1f5ad073dd8abf876e4c99cf3ad7f86ee66..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListItemRequestRectAboveThinFirstItemTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.graphics.Rect;
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.View;
-import android.view.KeyEvent;
-import android.widget.ListView;
-
-public class ListItemRequestRectAboveThinFirstItemTest
-        extends ActivityInstrumentationTestCase<ListOfThinItems> {
-    private ListView mListView;
-
-    public ListItemRequestRectAboveThinFirstItemTest() {
-        super("com.mediatek.common.widget.tests", ListOfThinItems.class);
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        mListView = getActivity().getListView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-
-        assertTrue("first child needs to be within fading edge height",
-                mListView.getChildAt(0).getBottom() < mListView.getVerticalFadingEdgeLength());
-        assertTrue("should be at least two visible children",
-                mListView.getChildCount() >= 2);
-    }
-
-    // reproduce bug 998501: when first item fits within fading edge,
-    // having the second item call requestRectangleOnScreen with a rect above
-    // the bounds of the list, it was scrolling too far
-    @MediumTest
-    public void testSecondItemRequestRectAboveTop() throws Exception {
-
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        assertEquals("selected position", 1, mListView.getSelectedItemPosition());
-
-        final View second = mListView.getChildAt(1);
-        final Rect rect = new Rect();
-        second.getDrawingRect(rect);
-        rect.offset(0, -2 * second.getBottom());
-
-        getActivity().requestRectangleOnScreen(1, rect);
-        getInstrumentation().waitForIdleSync();
-
-        assertEquals("top of first item",
-                mListView.getListPaddingTop(), mListView.getChildAt(0).getTop());
-
-    }
-
-    // same thing, but at bottom
-    @LargeTest
-    public void testSecondToLastItemRequestRectBelowBottom() throws Exception {
-
-        final int secondToLastPos = mListView.getCount() - 2;
-
-        while (mListView.getSelectedItemPosition() < secondToLastPos) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-        assertEquals("selected position", secondToLastPos,
-                mListView.getSelectedItemPosition());
-
-        final View secondToLast = mListView.getSelectedView();
-        final Rect rect = new Rect();
-        secondToLast.getDrawingRect(rect);
-        rect.offset(0,
-                2 * (mListView.getBottom() - secondToLast.getTop()));
-
-        final int secondToLastIndex = mListView.getChildCount() - 2;
-        getActivity().requestRectangleOnScreen(secondToLastIndex, rect);
-        getInstrumentation().waitForIdleSync();
-
-        int listBottom = mListView.getHeight() - mListView.getPaddingBottom();
-        assertEquals("bottom of last item should be at bottom of list",
-                listBottom,
-                mListView.getChildAt(mListView.getChildCount() - 1).getBottom());
-    }
-
-
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListItemsExpandOnSelection.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListItemsExpandOnSelection.java
deleted file mode 100755
index e84d040e49fa2777413583335e5d61c8bc9746d9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListItemsExpandOnSelection.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AbsListView;
-import android.widget.TextView;
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-/**
- * A list where each item expands by 1.5 when selected.
- */
-public class ListItemsExpandOnSelection extends ListScenario {
-
-
-    @Override
-    protected void init(Params params) {
-        params.setNumItems(10)
-                .setItemScreenSizeFactor(1.0 / 5);
-    }
-
-
-    @Override
-    protected View createView(int position, ViewGroup parent, int desiredHeight) {
-        TextView result = new ExpandWhenSelectedView(parent.getContext(), desiredHeight);
-        result.setHeight(desiredHeight);
-        result.setFocusable(mItemsFocusable);
-        result.setText(getValueAtPosition(position));
-        final AbsListView.LayoutParams lp = new AbsListView.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT);
-        result.setLayoutParams(lp);
-        return result;
-    }
-
-
-    @Override
-    public View convertView(int position, View convertView, ViewGroup parent) {
-        ((ExpandWhenSelectedView) convertView).setText(getValueAtPosition(position));
-        return convertView;
-    }
-
-
-    static private class ExpandWhenSelectedView extends TextView {
-
-        private final int mDesiredHeight;
-
-        public ExpandWhenSelectedView(Context context, int desiredHeight) {
-            super(context);
-            mDesiredHeight = desiredHeight;
-        }
-
-        @Override
-        public void setSelected(boolean selected) {
-            super.setSelected(selected);
-            if (selected) {
-                setHeight((int) (mDesiredHeight * 1.5));
-            } else {
-                setHeight(mDesiredHeight);
-            }
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListLastItemPartiallyVisible.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListLastItemPartiallyVisible.java
deleted file mode 100755
index 0c6a5267c7b2b99797942647c68a1aac8a5527b6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListLastItemPartiallyVisible.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-/**
- * A list where the very last item is partially visible, but still requires scrolling
- * to bring it into view.
- */
-public class ListLastItemPartiallyVisible extends ListScenario {
-
-    protected void init(Params params) {
-        params.setNumItems(5)
-                .setItemScreenSizeFactor(0.22);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListManagedCursor.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListManagedCursor.java
deleted file mode 100755
index 66a806cfc99fcccf2f4bf5bbed7ec1641509a99d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListManagedCursor.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.app.ListActivity;
-import android.content.Intent;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.provider.Contacts.People;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListAdapter;
-import android.widget.SimpleCursorAdapter;
-import android.widget.AdapterView.OnItemClickListener;
-
-
-public class ListManagedCursor extends ListActivity implements OnItemClickListener {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // Get a cursor with all people
-        Cursor c = getContentResolver().query(Settings.System.CONTENT_URI, null, null, null, null);
-        startManagingCursor(c);
-
-        ListAdapter adapter = new SimpleCursorAdapter(this,
-                // Use a template that displays a text view
-                android.R.layout.simple_list_item_1,
-                // Give the cursor to the list adatper
-                c,
-                // Map the NAME column in the people database to...
-                new String[] {People.NAME} ,
-                // The "text1" view defined in the XML template
-                new int[] {android.R.id.text1});
-        setListAdapter(adapter);
-        getListView().setOnItemClickListener(this);
-
-
-        /// M: set small velocity scale to disable fling
-        getListView().setVelocityScale(0.0f);
-
-    }
-
-    public void onItemClick(AdapterView parent, View view, int position, long id) {
-        Intent dummyIntent = new Intent(this, ListSimple.class);
-        startActivity(dummyIntent);
-    }
-}
-
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListManagedCursorTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListManagedCursorTest.java
deleted file mode 100755
index 65c54ec04b355841ae49dfc9c075cb0650fb8211..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListManagedCursorTest.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.app.Instrumentation;
-import android.test.ActivityInstrumentationTestCase;
-import android.test.FlakyTest;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-import android.widget.ListView;
-import android.test.TouchUtils;
-
-/**
- * Tests restoring the scroll position in a list with a managed cursor.
- */
-public class ListManagedCursorTest extends ActivityInstrumentationTestCase<ListManagedCursor> {
-    private ListManagedCursor mActivity;
-    private ListView mListView;
-
-    public ListManagedCursorTest() {
-        super("com.mediatek.common.widget.tests", ListManagedCursor.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mListView = getActivity().getListView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mListView);
-
-        assertEquals(0, mListView.getFirstVisiblePosition());
-    }
-
-    /**
-     * Scroll the list using arrows, launch new activity, hit back, make sure we're still scrolled.
-     */
-    @LargeTest
-    public void testKeyScrolling() {
-        Instrumentation inst = getInstrumentation();
-
-        int firstVisiblePosition = arrowScroll(inst);
-
-        inst.sendCharacterSync(KeyEvent.KEYCODE_BACK);
-        inst.waitForIdleSync();
-
-        assertTrue("List changed to touch mode", !mListView.isInTouchMode());
-        assertTrue("List did not preserve scroll position",
-                firstVisiblePosition == mListView.getFirstVisiblePosition());
-    }
-
-    /**
-     * Scroll the list using touch, launch new activity, hit back, make sure we're still scrolled.
-     */
-    @LargeTest
-    public void testTouchScrolling() {
-        Instrumentation inst = getInstrumentation();
-
-       int firstVisiblePosition = touchScroll(inst);
-
-        inst.sendCharacterSync(KeyEvent.KEYCODE_BACK);
-        inst.waitForIdleSync();
-
-        assertTrue("List not in touch mode", mListView.isInTouchMode());
-        assertTrue("List did not preserve scroll position",
-                firstVisiblePosition == mListView.getFirstVisiblePosition());
-    }
-
-    /**
-     * Scroll the list using arrows, launch new activity, change to touch mode, hit back, make sure
-     * we're still scrolled.
-     */
-    @LargeTest
-    public void testKeyScrollingToTouchMode() {
-        Instrumentation inst = getInstrumentation();
-
-        int firstVisiblePosition = arrowScroll(inst);
-
-        TouchUtils.dragQuarterScreenUp(this);
-        inst.sendCharacterSync(KeyEvent.KEYCODE_BACK);
-        inst.waitForIdleSync();
-
-        assertTrue("List did not change to touch mode", mListView.isInTouchMode());
-        assertTrue("List did not preserve scroll position",
-                firstVisiblePosition == mListView.getFirstVisiblePosition());
-    }
-
-
-    /**
-     * Scroll the list using touch, launch new activity, change to trackball mode, hit back, make
-     * sure we're still scrolled.
-     */
-    @FlakyTest(tolerance = 3)
-    @LargeTest
-    public void testTouchScrollingToTrackballMode() {
-        Instrumentation inst = getInstrumentation();
-
-        int firstVisiblePosition = touchScroll(inst);
-
-        inst.sendCharacterSync(KeyEvent.KEYCODE_DPAD_DOWN);
-        inst.waitForIdleSync();
-        inst.sendCharacterSync(KeyEvent.KEYCODE_DPAD_DOWN);
-        inst.waitForIdleSync();
-        inst.sendCharacterSync(KeyEvent.KEYCODE_BACK);
-        inst.waitForIdleSync();
-        assertTrue("List not in trackball mode", !mListView.isInTouchMode());
-        assertTrue("List did not preserve scroll position", firstVisiblePosition == mListView
-                .getFirstVisiblePosition());
-    }
-
-    public int arrowScroll(Instrumentation inst) {
-        int count = mListView.getChildCount();
-
-        for (int i = 0; i < count * 2; i++) {
-            inst.sendCharacterSync(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-        inst.waitForIdleSync();
-
-        int firstVisiblePosition = mListView.getFirstVisiblePosition();
-        assertTrue("Arrow scroll did not happen", firstVisiblePosition > 0);
-        assertTrue("List still in touch mode", !mListView.isInTouchMode());
-
-        inst.sendCharacterSync(KeyEvent.KEYCODE_DPAD_CENTER);
-        inst.waitForIdleSync();
-
-        try {
-            Thread.sleep(3000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        return firstVisiblePosition;
-    }
-
-    public int touchScroll(Instrumentation inst) {
-        TouchUtils.dragQuarterScreenUp(this);
-        inst.waitForIdleSync();
-        TouchUtils.dragQuarterScreenUp(this);
-        inst.waitForIdleSync();
-        TouchUtils.dragQuarterScreenUp(this);
-        inst.waitForIdleSync();
-        TouchUtils.dragQuarterScreenUp(this);
-        inst.waitForIdleSync();
-
-        int firstVisiblePosition = mListView.getFirstVisiblePosition();
-        assertTrue("Touch scroll did not happen", firstVisiblePosition > 0);
-        assertTrue("List not in touch mode", mListView.isInTouchMode());
-
-        TouchUtils.clickView(this, mListView.getChildAt(mListView.getChildCount() - 1));
-        inst.waitForIdleSync();
-
-        try {
-            Thread.sleep(3000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        return firstVisiblePosition;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListOfItemsShorterThanScreen.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListOfItemsShorterThanScreen.java
deleted file mode 100755
index 318a930371ad9aa77afca49db8ac536ef58643cf..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListOfItemsShorterThanScreen.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-public class ListOfItemsShorterThanScreen extends ListScenario {
-
-    protected void init(Params params) {
-        params.setNumItems(5)
-            .setItemScreenSizeFactor(1.1 / 4)
-            .setItemsFocusable(false);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListOfItemsTallerThanScreen.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListOfItemsTallerThanScreen.java
deleted file mode 100755
index 22f602cdde614b9cfac5bf20942bd5fa77e7212e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListOfItemsTallerThanScreen.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-public class ListOfItemsTallerThanScreen extends ListScenario {
-
-
-    protected void init(Params params) {
-        params.setNumItems(3)
-            .setItemScreenSizeFactor(4.0 / 3)
-            .setItemsFocusable(false);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListOfShortShortTallShortShort.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListOfShortShortTallShortShort.java
deleted file mode 100755
index 6424a9ae76a0fcf675c4bde259489d55b7526ac6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListOfShortShortTallShortShort.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-/**
- * Exposes fading in and out multiple items.
- */
-public class ListOfShortShortTallShortShort extends ListScenario {
-
-
-    protected void init(Params params) {
-        params.setNumItems(5)
-                .setItemScreenSizeFactor(0.1)
-                .setFadingEdgeScreenSizeFactor(0.22)
-                .setPositionScreenSizeFactorOverride(2, 1.1);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListOfShortTallShort.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListOfShortTallShort.java
deleted file mode 100755
index 58c958c76bb7024f464199af44c55931e20de59e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListOfShortTallShort.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-/**
- * Two short items separated by one that is taller than the screen.
- */
-public class ListOfShortTallShort extends ListScenario {
-
-
-    protected void init(Params params) {
-        params.setItemScreenSizeFactor(1.0 / 8)
-                .setNumItems(3)
-                .setPositionScreenSizeFactorOverride(1, 1.2);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListOfThinItems.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListOfThinItems.java
deleted file mode 100755
index ed9db2e8d30a0d08ef11095f70d476086eff03f3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListOfThinItems.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-public class ListOfThinItems extends ListScenario {
-
-    protected void init(Params params) {
-
-        final int numItemsOnScreen = getScreenHeight() / 18;
-
-        params.setNumItems(numItemsOnScreen + 5)
-            .setItemScreenSizeFactor(18.0 / getScreenHeight())
-            .setItemsFocusable(false);
-    }
-
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListOfTouchables.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListOfTouchables.java
deleted file mode 100755
index 3d5e9b29eae8dd9f823a899b52a18877cd7cdba8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListOfTouchables.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-/**
- * Each list item has two focusables that are close enough together that
- * it shouldn't require panning to move focus.
- */
-public class ListOfTouchables extends ListScenario {
-
-
-    @Override
-    protected void init(Params params) {
-        params.setItemsFocusable(true)
-                .setItemScreenSizeFactor(0.2)
-                .setNumItems(100);
-    }
-
-
-    @Override
-    protected View createView(int position, ViewGroup parent, int desiredHeight) {
-        Button b = new Button(this);
-        b.setText("Position " + position);
-        b.setId(position);
-        return b;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListRecyclerProfiling.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListRecyclerProfiling.java
deleted file mode 100755
index 20cb3b7788547830e75114316d69fd1df22a6f1f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListRecyclerProfiling.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.ImageButton;
-import android.view.ViewDebug;
-import android.view.View;
-
-import com.mediatek.common.widget.tests.R;
-
-public class ListRecyclerProfiling extends Activity {
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        setContentView(R.layout.list_recycler_profiling);
-
-        String values[] = new String[1000];
-        for (int i = 0; i < 1000; i++) {
-            values[i] = ((Integer) i).toString();
-        }
-
-        ListView listView = (ListView) findViewById(R.id.list);
-
-        ViewDebug.startRecyclerTracing("SimpleList", listView);
-
-        listView.setAdapter(new ArrayAdapter<String>(this,
-                android.R.layout.simple_list_item_1, values));
-
-        ImageButton stopProfiling = (ImageButton) findViewById(R.id.pause);
-        stopProfiling.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                ViewDebug.stopRecyclerTracing();
-            }
-        });
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListRetainsFocusAcrossLayoutsTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListRetainsFocusAcrossLayoutsTest.java
deleted file mode 100755
index 23cd7ef1d208c5db883296bcdd7ae9336952db4e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListRetainsFocusAcrossLayoutsTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-
-public class ListRetainsFocusAcrossLayoutsTest extends ActivityInstrumentationTestCase<ListItemFocusablesClose> {
-
-    public ListRetainsFocusAcrossLayoutsTest() {
-        super("com.mediatek.common.widget.tests", ListItemFocusablesClose.class);
-    }
-
-    private void requestLayoutOnList() {
-        getActivity().runOnUiThread(new Runnable() {
-            public void run() {
-                getActivity().getListView().requestLayout();
-            }
-        });
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertTrue("top button at position 0 should be focused",
-                getActivity().getChildOfItem(0, 0).isFocused());
-    }
-
-    @MediumTest
-    public void testBottomButtonRetainsFocusAfterLayout() throws Exception {
-
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-
-        assertTrue("bottom botton at position 0 should be focused",
-                getActivity().getChildOfItem(0, 2).isFocused());
-
-        requestLayoutOnList();
-        getInstrumentation().waitForIdleSync();
-
-        assertTrue("bottom botton at position 0 should be focused after layout",
-                getActivity().getChildOfItem(0, 2).isFocused());
-    }
-
-    @MediumTest
-    public void testTopButtonOfSecondPositionRetainsFocusAfterLayout() {
-        sendRepeatedKeys(2, KeyEvent.KEYCODE_DPAD_DOWN);
-
-        assertTrue("top botton at position 1 should be focused",
-                getActivity().getChildOfItem(1, 0).isFocused());
-
-        requestLayoutOnList();
-        getInstrumentation().waitForIdleSync();
-
-        assertTrue("top botton at position 1 should be focused after layout",
-                getActivity().getChildOfItem(1, 0).isFocused());
-
-    }
-
-    @MediumTest
-    public void testBottomButtonOfSecondPositionRetainsFocusAfterLayout() {
-        sendRepeatedKeys(3, KeyEvent.KEYCODE_DPAD_DOWN);
-
-        assertTrue("bottom botton at position 1 should be focused",
-                getActivity().getChildOfItem(1, 2).isFocused());
-
-        requestLayoutOnList();
-        getInstrumentation().waitForIdleSync();
-
-        assertTrue("bottom botton at position 1 should be focused after layout",
-                getActivity().getChildOfItem(1, 2).isFocused());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListScrollListener.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListScrollListener.java
deleted file mode 100755
index 04e6c040c78ddab0383915cd89b56ee9a92dc1b6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListScrollListener.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.app.ListActivity;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.View;
-import android.widget.AbsListView;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.TextView;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * Exercises change notification in a list
- */
-public class ListScrollListener extends ListActivity implements AbsListView.OnScrollListener {
-    Handler mHandler = new Handler();
-    TextView mText;
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        setContentView(R.layout.list_scroll_listener);
-
-        String values[] = new String[1000];
-        int i = 0;
-        for (i = 0; i < 1000; i++) {
-            values[i] = ((Integer) i).toString();
-        }
-
-        mText = (TextView) findViewById(R.id.text);
-        setListAdapter(new ArrayAdapter<String>(this,
-                android.R.layout.simple_list_item_1, values));
-
-
-        getListView().setOnScrollListener(this);
-    }
-
-    public void onItemSelected(AdapterView parent, View v, int position, long id) {
-        mText.setText("Position " + position);
-    }
-
-    public void onNothingSelected(AdapterView parent) {
-        mText.setText("Nothing");
-    }
-
-    public void onScroll(AbsListView view, int firstCell, int cellCount, int itemCount) {
-        int last = firstCell + cellCount - 1;
-        mText.setText("Showing " + firstCell + "-" + last + "/" + itemCount);
-    }
-
-    public void onScrollStateChanged(AbsListView view, int scrollState) {
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListScrollListenerTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListScrollListenerTest.java
deleted file mode 100755
index 75ad330fa82c0a2aeaf82bd754bf19474e6d263b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListScrollListenerTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.app.Instrumentation;
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-import android.widget.AbsListView;
-import android.widget.ListView;
-
-import android.test.TouchUtils;
-
-public class ListScrollListenerTest extends ActivityInstrumentationTestCase<ListScrollListener> implements
-        AbsListView.OnScrollListener {
-    private ListScrollListener mActivity;
-    private ListView mListView;
-    private int mFirstVisibleItem = -1;
-    private int mVisibleItemCount = -1;
-    private int mTotalItemCount = -1;
-
-    public ListScrollListenerTest() {
-        super("com.mediatek.common.widget.tests", ListScrollListener.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mListView = getActivity().getListView();
-        mListView.setOnScrollListener(this);
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mListView);
-
-        assertEquals(0, mFirstVisibleItem);
-    }
-
-    @LargeTest
-    public void testKeyScrolling() {
-        Instrumentation inst = getInstrumentation();
-
-        int firstVisibleItem = mFirstVisibleItem;
-        for (int i = 0; i < mVisibleItemCount * 2; i++) {
-            inst.sendCharacterSync(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-        inst.waitForIdleSync();
-        assertTrue("Arrow scroll did not happen", mFirstVisibleItem > firstVisibleItem);
-
-        firstVisibleItem = mFirstVisibleItem;
-        inst.sendCharacterSync(KeyEvent.KEYCODE_SPACE);
-        inst.waitForIdleSync();
-        assertTrue("Page scroll did not happen", mFirstVisibleItem > firstVisibleItem);
-
-        firstVisibleItem = mFirstVisibleItem;
-        KeyEvent down = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN,
-                KeyEvent.KEYCODE_DPAD_DOWN, 0, KeyEvent.META_ALT_ON);
-        KeyEvent up = new KeyEvent(0, 0, KeyEvent.ACTION_UP,
-                KeyEvent.KEYCODE_DPAD_DOWN, 0, KeyEvent.META_ALT_ON);
-        inst.sendKeySync(down);
-        inst.sendKeySync(up);
-        inst.waitForIdleSync();
-
-        assertTrue("Full scroll did not happen", mFirstVisibleItem > firstVisibleItem);
-        assertEquals("Full scroll did not happen", mTotalItemCount,
-                mFirstVisibleItem + mVisibleItemCount);
-    }
-
-    @LargeTest
-    public void testTouchScrolling() {
-        int firstVisibleItem = mFirstVisibleItem;
-        TouchUtils.dragQuarterScreenUp(this);
-        TouchUtils.dragQuarterScreenUp(this);
-        assertTrue("Touch scroll did not happen", mFirstVisibleItem > firstVisibleItem);
-    }
-
-
-    public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
-        mFirstVisibleItem = firstVisibleItem;
-        mVisibleItemCount = visibleItemCount;
-        mTotalItemCount = totalItemCount;
-    }
-
-    public void onScrollStateChanged(AbsListView view, int scrollState) {
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListSetSelection.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListSetSelection.java
deleted file mode 100755
index 30b310136cf0ad59add5384096312d5eadd5e880..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListSetSelection.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-import android.view.KeyEvent;
-import android.view.View;
-import android.os.Bundle;
-import android.widget.LinearLayout;
-import android.widget.Button;
-
-/**
- * List of 1,000 items used to test calls to setSelection() in touch mode.
- * Pressing the S key will call setSelection(0) on the list.
- */
-public class ListSetSelection extends ListScenario {
-    private Button mButton;
-
-    @Override
-    protected void init(Params params) {
-        params.setStackFromBottom(false)
-                .setStartingSelectionPosition(-1)
-                .setNumItems(1000)
-                .setItemScreenSizeFactor(0.22);
-    }
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        mButton = new Button(this);
-        mButton.setText("setSelection(0)");
-        mButton.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                getListView().setSelection(0);
-            }
-        });
-
-        getListViewContainer().addView(mButton, new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.MATCH_PARENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT
-        ));
-    }
-
-    public Button getButton() {
-        return mButton;
-    }
-
-    @Override
-    public boolean dispatchKeyEvent(KeyEvent event) {
-        if (event.getKeyCode() == KeyEvent.KEYCODE_S) {
-            getListView().setSelection(0);
-            return true;
-        }
-
-        return super.dispatchKeyEvent(event);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListSetSelectionTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListSetSelectionTest.java
deleted file mode 100755
index 798d28ae18c3ebe4b951e30347492b35a6481b05..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListSetSelectionTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.ListView;
-
-/**
- * Basic tests of setting & clearing the selection
- */
-public class ListSetSelectionTest extends ActivityInstrumentationTestCase2<ListSimple> {
-    private ListSimple mActivity;
-    private ListView mListView;
-
-    public ListSetSelectionTest() {
-        super("com.mediatek.common.widget.tests", ListSimple.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mListView = getActivity().getListView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mListView);
-    }
-
-    /** Confirm that we can set the selection to each specific position */
-    @MediumTest
-    @UiThreadTest
-    public void testSetSelection() {
-        // Set the selection to each position
-        int childCount = mListView.getChildCount();
-        for (int i = 0; i < childCount; i++) {
-            mListView.setSelection(i);
-            assertEquals("Set selection", i, mListView.getSelectedItemPosition());
-        }
-    }
-
-    /** Confirm that you cannot unset the selection using the same API */
-    @MediumTest
-    @UiThreadTest
-    public void testClearSelection() {
-        // Set the selection to first position
-        mListView.setSelection(0);
-        assertEquals("Set selection", 0, mListView.getSelectedItemPosition());
-
-        // Clear the selection
-        mListView.setSelection(ListView.INVALID_POSITION);
-        assertEquals("Set selection", 0, mListView.getSelectedItemPosition());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListSimple.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListSimple.java
deleted file mode 100755
index 3ee735bb64619f1e49be922942be7a014fc85564..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListSimple.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-import android.view.View;
-import android.view.ViewGroup;
-import android.os.Bundle;
-import android.widget.TextView;
-
-public class ListSimple extends ListScenario {
-    @Override
-    protected void init(Params params) {
-        params.setStackFromBottom(false)
-                .setStartingSelectionPosition(-1)
-                .setNumItems(1000)
-                .setItemScreenSizeFactor(0.14);
-    }
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        getListView().setVerticalScrollBarEnabled(true);
-        getListView().setFadingEdgeLength(12);
-        getListView().setVerticalFadingEdgeEnabled(true);
-    }
-
-    @Override
-    protected View createView(int position, ViewGroup parent, int desiredHeight) {
-        View view = super.createView(position, parent, desiredHeight);
-        view.setBackgroundColor(0xFF191919);
-        ((TextView) view).setTextSize(16.0f);
-        return view;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListTakeFocusFromSide.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListTakeFocusFromSide.java
deleted file mode 100755
index a633b654d825380a08fc9f4b18cea55ef1623751..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListTakeFocusFromSide.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.app.ListActivity;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.LayoutInflater;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * Exercises moving focus into the list from the side
- */
-public class ListTakeFocusFromSide extends ListActivity {
-
-
-    private class ThrashListAdapter extends BaseAdapter {
-        private LayoutInflater mInflater;
-
-        private String[] mTitles = new String[100];
-
-        public ThrashListAdapter(Context context) {
-            mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            mTitles = new String[100];
-
-            int i;
-            for (i = 0; i < 100; i++) {
-                mTitles[i] = "[" + i + "]";
-            }
-        }
-
-        public int getCount() {
-            return mTitles.length;
-        }
-
-        public Object getItem(int position) {
-            return position;
-        }
-
-        public long getItemId(int position) {
-            return position;
-        }
-
-        public View getView(int position, View convertView, ViewGroup parent) {
-            TextView view;
-
-            if (convertView == null) {
-                view = (TextView) mInflater.inflate(android.R.layout.simple_list_item_1, null);
-            } else {
-                view = (TextView) convertView;
-            }
-            view.setText(mTitles[position]);
-            return view;
-        }
-
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        setContentView(R.layout.list_take_focus_from_side);
-        setListAdapter(new ThrashListAdapter(this));
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListThrasher.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListThrasher.java
deleted file mode 100755
index 5b0466e7459edfa1bfa1659541fedbbf7b7bc314..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListThrasher.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.app.ListActivity;
-import android.content.Context;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.LayoutInflater;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-import java.util.Random;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * Exercises change notification in a list
- */
-public class ListThrasher extends ListActivity implements AdapterView.OnItemSelectedListener {
-    Handler mHandler = new Handler();
-    ThrashListAdapter mAdapter;
-    Random mRandomizer = new Random();
-    TextView mText;
-
-    Runnable mThrash = new Runnable() {
-        public void run() {
-            mAdapter.bumpVersion();
-            mHandler.postDelayed(mThrash, 500);
-        }
-    };
-
-    private class ThrashListAdapter extends BaseAdapter {
-        private LayoutInflater mInflater;
-
-        /**
-         * Our data, part 1.
-         */
-        private String[] mTitles = new String[100];
-
-        /**
-         * Our data, part 2.
-         */
-        private int[] mVersion = new int[100];
-
-        public ThrashListAdapter(Context context) {
-            mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            mTitles = new String[100];
-            mVersion = new int[100];
-
-            int i;
-            for (i = 0; i < 100; i++) {
-                mTitles[i] = "[" + i + "]";
-                mVersion[i] = 0;
-            }
-        }
-
-        public int getCount() {
-            return mTitles.length;
-        }
-
-        public Object getItem(int position) {
-            return position;
-        }
-
-        public long getItemId(int position) {
-            return position;
-        }
-
-        public View getView(int position, View convertView, ViewGroup parent) {
-            TextView view;
-
-            if (convertView == null) {
-                view = (TextView) mInflater.inflate(android.R.layout.simple_list_item_1, null);
-            } else {
-                view = (TextView) convertView;
-            }
-            view.setText(mTitles[position] + " " + mVersion[position]);
-            return view;
-        }
-
-
-        public void bumpVersion() {
-            int position = mRandomizer.nextInt(getCount());
-            mVersion[position]++;
-            notifyDataSetChanged();
-        }
-
-
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        setContentView(R.layout.list_thrasher);
-
-        mText = (TextView) findViewById(R.id.text);
-        mAdapter = new ThrashListAdapter(this);
-        setListAdapter(mAdapter);
-
-        mHandler.postDelayed(mThrash, 5000);
-
-        getListView().setOnItemSelectedListener(this);
-    }
-
-    public void onItemSelected(AdapterView parent, View v, int position, long id) {
-        mText.setText("Position " + position);
-    }
-
-    public void onNothingSelected(AdapterView parent) {
-        mText.setText("Nothing");
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListTopGravity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListTopGravity.java
deleted file mode 100755
index 10edbc583b7a828036d2b83ca04306ad2cf77b02..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListTopGravity.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-/**
- * Basic top gravity scenario, nothing fancy. Items do not
- * fill the screen
- */
-public class ListTopGravity extends ListScenario {
-
-    @Override
-    protected void init(Params params) {
-        params.setStackFromBottom(false)
-                .setStartingSelectionPosition(-1)
-                .setMustFillScreen(false)
-                .setNumItems(2)
-                .setItemScreenSizeFactor(0.22);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListTopGravityMany.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListTopGravityMany.java
deleted file mode 100755
index f4b87aa7f31378d581cdb364e441e5e3a180da67..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListTopGravityMany.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-/**
- * Basic top gravity scenario, nothing fancy. There are
- * more items than fit on the screen
- */
-public class ListTopGravityMany extends ListScenario {
-
-    @Override
-    protected void init(Params params) {
-        params.setStackFromBottom(false)
-                .setStartingSelectionPosition(-1)
-                .setNumItems(10)
-                .setItemScreenSizeFactor(0.22);
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListUnspecifiedMeasure.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListUnspecifiedMeasure.java
deleted file mode 100755
index 9d7afa74eb7c351301136f41e6fe9fdfb2d21bb4..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListUnspecifiedMeasure.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.app.Activity;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.ListView;
-
-import com.mediatek.common.widget.tests.R;
-
-public class ListUnspecifiedMeasure<T extends Activity> extends ActivityInstrumentationTestCase<T> {
-    private T mActivity;
-    private ListView mListView;
-
-    protected ListUnspecifiedMeasure(Class<T> klass) {
-        super("com.mediatek.common.widget.tests", klass);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mListView = (ListView) mActivity.findViewById(R.id.list);
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mListView);
-    }
-
-    @MediumTest
-    public void testWasMeasured() {
-        assertTrue(mListView.getMeasuredWidth() > 0);
-        assertTrue(mListView.getWidth() > 0);
-        assertTrue(mListView.getMeasuredHeight() > 0);
-        assertTrue(mListView.getHeight() > 0);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListViewHeight.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListViewHeight.java
deleted file mode 100755
index 785a3bb2a6800d8ce9d7de76e6e6fc6346ccac07..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListViewHeight.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-
-import com.mediatek.common.widget.tests.R;
-
-public class ListViewHeight extends Activity {
-
-    private View mButton1;
-    private View mButton2;
-    private View mButton3;
-
-    private View mOuterLayout;
-    private ListView mInnerList;
-
-    ArrayAdapter<String> mAdapter;
-    private String[] mStrings = {
-            "Abbaye de Belloc", "Abbaye du Mont des Cats", "Abertam", "Abondance", "Ackawi" };
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.linear_layout_listview_height);
-
-        mButton1 = findViewById(R.id.button1);
-        mButton2 = findViewById(R.id.button2);
-        mButton3 = findViewById(R.id.button3);
-
-        mOuterLayout = findViewById(R.id.layout);
-        mInnerList = (ListView) findViewById(R.id.inner_list);
-
-        mAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_dropdown_item_1line,
-                                            mStrings);
-
-        // Clicking this button will show the list view and set it to a fixed height
-        // If you then hide the views, there is no problem.
-        mButton1.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                // set listview to fixed height
-                ViewGroup.MarginLayoutParams lp;
-                lp = (ViewGroup.MarginLayoutParams) mInnerList.getLayoutParams();
-                lp.height = 200;
-                mInnerList.setLayoutParams(lp);
-                // enable list adapter
-                mInnerList.setAdapter(mAdapter);
-                // and show it
-                mOuterLayout.setVisibility(View.VISIBLE);
-            }
-        });
-
-        // Clicking this button will show the list view and set it match_parent height
-        // If you then hide the views, there is an NPE when calculating the ListView height.
-        mButton2.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                // set listview to fill screen
-                ViewGroup.MarginLayoutParams lp;
-                lp = (ViewGroup.MarginLayoutParams) mInnerList.getLayoutParams();
-                lp.height = lp.MATCH_PARENT;
-                mInnerList.setLayoutParams(lp);
-                // enable list adapter
-                mInnerList.setAdapter(mAdapter);
-                // and show it
-                mOuterLayout.setVisibility(View.VISIBLE);
-            }
-        });
-
-        // Clicking this button will remove the list adapter and hide the outer enclosing view.
-        // We have to climb all the way to the top because the bug (not checking visibility)
-        // only occurs at the very outer loop of ViewAncestor.performTraversals and in the case of
-        // an Activity, this means you have to crawl all the way out to the root view.
-        // In the search manager, it's sufficient to simply show/hide the outer search manager
-        // view to trigger the same bug.
-        mButton3.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                mInnerList.setAdapter(null);
-                // hide listview's owner
-                // as it turns out, the owner doesn't take us high enough
-                // because our activity includes a title bar, thus another layer
-                View parent = (View) mOuterLayout.getParent();      // FrameLayout (app container)
-                View grandpa = (View) parent.getParent();           // LinearLayout (title+app)
-                View great = (View) grandpa.getParent();            // PhoneWindow.DecorView
-                great.setVisibility(View.GONE);
-            }
-        });
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListViewHeightTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListViewHeightTest.java
deleted file mode 100755
index 40d8091c67954ac577506930c196aee66396e5cd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListViewHeightTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.app.Instrumentation;
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.Button;
-import android.widget.ListView;
-
-
-import com.mediatek.common.widget.tests.R;
-
-public class ListViewHeightTest extends ActivityInstrumentationTestCase<ListViewHeight> {
-    private ListViewHeight mActivity;
-
-
-    public ListViewHeightTest() {
-        super("com.mediatek.common.widget.tests", ListViewHeight.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-    }
-
-    @MediumTest
-    public void testButtons() {
-        Instrumentation inst = getInstrumentation();
-        final Button button1 = (Button) mActivity.findViewById(R.id.button1);
-        final Button button2 = (Button) mActivity.findViewById(R.id.button2);
-        final Button button3 = (Button) mActivity.findViewById(R.id.button3);
-
-
-        ListView list = (ListView) mActivity.findViewById(R.id.inner_list);
-        assertEquals("Unexpected items in adapter", 0, list.getCount());
-        assertEquals("Unexpected children in list view", 0, list.getChildCount());
-
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                button1.performClick();
-            }
-        });
-        inst.waitForIdleSync();
-        assertTrue("List not be visible after clicking button1", list.isShown());
-        assertTrue("List incorrect height", list.getHeight() == 200);
-
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                button2.performClick();
-            }
-        });
-        inst.waitForIdleSync();
-        assertTrue("List not be visible after clicking button2", list.isShown());
-
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                button3.performClick();
-            }
-        });
-        inst.waitForIdleSync();
-        assertFalse("List should not be visible clicking button3", list.isShown());
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithDisappearingItemBug.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithDisappearingItemBug.java
deleted file mode 100755
index 7ae47e7d191a6c337771c19c8291fa241ca9f522..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithDisappearingItemBug.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.app.ListActivity;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.provider.Contacts.People;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
-import android.view.animation.AnimationSet;
-import android.view.animation.LayoutAnimationController;
-import android.view.animation.TranslateAnimation;
-import android.widget.ListAdapter;
-import android.widget.ListView;
-import android.widget.SimpleCursorAdapter;
-import android.widget.Toast;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * See 1080989. You need some contacts for this adapter.
- */
-public class ListWithDisappearingItemBug extends ListActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Toast.makeText(this, "Make sure you rotate screen to see bug", Toast.LENGTH_LONG).show();
-
-        // Get a cursor with all people
-        Cursor c = getContentResolver().query(People.CONTENT_URI, null, null, null, null);
-        startManagingCursor(c);
-
-        ListAdapter adapter = new SimpleCursorAdapter(this,
-                // Use a template that displays a text view
-                R.layout.list_with_disappearing_item_bug_item,
-                // Give the cursor to the list adatper
-                c,
-                // Map the NAME column in the people database to...
-                new String[] {People.NAME} ,
-                // The "text1" view defined in the XML template
-                new int[] {R.id.text1});
-        setListAdapter(adapter);
-
-        AnimationSet set = new AnimationSet(true);
-
-        Animation animation = new AlphaAnimation(0.0f, 1.0f);
-        animation.setDuration(50);
-        set.addAnimation(animation);
-
-        animation = new TranslateAnimation(
-            Animation.RELATIVE_TO_SELF, 0.0f, Animation.RELATIVE_TO_SELF, 0.0f,
-            Animation.RELATIVE_TO_SELF, -1.0f, Animation.RELATIVE_TO_SELF, 0.0f
-        );
-        animation.setDuration(100);
-        set.addAnimation(animation);
-
-        LayoutAnimationController controller =
-                new LayoutAnimationController(set, 0.5f);
-        ListView listView = getListView();
-        listView.setLayoutAnimation(controller);
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithEditTextHeader.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithEditTextHeader.java
deleted file mode 100755
index cb85738fe1310c2597710b94bb63e16501175367..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithEditTextHeader.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-/**
- * A list view with a single edit text in a header.
- */
-public class ListWithEditTextHeader extends ListScenario {
-
-    @Override
-    protected void init(Params params) {
-        params.setHeaderViewCount(1)
-                .setHeaderFocusable(true)
-                .setItemsFocusable(true)
-                .setNumItems(6)
-                .setItemScreenSizeFactor(0.2);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithEmptyView.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithEmptyView.java
deleted file mode 100755
index e456a05749d5e803c4954ddf28d74cfad74eb785..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithEmptyView.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.app.ListActivity;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.ArrayAdapter;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * Tests using an empty view with a list */
-public class ListWithEmptyView extends ListActivity {
-
-    private class CarefulAdapter<T> extends ArrayAdapter<T> {
-
-        public CarefulAdapter(Context context, int textViewResourceId) {
-            super(context, textViewResourceId);
-            // TODO Auto-generated constructor stub
-        }
-
-        @Override
-        public long getItemId(int position) {
-            if (position <  0 || position >= this.getCount()) {
-                throw new ArrayIndexOutOfBoundsException();
-            }
-            return super.getItemId(position);
-        }
-
-
-    }
-
-    public static final int MENU_ADD = Menu.FIRST + 1;
-    public static final int MENU_REMOVE = Menu.FIRST + 2;
-
-    private CarefulAdapter<String> mAdapter;
-
-    private int mNextItem = 0;
-
-    private View mEmptyView;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mAdapter = new CarefulAdapter<String>(this,
-                android.R.layout.simple_list_item_1);
-        setContentView(R.layout.list_with_empty_view);
-        setListAdapter(mAdapter);
-
-        mEmptyView = findViewById(R.id.empty);
-        getListView().setEmptyView(mEmptyView);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
-        menu.add(0, MENU_ADD, 0, R.string.menu_add)
-                .setIcon(android.R.drawable.ic_menu_add);
-        menu.add(0, MENU_REMOVE, 0, R.string.menu_remove)
-                .setIcon(android.R.drawable.ic_menu_delete);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case MENU_ADD:
-                String str = "Item + " + mNextItem++;
-                mAdapter.add(str);
-                return true;
-            case MENU_REMOVE:
-                if (mAdapter.getCount() > 0) {
-                    mAdapter.remove(mAdapter.getItem(0));
-                }
-                return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    public View getEmptyView() {
-        return mEmptyView;
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithFastScroller.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithFastScroller.java
deleted file mode 100755
index 9fa1cc10e9c0864c2a06773ed179dfeb3856df47..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithFastScroller.java
+++ /dev/null
@@ -1,438 +0,0 @@
-package com.mediatek.common.widget.tests.listview;
-
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.SectionIndexer;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-@TargetApi(11)
-public class ListWithFastScroller extends Activity {
-
-    private MyContentAdapter mAdapter;
-    private ListView mListView;
-
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // adapter
-        mAdapter = new MyContentAdapter(this, getData());
-
-        // listview
-        mListView = new ListView(this);
-        mListView.setFastScrollEnabled(true);
-        mListView.setFastScrollAlwaysVisible(true);
-        mListView.setVerticalScrollBarEnabled(false);
-
-        mListView.setAdapter(mAdapter);
-
-        setContentView(mListView);
-    }
-
-    public ListView getListView() {
-        return mListView;
-    }
-
-    private ArrayList<ListItem> getData() {
-
-        ArrayList<ListItem> myList = new ArrayList<ListItem>();
-
-        String c = " ";
-        for (int i = 0; i < mStrings.length; i++) {
-            if (!match(String.valueOf(mStrings[i].charAt(0)), c)) {
-                c = String.valueOf(mStrings[i].charAt(0));
-                ListItem item = new ListItem();
-                item.category = ListItem.CATEGORY_HEADER;
-                item.title = c;
-                myList.add(item);
-            }
-
-            ListItem item = new ListItem();
-            item.category = ListItem.CATEGORY_NORMAL;
-            item.title = mStrings[i];
-
-            myList.add(item);
-        }
-
-        return myList;
-    }
-
-    private boolean match(String value, String keyword) {
-        if (value == null || keyword == null)
-            return false;
-        if (keyword.length() > value.length())
-            return false;
-
-        int i = 0, j = 0;
-        do {
-            {
-                if (keyword.charAt(j) == value.charAt(i)) {
-                    i++;
-                    j++;
-                } else if (j > 0)
-                    break;
-                else
-                    i++;
-            }
-        } while (i < value.length() && j < keyword.length());
-
-        return (j == keyword.length()) ? true : false;
-    }
-
-
-    public class MyContentAdapter extends ArrayAdapter<ListItem> implements
-            SectionIndexer {
-
-        private String mSections = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-        // private Context mContext;
-        private LayoutInflater mInflater;
-        private int[] mPositions;
-        private int mCount;
-
-        private class ViewHolder {
-
-            TextView title;
-        }
-
-        public MyContentAdapter(Context context, List<ListItem> objects) {
-            super(context, 0, objects);
-
-            mInflater = (LayoutInflater) context
-                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
-            mPositions = new int[mSections.length()];
-            int index = 0;
-            String c = "A";
-            for (int i = 0; i < objects.size(); i++) {
-                ListItem item = objects.get(i);
-                if (!match(String.valueOf(item.title.charAt(0)),
-                        c)) {
-                    c = String.valueOf(item.title.charAt(0));
-                    mPositions[++index] = i;
-                }
-            }
-            mCount = getCount();
-        }
-
-        @Override
-        public int getItemViewType(int position) {
-            ListItem item = getItem(position);
-            return item.category;
-        }
-
-        @Override
-        public boolean areAllItemsEnabled() {
-            return false; // because of header
-        }
-
-        @Override
-        public boolean isEnabled(int position) {
-            return getItemViewType(position) != ListItem.CATEGORY_HEADER;
-        }
-
-        @Override
-        public int getViewTypeCount() {
-            return 2; // CATEGORY_HEADER, CATEGORY_NORMAL
-        }
-
-        @Override
-        public int getPositionForSection(int section) {
-
-            if (section >= mSections.length()) {
-                return getCount();
-            } else if (section < 0) {
-                return -1;
-            } else {
-                return mPositions[section];
-            }
-
-        }
-
-        @Override
-        public int getSectionForPosition(int position) {
-            if (position < 0) {
-                return -1;
-            } else if (position >= mCount) {
-                return mSections.length() - 1;
-            }
-
-            int index = Arrays.binarySearch(mPositions, position);
-
-            /*
-             * Consider this example: section positions are 0, 3, 5; the
-             * supplied position is 4. The section corresponding to position 4
-             * starts at position 3, so the expected return value is 1. Binary
-             * search will not find 4 in the array and thus will return
-             * -insertPosition-1, i.e. -3. To get from that number to the
-             * expected value of 1 we need to negate and subtract 2.
-             */
-            return index >= 0 ? index : -index - 2;
-        }
-
-        @Override
-        public Object[] getSections() {
-            String[] sections = new String[mSections.length()];
-            for (int i = 0; i < mSections.length(); i++)
-                sections[i] = String.valueOf(mSections.charAt(i));
-            return sections;
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            ViewHolder holder;
-            final ListItem item = getItem(position);
-            final int type = item.category;
-
-            if (convertView == null) {
-                holder = new ViewHolder();
-                switch (type) {
-                case ListItem.CATEGORY_HEADER:
-                    convertView = new TextView(getContext(), null,
-                            android.R.attr.listSeparatorTextViewStyle);
-                    holder.title = (TextView) convertView;
-                    break;
-
-                case ListItem.CATEGORY_NORMAL:
-                    // fall through
-                default:
-                    convertView = mInflater.inflate(android.R.layout.simple_list_item_1,
-                            parent, false);
-                    holder.title = (TextView) convertView
-                            .findViewById(android.R.id.text1);
-                    break;
-                }
-                convertView.setTag(holder);
-            } else {
-                holder = (ViewHolder) convertView.getTag();
-            }
-
-            // All view fields must be updated every time, because the view may
-            // be recycled
-            switch (type) {
-            case ListItem.CATEGORY_HEADER:
-                holder.title.setText(item.title);
-                break;
-
-            case ListItem.CATEGORY_NORMAL:
-                // fall through
-            default:
-                holder.title.setText(item.title);
-                break;
-            }
-
-            return convertView;
-        }
-    }
-
-    public class ListItem {
-
-        public static final int CATEGORY_HEADER = 0;
-        public static final int CATEGORY_NORMAL = 1;
-
-        public int category;
-        public String title;
-
-        public ListItem() {
-        }
-
-        @Override
-        public String toString() {
-            if (category == CATEGORY_HEADER) {
-                return "";
-            } else {
-                return title;
-            }
-        }
-
-    }
-
-
-
-
-    private String[] mStrings = { "Abbaye de Belloc",
-            "Abbaye du Mont des Cats", "Abertam", "Abondance", "Ackawi",
-            "Acorn", "Adelost", "Affidelice au Chablis", "Afuega'l Pitu",
-            "Airag", "Airedale", "Aisy Cendre", "Allgauer Emmentaler",
-            "Alverca", "Ambert", "American Cheese", "Ami du Chambertin",
-            "Anejo Enchilado", "Anneau du Vic-Bilh", "Anthoriro", "Appenzell",
-            "Aragon", "Ardi Gasna", "Ardrahan", "Armenian String",
-            "Aromes au Gene de Marc", "Asadero", "Asiago", "Aubisque Pyrenees",
-            "Autun", "Avaxtskyr", "Baby Swiss", "Babybel",
-            "Baguette Laonnaise", "Bakers", "Baladi", "Balaton", "Bandal",
-            "Banon", "Barry's Bay Cheddar", "Basing", "Basket Cheese",
-            "Bath Cheese", "Bavarian Bergkase", "Baylough", "Beaufort",
-            "Beauvoorde", "Beenleigh Blue", "Beer Cheese", "Bel Paese",
-            "Bergader", "Bergere Bleue", "Berkswell", "Beyaz Peynir",
-            "Bierkase", "Bishop Kennedy", "Blarney", "Bleu d'Auvergne",
-            "Bleu de Gex", "Bleu de Laqueuille", "Bleu de Septmoncel",
-            "Bleu Des Causses", "Blue", "Blue Castello", "Blue Rathgore",
-            "Blue Vein (Australian)", "Blue Vein Cheeses", "Bocconcini",
-            "Bocconcini (Australian)", "Boeren Leidenkaas", "Bonchester",
-            "Bosworth", "Bougon", "Boule Du Roves", "Boulette d'Avesnes",
-            "Boursault", "Boursin", "Bouyssou", "Bra", "Braudostur",
-            "Breakfast Cheese", "Brebis du Lavort", "Brebis du Lochois",
-            "Brebis du Puyfaucon", "Bresse Bleu", "Brick", "Brie",
-            "Brie de Meaux", "Brie de Melun", "Brillat-Savarin", "Brin",
-            "Brin d' Amour", "Brin d'Amour", "Brinza (Burduf Brinza)",
-            "Briquette de Brebis", "Briquette du Forez", "Broccio",
-            "Broccio Demi-Affine", "Brousse du Rove", "Bruder Basil",
-            "Brusselae Kaas (Fromage de Bruxelles)", "Bryndza",
-            "Buchette d'Anjou", "Buffalo", "Burgos", "Butte", "Butterkase",
-            "Button (Innes)", "Buxton Blue", "Cabecou", "Caboc", "Cabrales",
-            "Cachaille", "Caciocavallo", "Caciotta", "Caerphilly",
-            "Cairnsmore", "Calenzana", "Cambazola", "Camembert de Normandie",
-            "Canadian Cheddar", "Canestrato", "Cantal", "Caprice des Dieux",
-            "Capricorn Goat", "Capriole Banon", "Carre de l'Est",
-            "Casciotta di Urbino", "Cashel Blue", "Castellano", "Castelleno",
-            "Castelmagno", "Castelo Branco", "Castigliano", "Cathelain",
-            "Celtic Promise", "Cendre d'Olivet", "Cerney", "Chabichou",
-            "Chabichou du Poitou", "Chabis de Gatine", "Chaource", "Charolais",
-            "Chaumes", "Cheddar", "Cheddar Clothbound", "Cheshire", "Chevres",
-            "Chevrotin des Aravis", "Chontaleno", "Civray",
-            "Coeur de Camembert au Calvados", "Coeur de Chevre", "Colby",
-            "Cold Pack", "Comte", "Coolea", "Cooleney", "Coquetdale",
-            "Corleggy", "Cornish Pepper", "Cotherstone", "Cotija",
-            "Cottage Cheese", "Cottage Cheese (Australian)", "Cougar Gold",
-            "Coulommiers", "Coverdale", "Crayeux de Roncq", "Cream Cheese",
-            "Cream Havarti", "Crema Agria", "Crema Mexicana", "Creme Fraiche",
-            "Crescenza", "Croghan", "Crottin de Chavignol",
-            "Crottin du Chavignol", "Crowdie", "Crowley", "Cuajada", "Curd",
-            "Cure Nantais", "Curworthy", "Cwmtawe Pecorino",
-            "Cypress Grove Chevre", "Danablu (Danish Blue)", "Danbo",
-            "Danish Fontina", "Daralagjazsky", "Dauphin", "Delice des Fiouves",
-            "Denhany Dorset Drum", "Derby", "Dessertnyj Belyj", "Devon Blue",
-            "Devon Garland", "Dolcelatte", "Doolin", "Doppelrhamstufel",
-            "Dorset Blue Vinney", "Double Gloucester", "Double Worcester",
-            "Dreux a la Feuille", "Dry Jack", "Duddleswell", "Dunbarra",
-            "Dunlop", "Dunsyre Blue", "Duroblando", "Durrus",
-            "Dutch Mimolette (Commissiekaas)", "Edam", "Edelpilz",
-            "Emental Grand Cru", "Emlett", "Emmental", "Epoisses de Bourgogne",
-            "Esbareich", "Esrom", "Etorki", "Evansdale Farmhouse Brie",
-            "Evora De L'Alentejo", "Exmoor Blue", "Explorateur", "Feta",
-            "Feta (Australian)", "Figue", "Filetta", "Fin-de-Siecle",
-            "Finlandia Swiss", "Finn", "Fiore Sardo", "Fleur du Maquis",
-            "Flor de Guia", "Flower Marie", "Folded",
-            "Folded cheese with mint", "Fondant de Brebis", "Fontainebleau",
-            "Fontal", "Fontina Val d'Aosta", "Formaggio di capra", "Fougerus",
-            "Four Herb Gouda", "Fourme d' Ambert", "Fourme de Haute Loire",
-            "Fourme de Montbrison", "Fresh Jack", "Fresh Mozzarella",
-            "Fresh Ricotta", "Fresh Truffles", "Fribourgeois", "Friesekaas",
-            "Friesian", "Friesla", "Frinault", "Fromage a Raclette",
-            "Fromage Corse", "Fromage de Montagne de Savoie", "Fromage Frais",
-            "Fruit Cream Cheese", "Frying Cheese", "Fynbo", "Gabriel",
-            "Galette du Paludier", "Galette Lyonnaise",
-            "Galloway Goat's Milk Gems", "Gammelost", "Gaperon a l'Ail",
-            "Garrotxa", "Gastanberra", "Geitost", "Gippsland Blue", "Gjetost",
-            "Gloucester", "Golden Cross", "Gorgonzola", "Gornyaltajski",
-            "Gospel Green", "Gouda", "Goutu", "Gowrie", "Grabetto", "Graddost",
-            "Grafton Village Cheddar", "Grana", "Grana Padano", "Grand Vatel",
-            "Grataron d' Areches", "Gratte-Paille", "Graviera", "Greuilh",
-            "Greve", "Gris de Lille", "Gruyere", "Gubbeen", "Guerbigny",
-            "Halloumi", "Halloumy (Australian)", "Haloumi-Style Cheese",
-            "Harbourne Blue", "Havarti", "Heidi Gruyere", "Hereford Hop",
-            "Herrgardsost", "Herriot Farmhouse", "Herve", "Hipi Iti",
-            "Hubbardston Blue Cow", "Hushallsost", "Iberico", "Idaho Goatster",
-            "Idiazabal", "Il Boschetto al Tartufo", "Ile d'Yeu",
-            "Isle of Mull", "Jarlsberg", "Jermi Tortes", "Jibneh Arabieh",
-            "Jindi Brie", "Jubilee Blue", "Juustoleipa", "Kadchgall", "Kaseri",
-            "Kashta", "Kefalotyri", "Kenafa", "Kernhem", "Kervella Affine",
-            "Kikorangi", "King Island Cape Wickham Brie", "King River Gold",
-            "Klosterkaese", "Knockalara", "Kugelkase", "L'Aveyronnais",
-            "L'Ecir de l'Aubrac", "La Taupiniere", "La Vache Qui Rit",
-            "Laguiole", "Lairobell", "Lajta", "Lanark Blue", "Lancashire",
-            "Langres", "Lappi", "Laruns", "Lavistown", "Le Brin",
-            "Le Fium Orbo", "Le Lacandou", "Le Roule", "Leafield", "Lebbene",
-            "Leerdammer", "Leicester", "Leyden", "Limburger",
-            "Lincolnshire Poacher", "Lingot Saint Bousquet d'Orb", "Liptauer",
-            "Little Rydings", "Livarot", "Llanboidy", "Llanglofan Farmhouse",
-            "Loch Arthur Farmhouse", "Loddiswell Avondale", "Longhorn",
-            "Lou Palou", "Lou Pevre", "Lyonnais", "Maasdam", "Macconais",
-            "Mahoe Aged Gouda", "Mahon", "Malvern", "Mamirolle", "Manchego",
-            "Manouri", "Manur", "Marble Cheddar", "Marbled Cheeses",
-            "Maredsous", "Margotin", "Maribo", "Maroilles", "Mascares",
-            "Mascarpone", "Mascarpone (Australian)", "Mascarpone Torta",
-            "Matocq", "Maytag Blue", "Meira", "Menallack Farmhouse",
-            "Menonita", "Meredith Blue", "Mesost", "Metton (Cancoillotte)",
-            "Meyer Vintage Gouda", "Mihalic Peynir", "Milleens", "Mimolette",
-            "Mine-Gabhar", "Mini Baby Bells", "Mixte", "Molbo",
-            "Monastery Cheeses", "Mondseer", "Mont D'or Lyonnais", "Montasio",
-            "Monterey Jack", "Monterey Jack Dry", "Morbier",
-            "Morbier Cru de Montagne", "Mothais a la Feuille", "Mozzarella",
-            "Mozzarella (Australian)", "Mozzarella di Bufala",
-            "Mozzarella Fresh, in water", "Mozzarella Rolls", "Munster",
-            "Murol", "Mycella", "Myzithra", "Naboulsi", "Nantais",
-            "Neufchatel", "Neufchatel (Australian)", "Niolo", "Nokkelost",
-            "Northumberland", "Oaxaca", "Olde York", "Olivet au Foin",
-            "Olivet Bleu", "Olivet Cendre", "Orkney Extra Mature Cheddar",
-            "Orla", "Oschtjepka", "Ossau Fermier", "Ossau-Iraty", "Oszczypek",
-            "Oxford Blue", "P'tit Berrichon", "Palet de Babligny", "Paneer",
-            "Panela", "Pannerone", "Pant ys Gawn", "Parmesan (Parmigiano)",
-            "Parmigiano Reggiano", "Pas de l'Escalette", "Passendale",
-            "Pasteurized Processed", "Pate de Fromage", "Patefine Fort",
-            "Pave d'Affinois", "Pave d'Auge", "Pave de Chirac",
-            "Pave du Berry", "Pecorino", "Pecorino in Walnut Leaves",
-            "Pecorino Romano", "Peekskill Pyramid", "Pelardon des Cevennes",
-            "Pelardon des Corbieres", "Penamellera", "Penbryn", "Pencarreg",
-            "Perail de Brebis", "Petit Morin", "Petit Pardou", "Petit-Suisse",
-            "Picodon de Chevre", "Picos de Europa", "Piora",
-            "Pithtviers au Foin", "Plateau de Herve", "Plymouth Cheese",
-            "Podhalanski", "Poivre d'Ane", "Polkolbin", "Pont l'Eveque",
-            "Port Nicholson", "Port-Salut", "Postel", "Pouligny-Saint-Pierre",
-            "Pourly", "Prastost", "Pressato", "Prince-Jean",
-            "Processed Cheddar", "Provolone", "Provolone (Australian)",
-            "Pyengana Cheddar", "Pyramide", "Quark", "Quark (Australian)",
-            "Quartirolo Lombardo", "Quatre-Vents", "Quercy Petit",
-            "Queso Blanco", "Queso Blanco con Frutas --Pina y Mango",
-            "Queso de Murcia", "Queso del Montsec", "Queso del Tietar",
-            "Queso Fresco", "Queso Fresco (Adobera)", "Queso Iberico",
-            "Queso Jalapeno", "Queso Majorero", "Queso Media Luna",
-            "Queso Para Frier", "Queso Quesadilla", "Rabacal", "Raclette",
-            "Ragusano", "Raschera", "Reblochon", "Red Leicester",
-            "Regal de la Dombes", "Reggianito", "Remedou", "Requeson",
-            "Richelieu", "Ricotta", "Ricotta (Australian)", "Ricotta Salata",
-            "Ridder", "Rigotte", "Rocamadour", "Rollot", "Romano",
-            "Romans Part Dieu", "Roncal", "Roquefort", "Roule",
-            "Rouleau De Beaulieu", "Royalp Tilsit", "Rubens", "Rustinu",
-            "Saaland Pfarr", "Saanenkaese", "Saga", "Sage Derby",
-            "Sainte Maure", "Saint-Marcellin", "Saint-Nectaire",
-            "Saint-Paulin", "Salers", "Samso", "San Simon", "Sancerre",
-            "Sap Sago", "Sardo", "Sardo Egyptian", "Sbrinz", "Scamorza",
-            "Schabzieger", "Schloss", "Selles sur Cher", "Selva", "Serat",
-            "Seriously Strong Cheddar", "Serra da Estrela", "Sharpam",
-            "Shelburne Cheddar", "Shropshire Blue", "Siraz", "Sirene",
-            "Smoked Gouda", "Somerset Brie", "Sonoma Jack",
-            "Sottocenare al Tartufo", "Soumaintrain", "Sourire Lozerien",
-            "Spenwood", "Sraffordshire Organic", "St. Agur Blue Cheese",
-            "Stilton", "Stinking Bishop", "String", "Sussex Slipcote",
-            "Sveciaost", "Swaledale", "Sweet Style Swiss", "Swiss",
-            "Syrian (Armenian String)", "Tala", "Taleggio", "Tamie",
-            "Tasmania Highland Chevre Log", "Taupiniere", "Teifi", "Telemea",
-            "Testouri", "Tete de Moine", "Tetilla", "Texas Goat Cheese",
-            "Tibet", "Tillamook Cheddar", "Tilsit", "Timboon Brie", "Toma",
-            "Tomme Brulee", "Tomme d'Abondance", "Tomme de Chevre",
-            "Tomme de Romans", "Tomme de Savoie", "Tomme des Chouans",
-            "Tommes", "Torta del Casar", "Toscanello", "Touree de L'Aubier",
-            "Tourmalet", "Trappe (Veritable)", "Trois Cornes De Vendee",
-            "Tronchon", "Trou du Cru", "Truffe", "Tupi", "Turunmaa",
-            "Tymsboro", "Tyn Grug", "Tyning", "Ubriaco", "Ulloa",
-            "Vacherin-Fribourgeois", "Valencay", "Vasterbottenost", "Venaco",
-            "Vendomois", "Vieux Corse", "Vignotte", "Vulscombe",
-            "Waimata Farmhouse Blue", "Washed Rind Cheese (Australian)",
-            "Waterloo", "Weichkaese", "Wellington", "Wensleydale",
-            "White Stilton", "Whitestone Farmhouse", "Wigmore",
-            "Woodside Cabecou", "Xanadu", "Xynotyro", "Yarg Cornish",
-            "Yarra Valley Pyramid", "Yorkshire Blue", "Zamorano",
-            "Zanetti Grana Padano", "Zanetti Parmigiano Reggiano" };
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithFastScrollerTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithFastScrollerTest.java
deleted file mode 100755
index f78a7c1f7f65861280f8706b4d585833f57e00b7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithFastScrollerTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.ListView;
-
-import android.os.SystemClock;
-import android.app.Instrumentation;
-import android.view.MotionEvent;
-
-import android.test.TouchUtils;
-
-public class ListWithFastScrollerTest extends ActivityInstrumentationTestCase<ListWithFastScroller> {
-    private ListWithFastScroller mActivity;
-    private ListView mListView;
-
-    public ListWithFastScrollerTest() {
-        super("com.mediatek.common.widget.tests", ListWithFastScroller.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mListView = getActivity().getListView();
-    }
-
-    @MediumTest
-    public void testTouchFastScroller() {
-
-        TouchUtils.drag(this, mListView.getWidth() - 10, mListView.getWidth() - 10,
-                100, 100 + 300, 300);
-
-        try {
-            Thread.sleep(3000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        assertTrue("FastScroller should be enabled", mListView.isFastScrollEnabled());
-    }
-
-    @MediumTest
-    public void testTouchOnWindowFocusChanged() {
-
-        Instrumentation inst = getInstrumentation();
-
-        long downTime = SystemClock.uptimeMillis();
-        long eventTime = SystemClock.uptimeMillis();
-
-        float y = 100;
-        float x = mListView.getWidth() - 10;
-
-
-        MotionEvent event = MotionEvent.obtain(downTime, eventTime,
-                MotionEvent.ACTION_DOWN, x, y, 0);
-        inst.sendPointerSync(event);
-        inst.waitForIdleSync();
-
-
-        for (int i = 0; i < 2; ++i) {
-            y += 5;
-            eventTime = SystemClock.uptimeMillis();
-            event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_MOVE, x, y, 0);
-            inst.sendPointerSync(event);
-            inst.waitForIdleSync();
-        }
-
-        mActivity.finish();
-        mActivity = null;
-
-        assertTrue(mActivity == null);
-    }
-
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithFirstScreenUnSelectable.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithFirstScreenUnSelectable.java
deleted file mode 100755
index 8e019ae69276cfda61aee6d6c0767587ead9a23c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithFirstScreenUnSelectable.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2008 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-/**
- * The first item is unselectable, and takes up the whole screen.
- */
-public class ListWithFirstScreenUnSelectable extends ListScenario {
-
-    @Override
-    protected void init(Params params) {
-        params.setItemScreenSizeFactor(1.2)
-                .setNumItems(2)
-                .setPositionsUnselectable(0);
-
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithHeaders.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithHeaders.java
deleted file mode 100755
index 9448a37a01a110ea77ad9d149004a3b076bf8b5d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithHeaders.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-import android.os.Bundle;
-import android.widget.Button;
-import android.widget.ListAdapter;
-import android.widget.ListView;
-
-public class ListWithHeaders extends ListScenario {
-    @Override
-    protected void init(Params params) {
-        params.setStackFromBottom(false)
-                .setStartingSelectionPosition(-1)
-                .setNumItems(24)
-                .setItemScreenSizeFactor(0.14);
-    }
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        final ListView listView = getListView();
-        listView.setItemsCanFocus(true);
-
-        for (int i = 0; i < 12; i++) {
-            Button header = new Button(this);
-            header.setText("Header View");
-            listView.addHeaderView(header);
-        }
-
-        for (int i = 0; i < 12; i++) {
-            Button footer = new Button(this);
-            footer.setText("Footer View");
-            listView.addFooterView(footer);
-        }
-
-        final ListAdapter adapter = listView.getAdapter();
-        listView.setAdapter(adapter);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithNoFadingEdge.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithNoFadingEdge.java
deleted file mode 100755
index b6e75086231ae2fe50745735eb4e8cc8a4e62a9e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithNoFadingEdge.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-public class ListWithNoFadingEdge extends ListScenario {
-
-    protected void init(Params params) {
-        params.setFadingEdgeScreenSizeFactor(0.0)
-                .setNumItems(10)
-                .setItemScreenSizeFactor(0.2);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithOffScreenNextSelectable.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithOffScreenNextSelectable.java
deleted file mode 100755
index 7d0970659c11df50f7fb1d41aba7ba6a1b46244d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithOffScreenNextSelectable.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-/**
- * Pressing down from position 0 requires looking past positions 1, 2 and 3 to
- * an offscreen item to know that it is the next selectable.
- */
-public class ListWithOffScreenNextSelectable extends ListScenario {
-
-
-    protected void init(Params params) {
-        params.setItemsFocusable(false)
-                .setNumItems(5)
-                .setItemScreenSizeFactor(0.25)
-                .setPositionUnselectable(1)
-                .setPositionUnselectable(2)
-                .setPositionUnselectable(3);
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithOnItemSelectedAction.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithOnItemSelectedAction.java
deleted file mode 100755
index b5f87d3cc6bc52cee05b610149e5783eb2010b88..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithOnItemSelectedAction.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import android.widget.TextView;
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-/**
- * The header text view echos the value of the selected item by using (indirectly)
- * the {@link android.widget.AdapterView.OnItemSelectedListener}.
- */
-public class ListWithOnItemSelectedAction extends ListScenario {
-    protected void init(Params params) {
-        params.setNumItems(8)
-                .setItemScreenSizeFactor(0.2)
-                .includeHeaderAboveList(true);
-
-    }
-
-    @Override
-    protected void positionSelected(int positon) {
-        if (positon != getListView().getSelectedItemPosition()) {
-            throw new IllegalStateException("something is fishy... the selected postion does not " +
-                    "match what the list reports.");
-        }
-        setHeaderValue(
-                ((TextView) getListView().getSelectedView()).getText().toString());
-
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithScreenOfNoSelectables.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithScreenOfNoSelectables.java
deleted file mode 100755
index abb2ccfc48992be47a8633c44726a4c94f4a11f3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithScreenOfNoSelectables.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-public class ListWithScreenOfNoSelectables extends ListScenario {
-
-    protected void init(Params params) {
-        params.setNumItems(10)
-                .setItemScreenSizeFactor(0.2)
-                .setPositionsUnselectable(1, 2, 3, 4, 5, 6, 7, 8, 9);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithSeparators.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithSeparators.java
deleted file mode 100755
index 7f59e76b6a90e2bcc49aa534edeb1de2f2b2f6ab..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/ListWithSeparators.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview;
-
-import com.mediatek.common.widget.tests.util.ListScenario;
-
-/**
- * Basic separator scenario, nothing fancy.
- */
-public class ListWithSeparators extends ListScenario {
-
-    protected void init(Params params) {
-        params.setItemsFocusable(false)
-                .setNumItems(5)
-                .setItemScreenSizeFactor(0.22)
-                .setPositionUnselectable(0)
-                .setPositionUnselectable(2);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListInterleaveFocusablesTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListInterleaveFocusablesTest.java
deleted file mode 100755
index e4cf710625a76545084d8e1ea88ac2f27079425b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListInterleaveFocusablesTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.arrowscroll;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
-import com.mediatek.common.widget.tests.util.ListUtil;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.ListView;
-import com.mediatek.common.widget.tests.listview.ListInterleaveFocusables;
-
-public class ListInterleaveFocusablesTest extends ActivityInstrumentationTestCase2<ListInterleaveFocusables> {
-    private ListView mListView;
-    private ListUtil mListUtil;
-
-    public ListInterleaveFocusablesTest() {
-        super(ListInterleaveFocusables.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mListView = getActivity().getListView();
-        mListUtil = new ListUtil(mListView, getInstrumentation());
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertEquals(7, mListView.getChildCount());
-        assertTrue(mListView.getChildAt(1).isFocusable());
-        assertTrue(mListView.getChildAt(3).isFocusable());
-        assertTrue(mListView.getChildAt(6).isFocusable());
-    }
-
-    @MediumTest
-    public void testGoingFromUnFocusableSelectedToFocusable() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-
-        assertEquals("selected item position", 1, mListView.getSelectedItemPosition());
-        assertSelectedViewFocus(true);
-    }
-
-    // go down from an item that isn't focusable, make sure it finds the focusable
-    // below (instead of above).  this exposes a (now fixed) bug where the focus search
-    // was not starting from the right spot
-    @MediumTest
-    public void testGoingDownFromUnFocusableSelectedToFocusableWithOtherFocusableAbove() {
-        mListUtil.setSelectedPosition(2);
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        assertEquals("selected item position", 3, mListView.getSelectedItemPosition());
-        assertSelectedViewFocus(true);
-    }
-
-    // same, but going up
-    @MediumTest
-    public void testGoingUpFromUnFocusableSelectedToFocusableWithOtherFocusableAbove() {
-        mListUtil.setSelectedPosition(2);
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        assertEquals("selected item position", 1, mListView.getSelectedItemPosition());
-        assertSelectedViewFocus(true);
-    }
-
-    /**
-     * Go down from a focusable when there is a focusable below, but it is more than
-     * one item away; make sure it won't give that item focus because it is too far away.
-     */
-    @MediumTest
-    public void testGoingDownFromFocusableToUnfocusableWhenFocusableIsBelow() {
-        mListUtil.setSelectedPosition(3);
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        assertEquals("selected item position", 4, mListView.getSelectedItemPosition());
-        assertSelectedViewFocus(false);
-    }
-
-    // same but going up
-    @MediumTest
-    public void testGoingUpFromFocusableToUnfocusableWhenFocusableIsBelow() {
-        mListUtil.setSelectedPosition(6);
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        assertEquals("selected item position", 5, mListView.getSelectedItemPosition());
-        assertSelectedViewFocus(false);
-    }
-
-    public void assertSelectedViewFocus(boolean isFocused) {
-        final View view = mListView.getSelectedView();
-        assertEquals("selected view focused", isFocused, view.isFocused());
-        assertEquals("selected position's isSelected should be the inverse "
-                + "of it having focus", !isFocused, view.isSelected());
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListItemFocusableAboveUnfocusableTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListItemFocusableAboveUnfocusableTest.java
deleted file mode 100755
index 84776f60cb2bc38cb7ded6a4cdba33714bce1bde..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListItemFocusableAboveUnfocusableTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.arrowscroll;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.ListView;
-import android.view.KeyEvent;
-import com.mediatek.common.widget.tests.listview.ListItemFocusableAboveUnfocusable;
-
-public class ListItemFocusableAboveUnfocusableTest extends ActivityInstrumentationTestCase<ListItemFocusableAboveUnfocusable> {
-    private ListView mListView;
-
-    public ListItemFocusableAboveUnfocusableTest() {
-        super("com.mediatek.common.widget.tests", ListItemFocusableAboveUnfocusable.class);
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mListView = getActivity().getListView();
-    }
-
-
-    @MediumTest
-    public void testPreconditions() {
-        assertEquals("selected position", 0, mListView.getSelectedItemPosition());
-        assertTrue(mListView.getChildAt(0).isFocused());
-        assertFalse(mListView.getChildAt(1).isFocusable());
-    }
-
-    @MediumTest
-    public void testMovingToUnFocusableTakesFocusAway() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-
-        assertFalse("focused item should have lost focus",
-                mListView.getChildAt(0).isFocused());
-        assertEquals("selected position", 1, mListView.getSelectedItemPosition());
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListItemFocusablesCloseTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListItemFocusablesCloseTest.java
deleted file mode 100755
index 599f9d88183a2447ab6bd64617c7fbb4a9b12c0a..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListItemFocusablesCloseTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.arrowscroll;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-import android.widget.LinearLayout;
-import android.widget.ListView;
-import com.mediatek.common.widget.tests.listview.ListItemFocusablesClose;
-
-public class ListItemFocusablesCloseTest extends ActivityInstrumentationTestCase<ListItemFocusablesClose> {
-    private ListView mListView;
-    private int mListTop;
-    private int mListBottom;
-
-    public ListItemFocusablesCloseTest() {
-        super("com.mediatek.common.widget.tests", ListItemFocusablesClose.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mListView = getActivity().getListView();
-        mListTop = mListView.getListPaddingTop();
-        mListBottom = mListView.getHeight() - mListView.getListPaddingBottom();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mListView);
-        assertTrue(mListView.getAdapter().areAllItemsEnabled());
-        assertTrue(mListView.getItemsCanFocus());
-        assertEquals(0, mListView.getSelectedItemPosition());
-        final LinearLayout first = (LinearLayout) mListView.getSelectedView();
-        getInstrumentation().waitForIdleSync();
-        assertEquals("first item should be at top of screen",
-                mListView.getListPaddingTop(),
-                first.getTop());
-        assertTrue("first button of first list item should have focus",
-                first.getChildAt(0).isFocused());
-        assertTrue("item should be shorter than list for this test to make sense",
-                first.getHeight() < mListView.getHeight());
-        assertEquals("two items should be on screen",
-                2, mListView.getChildCount());
-        assertTrue("first button of second item should be on screen",
-                getActivity().getChildOfItem(1, 0).getBottom() < mListBottom);
-    }
-
-
-    @MediumTest
-    public void testChangeFocusWithinItem() {
-        final LinearLayout first = (LinearLayout) mListView.getSelectedView();
-        final int topOfFirstItemBefore = first.getTop();
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        assertTrue("focus should have moved to second button of first item",
-                first.getChildAt(2).isFocused());
-        assertEquals("selection should not have changed",
-                0, mListView.getSelectedItemPosition());
-        assertEquals("list item should not have been shifted",
-                topOfFirstItemBefore, first.getTop());
-
-
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        assertTrue("focus should have moved back to first button of first item",
-                first.getChildAt(0).isFocused());
-        assertEquals("list item should not have been shifted",
-                topOfFirstItemBefore, first.getTop());
-    }
-
-    @MediumTest
-    public void testMoveDownToButtonInDifferentSelection() {
-        final LinearLayout first = (LinearLayout) mListView.getSelectedView();
-        final int topOfFirstItemBefore = first.getTop();
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-
-        assertEquals("selection should have moved to second item",
-                1, mListView.getSelectedItemPosition());
-        final LinearLayout selectedItem = (LinearLayout) mListView.getSelectedView();
-        assertTrue("first button of second item should have focus",
-                selectedItem.getChildAt(0).isFocused());
-        assertEquals("list item should not have been shifted",
-                topOfFirstItemBefore, first.getTop());
-    }
-
-    @MediumTest
-    public void testMoveUpToButtonInDifferentSelection() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        assertEquals(1, mListView.getSelectedItemPosition());
-        assertTrue("first button of second item should have focus",
-                getActivity().getChildOfItem(1, 0).hasFocus());
-
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        assertEquals("first list item should have selection", 0,
-                mListView.getSelectedItemPosition());
-        assertTrue("second button of first item should have focus",
-                getActivity().getChildOfItem(0, 2).hasFocus());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListItemFocusablesFarApartTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListItemFocusablesFarApartTest.java
deleted file mode 100755
index 6859e42f89be9c12e221a7f2817bd84609695679..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListItemFocusablesFarApartTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.arrowscroll;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ListView;
-import com.mediatek.common.widget.tests.listview.ListItemFocusablesFarApart;
-
-public class ListItemFocusablesFarApartTest extends ActivityInstrumentationTestCase<ListItemFocusablesFarApart> {
-    private ListView mListView;
-    private int mListTop;
-    private int mListBottom;
-
-    public ListItemFocusablesFarApartTest() {
-        super("com.mediatek.common.widget.tests", ListItemFocusablesFarApart.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mListView = getActivity().getListView();
-        mListTop = mListView.getListPaddingTop();
-        mListBottom = mListView.getHeight() - mListView.getListPaddingBottom();
-    }
-
-    /**
-     * Get the child of a list item.
-     * @param listIndex The index of the currently visible items
-     * @param index The index of the child.
-     */
-    public View getChildOfItem(int listIndex, int index) {
-        return ((ViewGroup) mListView.getChildAt(listIndex)).getChildAt(index);
-
-    }
-
-    public int getTopOfChildOfItem(int listIndex, int index) {
-        ViewGroup listItem = (ViewGroup) mListView.getChildAt(listIndex);
-        View child = listItem.getChildAt(index);
-        return child.getTop() + listItem.getTop();
-    }
-
-    public int getBottomOfChildOfItem(int listIndex, int index) {
-        ViewGroup listItem = (ViewGroup) mListView.getChildAt(listIndex);
-        View child = listItem.getChildAt(index);
-        return child.getBottom() + listItem.getTop();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mListView);
-        assertEquals("should only be one visible list item",
-                1, mListView.getChildCount());
-        int topOfFirstButton = getTopOfChildOfItem(0, 0);
-        int topOfSecondButton = getTopOfChildOfItem(0, 2);
-        assertTrue("second button should be more than max scroll away from first",
-                topOfSecondButton - topOfFirstButton > mListView.getMaxScrollAmount());
-    }
-
-
-    @MediumTest
-    public void testPanWhenNextFocusableTooFarDown() {
-
-        int expectedTop = mListView.getChildAt(0).getTop();
-
-        final Button topButton = (Button) getChildOfItem(0, 0);
-
-        int counter = 0;
-        while (getTopOfChildOfItem(0, 2) > mListBottom) {
-            // just to make sure we never end up with an infinite loop
-            if (counter > 5) fail("couldn't reach next button within " + counter + " downs");
-
-            if (getBottomOfChildOfItem(0, 0) < mListTop) {
-                assertFalse("after " + counter + " downs, top button not visible, should not have focus",
-                        topButton.isFocused());
-                assertFalse("after " + counter + " downs, neither top button nor botom button visible, nothng within first list " +
-                        "item should have focus", mListView.getChildAt(0).hasFocus());
-            } else {
-                assertTrue("after " + counter + " downs, top button still visible, should have focus",
-                        topButton.isFocused());
-            }
-
-            assertEquals("after " + counter + " downs, " +
-                    "should have panned by max scroll amount",
-                    expectedTop, mListView.getChildAt(0).getTop());
-
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-            expectedTop -= mListView.getMaxScrollAmount();
-            counter++;
-        }
-
-        // at this point, the second button is visible on screen.
-        // it should have focus
-        assertTrue("second button should have focus",
-                getChildOfItem(0, 2).isFocused());
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListItemsExpandOnSelectionTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListItemsExpandOnSelectionTest.java
deleted file mode 100755
index 6a2e6710fee6004729cb261c5a71510306139c77..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListItemsExpandOnSelectionTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.arrowscroll;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.ListView;
-import android.view.KeyEvent;
-import com.mediatek.common.widget.tests.listview.ListItemsExpandOnSelection;
-
-public class ListItemsExpandOnSelectionTest extends ActivityInstrumentationTestCase<ListItemsExpandOnSelection> {
-    private ListView mListView;
-    private int mListTop;
-    private int mListBottom;
-    private int mExpandedHeight;
-    private int mNormalHeight;
-
-    public ListItemsExpandOnSelectionTest() {
-        super("com.mediatek.common.widget.tests",
-                ListItemsExpandOnSelection.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mListView = getActivity().getListView();
-        mListTop = mListView.getListPaddingTop();
-        mListBottom = mListView.getHeight() - mListView.getListPaddingBottom();
-        mExpandedHeight = mListView.getChildAt(0).getHeight();
-        mNormalHeight = mListView.getChildAt(1).getHeight();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertEquals(0, mListView.getSelectedItemPosition());
-        assertEquals("selected item should be 1.5 times taller than the others",
-                mExpandedHeight, (int) (mNormalHeight * 1.5));
-    }
-
-    @MediumTest
-    public void testMoveSelectionDownNotRequiringScroll() {
-
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-
-        assertEquals(1, mListView.getSelectedItemPosition());
-        assertEquals("first item's top should not have shifted",
-                mListTop, mListView.getChildAt(0).getTop());
-
-    }
-
-    @MediumTest
-    public void testMoveSelectionUpNotRequiringScroll() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-
-        assertEquals(1, mListView.getSelectedItemPosition());
-        final int oldBottom = mListView.getSelectedView().getBottom();
-
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-
-        assertEquals("bottom of 2nd itme should have stayed the same when " +
-                "moving back up",
-                oldBottom,
-                mListView.getChildAt(1).getBottom());
-    }
-
-    @MediumTest
-    public void testMoveSelectionDownRequiringScroll() {
-        int lastItemIndex = mListView.getChildCount() - 1;
-
-        for (int i = 0; i < lastItemIndex; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-        getInstrumentation().waitForIdleSync();
-
-        assertEquals("list position", lastItemIndex, mListView.getSelectedItemPosition());
-        assertEquals("expanded height", mExpandedHeight, mListView.getSelectedView().getHeight());
-        assertEquals("should be above bottom fading edge",
-                mListBottom - mListView.getVerticalFadingEdgeLength(),
-                mListView.getSelectedView().getBottom());
-    }
-
-    @LargeTest
-    public void testMoveSelectionUpRequiringScroll() {
-        int childrenPerScreen = mListView.getChildCount();
-
-        // go down past last child on screen
-        for (int i = 0; i < childrenPerScreen; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-
-        // go back up to second to last
-        for (int i = 0; i < childrenPerScreen - 1; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        }
-        getInstrumentation().waitForIdleSync();
-
-        assertEquals("list position", 1, mListView.getSelectedItemPosition());
-        assertEquals("expanded height", mExpandedHeight, mListView.getSelectedView().getHeight());
-        assertEquals("should be below top fading edge",
-                mListTop + mListView.getVerticalFadingEdgeLength(),
-                mListView.getSelectedView().getTop());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListLastItemPartiallyVisibleTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListLastItemPartiallyVisibleTest.java
deleted file mode 100755
index e2698ce9ff2b020892273fbddf18066398514b55..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListLastItemPartiallyVisibleTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.arrowscroll;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.ListView;
-import android.view.View;
-import android.view.KeyEvent;
-import com.mediatek.common.widget.tests.listview.ListLastItemPartiallyVisible;
-
-public class ListLastItemPartiallyVisibleTest extends ActivityInstrumentationTestCase<ListLastItemPartiallyVisible> {
-    private ListView mListView;
-    private int mListBottom;
-
-
-    public ListLastItemPartiallyVisibleTest() {
-        super("com.mediatek.common.widget.tests", ListLastItemPartiallyVisible.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mListView = getActivity().getListView();
-        mListBottom = mListView.getHeight() - mListView.getPaddingBottom();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertEquals("number of elements visible should be the same as number of items " +
-                "in adapter", mListView.getCount(), mListView.getChildCount());
-
-        final View lastChild = mListView.getChildAt(mListView.getChildCount() - 1);
-        assertTrue("last item should be partially off screen",
-                lastChild.getBottom() > mListBottom);
-        assertEquals("selected position", 0, mListView.getSelectedItemPosition());
-    }
-
-    // reproduce bug 998094
-    @MediumTest
-    public void testMovingDownToFullyVisibleNoScroll() {
-        final View firstChild = mListView.getChildAt(0);
-        final int firstBottom = firstChild.getBottom();
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        assertEquals("shouldn't have scrolled: bottom of first child changed.",
-                firstBottom, firstChild.getBottom());
-    }
-
-    // reproduce bug 998094
-    @MediumTest
-    public void testMovingUpToFullyVisibleNoScroll() {
-        int numMovesToLast = mListView.getCount() - 1;
-        for (int i = 0; i < numMovesToLast; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-        assertEquals("should have moved to last position",
-                mListView.getChildCount() - 1, mListView.getSelectedItemPosition());
-
-        final View lastChild = mListView.getSelectedView();
-        final int lastTop = lastChild.getTop();
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        assertEquals("shouldn't have scrolled: top of last child changed.",
-                lastTop, lastChild.getTop());
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListOfItemsShorterThanScreenTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListOfItemsShorterThanScreenTest.java
deleted file mode 100755
index 534c34b3fb4aaa7cee60f76e6e92f709744b441b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListOfItemsShorterThanScreenTest.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.arrowscroll;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.ListView;
-import android.widget.TextView;
-import com.mediatek.common.widget.tests.listview.ListOfItemsShorterThanScreen;
-
-public class ListOfItemsShorterThanScreenTest
-        extends ActivityInstrumentationTestCase<ListOfItemsShorterThanScreen> {
-    private ListView mListView;
-    private ListOfItemsShorterThanScreen mActivity;
-
-
-    public ListOfItemsShorterThanScreenTest() {
-        super("com.mediatek.common.widget.tests", ListOfItemsShorterThanScreen.class);
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        mListView = getActivity().getListView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertEquals(0, mListView.getSelectedItemPosition());
-        assertTrue(mListView.getChildAt(0).isSelected());
-        assertEquals(mListView.getListPaddingTop(), mListView.getSelectedView().getTop());
-    }
-
-    @MediumTest
-    public void testMoveDownToOnScreenNextItem() {
-        final View next = mListView.getChildAt(1);
-        assertFalse(next.isSelected());
-        final int secondPosition = mListView.getSelectedView().getBottom();
-        assertEquals("second item should be positioned item height pixels from top.",
-                secondPosition,
-                next.getTop());
-
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        assertEquals(1, mListView.getSelectedItemPosition());
-        assertTrue(next.isSelected());
-        assertEquals("next selected item shouldn't have moved",
-                secondPosition,
-                next.getTop());
-    }
-
-    @MediumTest
-    public void testMoveUpToOnScreenItem() {
-        // move down one, then back up
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        assertEquals(0, mListView.getSelectedItemPosition());
-    }
-
-    @MediumTest
-    public void testMoveDownToItemRequiringScrolling() {
-        final int lastOnScreenItemIndex = mListView.getChildCount() - 1;
-        final View lastItem = mListView.getChildAt(lastOnScreenItemIndex);
-        assertTrue("last item should be partially off screen",
-                lastItem.getBottom() > mListView.getBottom());
-        assertEquals(mListView.getListPaddingTop(), mListView.getSelectedView().getTop());
-
-        for (int i = 0; i < lastOnScreenItemIndex; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-
-        assertEquals(lastOnScreenItemIndex, mListView.getSelectedItemPosition());
-        assertEquals(
-                getTopOfBottomFadingEdge(),
-                mListView.getSelectedView().getBottom());
-
-        // there should be a peeking view
-
-        // the current view isn't the last anymore...
-        assertEquals(mListView.getSelectedView(), mListView.getChildAt(mListView.getChildCount() - 2));
-
-        // peeking view is now last
-        final TextView view = (TextView) mListView.getChildAt(mListView.getChildCount() - 1);
-        assertEquals(mActivity.getValueAtPosition(lastOnScreenItemIndex + 1), view.getText());
-        assertFalse(view.isSelected());
-    }
-
-    @MediumTest
-    public void testMoveUpToItemRequiringScrolling() {
-        // go down to one past last item, then back up to the second item.  this will
-        // require scrolling to get it back on screen, and will need a peeking edge
-
-        int numItemsOnScreen = mListView.getChildCount();
-        for (int i = 0; i < numItemsOnScreen; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-        for (int i = 0; i < numItemsOnScreen - 1; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        }
-
-        assertEquals(1, mListView.getSelectedItemPosition());
-        assertEquals("top should be just below vertical fading edge",
-                mListView.getVerticalFadingEdgeLength() + mListView.getListPaddingTop(),
-                mListView.getSelectedView().getTop());
-    }
-
-    @MediumTest
-    public void testPressUpWhenAlreadyAtTop() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-
-        assertEquals(0, mListView.getSelectedItemPosition());
-    }
-
-    @MediumTest
-    public void testPressDownWhenAlreadyAtBottom() {
-        final int lastItemPosition = mListView.getAdapter().getCount() - 1;
-        for (int i = 0; i < lastItemPosition; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-        assertEquals(lastItemPosition, mListView.getSelectedItemPosition());
-
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        assertEquals(lastItemPosition, mListView.getSelectedItemPosition());
-    }
-
-    @MediumTest
-    public void testNoVerticalFadingEdgeWhenMovingToBottom() {
-        final int lastItemPosition = mListView.getAdapter().getCount() - 1;
-        for (int i = 0; i < lastItemPosition; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-        assertEquals(lastItemPosition, mListView.getSelectedItemPosition());
-
-        assertEquals("bottom of last item should be just above padding; no fading edge.",
-                mListView.getHeight() - mListView.getListPaddingBottom(),
-                mListView.getSelectedView().getBottom());
-
-    }
-
-    // the top of the bottom fading edge takes into account the list padding at the bottom,
-    // and the fading edge size
-    private int getTopOfBottomFadingEdge() {
-        return mListView.getHeight() - (mListView.getVerticalFadingEdgeLength() + mListView.getListPaddingBottom());
-    }
-
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListOfItemsTallerThanScreenTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListOfItemsTallerThanScreenTest.java
deleted file mode 100755
index 8a177d536400e96fe9457b0afb0e894994d161e7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListOfItemsTallerThanScreenTest.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.arrowscroll;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.ListView;
-import com.mediatek.common.widget.tests.listview.ListOfItemsTallerThanScreen;
-
-public class ListOfItemsTallerThanScreenTest
-        extends ActivityInstrumentationTestCase2<ListOfItemsTallerThanScreen> {
-
-    private ListView mListView;
-    private ListOfItemsTallerThanScreen mActivity;
-
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        mListView = getActivity().getListView();
-    }
-
-    public ListOfItemsTallerThanScreenTest() {
-        super(ListOfItemsTallerThanScreen.class);
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mListView);
-        assertEquals("should only be one visible child", 1, mListView.getChildCount());
-        final int amountOffScreen = mListView.getChildAt(0).getBottom() - (mListView.getBottom() - mListView.getListPaddingBottom());
-        assertTrue("must be more than max scroll off screen for this test to work",
-                amountOffScreen > mListView.getMaxScrollAmount());
-    }
-
-    @MediumTest
-    public void testScrollDownAcrossItem() {
-        final View view = mListView.getSelectedView();
-        assertTrue(view.isSelected());
-
-        assertEquals(mListView.getListPaddingTop(),
-                view.getTop());
-
-        assertTrue("view must be taller than screen for this test to be worth anything",
-                view.getBottom() > mListView.getBottom());
-
-        // scroll down until next view is peeking ahead
-        int numScrollsUntilNextViewVisible = getNumDownPressesToScrollDownAcrossSelected();
-
-        for (int i = 0; i < numScrollsUntilNextViewVisible; i++) {
-            assertEquals("after " + i + " down scrolls across tall item",
-                    mListView.getListPaddingTop() - mListView.getMaxScrollAmount() * i,
-                    view.getTop());
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-
-        // at this point, next view should be on screen peeking ahead, but we haven't given
-        // it selection yet
-        assertEquals("child count", 2, mListView.getChildCount());
-        assertEquals("selected position", 0, mListView.getSelectedItemPosition());
-        assertTrue("same view should be selected", view.isSelected());
-        final View peekingView = mListView.getChildAt(1);
-        assertEquals(view.getBottom(), peekingView.getTop());
-    }
-
-    @MediumTest
-    public void testScrollDownToNextItem() {
-        final int numPresses = getNumDownPressesToScrollDownAcrossSelected();
-        assertEquals(1, mListView.getChildCount());
-
-        for (int i = 0; i < numPresses; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-        // remember top of peeking child
-        final int topOfPeekingNext = mListView.getChildAt(1).getTop();
-
-        // next view is peeking, now press one more time
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-
-        // old view should not have selection
-        assertFalse(mListView.getChildAt(0).isSelected());
-
-        // next view should now have selection, and be scrolled another a third of the list
-        // height
-        assertEquals(2, mListView.getChildCount());
-        final View next = mListView.getChildAt(1);
-        assertTrue("has selection", next.isSelected());
-        assertEquals(topOfPeekingNext - (mListView.getMaxScrollAmount()), next.getTop());
-    }
-
-    @MediumTest
-    public void testScrollFirstItemOffScreen() {
-        int numDownsToGetFirstItemOffScreen =
-                (mListView.getSelectedView().getHeight() / mListView.getMaxScrollAmount()) + 1;
-
-        for (int i = 0; i < numDownsToGetFirstItemOffScreen; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-        getInstrumentation().waitForIdleSync();
-
-        assertEquals("should be at next item",
-                1, mListView.getSelectedItemPosition());
-
-        final int listTop = mListView.getTop() + mListView.getListPaddingTop();
-        assertTrue("top of selected view should be above top of list",
-                mListView.getSelectedView().getTop() < listTop);
-
-        assertEquals("off screen item shouldn't be a child of list view",
-                1, mListView.getChildCount());
-    }
-
-    @MediumTest
-    public void testScrollDownToLastItem() {
-        final int numItems = mListView.getAdapter().getCount();
-
-        int maxDowns = 20;
-        while (mListView.getSelectedItemPosition() < (numItems - 1)) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-            if (--maxDowns <= 0) {
-                fail("couldn't get to last item within 20 down arrows");
-            }
-        }
-        getInstrumentation().waitForIdleSync();
-
-        // press down enough times to get to bottom of last item
-        final int numDownsLeft = getNumDownPressesToScrollDownAcrossSelected();
-        assertTrue(numDownsLeft > 0);
-        for (int i = 0; i < numDownsLeft; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-        // one more time to get across last item
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        getInstrumentation().waitForIdleSync();
-
-        assertEquals(numItems - 1, mListView.getSelectedItemPosition());
-        final int realBottom = mListView.getHeight() - mListView.getListPaddingBottom();
-        assertEquals(realBottom, mListView.getSelectedView().getBottom());
-
-        assertEquals("views scrolled off screen should be removed from view group",
-                1, mListView.getChildCount());
-    }
-
-    @MediumTest
-    public void testScrollUpAcrossFirstItem() {
-        final int listTop = mListView.getListPaddingTop();
-        assertEquals(listTop, mListView.getSelectedView().getTop());
-        final int numPresses = getNumDownPressesToScrollDownAcrossSelected();
-        for (int i = 0; i < numPresses; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-        assertEquals(2, mListView.getChildCount());
-        for (int i = 0; i < numPresses; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-            assertEquals(1, mListView.getChildCount());
-        }
-        assertEquals(listTop, mListView.getSelectedView().getTop());
-    }
-
-    /**
-     * Assuming the selected view is overlapping the bottom edge, how many times
-     * do I have to press down to get beyond it so that either:
-     * a) the next view is peeking in
-     * b) the selected view is the last item in the list, and we are scrolled to the bottom
-     * @return
-     */
-    private int getNumDownPressesToScrollDownAcrossSelected() {
-        View selected = mListView.getSelectedView();
-        int realBottom = mListView.getBottom() - mListView.getListPaddingBottom();
-        assertTrue("view should be overlapping bottom",
-                selected.getBottom() > realBottom);
-        assertTrue("view should be overlapping bottom",
-                selected.getTop() < realBottom);
-
-        int pixelsOffScreen = selected.getBottom() - realBottom;
-        return (pixelsOffScreen / mListView.getMaxScrollAmount()) + 1;
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListOfShortShortTallShortShortTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListOfShortShortTallShortShortTest.java
deleted file mode 100755
index b2a1a5ff6efff847dd8b5089041709503517fcec..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListOfShortShortTallShortShortTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.arrowscroll;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
-import com.mediatek.common.widget.tests.util.ListUtil;
-import android.view.KeyEvent;
-import android.widget.ListView;
-import com.mediatek.common.widget.tests.listview.ListOfShortShortTallShortShort;
-
-public class ListOfShortShortTallShortShortTest extends ActivityInstrumentationTestCase2<ListOfShortShortTallShortShort> {
-    private ListView mListView;
-    private ListUtil mListUtil;
-
-    public ListOfShortShortTallShortShortTest() {
-        super(ListOfShortShortTallShortShort.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mListView = getActivity().getListView();
-        mListUtil = new ListUtil(mListView, getInstrumentation());
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertEquals("list item count", 5, mListView.getCount());
-        assertEquals("list visible child count", 3, mListView.getChildCount());
-        int firstTwoHeight = mListView.getChildAt(0).getHeight() + mListView.getChildAt(1).getHeight();
-        assertTrue("first two items should fit within fading edge",
-                firstTwoHeight <= mListView.getVerticalFadingEdgeLength());
-        assertTrue("first two items should fit within list max scroll",
-                firstTwoHeight <= mListView.getMaxScrollAmount());
-    }
-
-    @MediumTest
-    public void testFadeTopTwoItemsOut() {
-        // put 2nd item selected
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-
-        // one more to get two items scrolled off
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-
-        assertEquals("selected item position", 2, mListView.getSelectedItemPosition());
-        assertTrue("selected item top should be above list top",
-                mListView.getSelectedView().getTop() < mListUtil.getListTop());
-        assertTrue("selected item bottom should be below list bottom",
-                mListView.getSelectedView().getBottom() > mListUtil.getListBottom());
-        assertEquals("should only be 1 child of list (2 should have been scrolled off and removed",
-                1, mListView.getChildCount());
-    }
-
-    @MediumTest
-    public void testFadeInTwoBottomItems() {
-        // put 2nd item selected
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-
-        // one more to get two items scrolled off
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        assertEquals("number of list children", 1, mListView.getChildCount());
-
-        // last down brings bottom two items into view
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        assertEquals("should have scrolled two extra views onto screen",
-                3, mListView.getChildCount());
-        assertEquals("new view position", 3, mListView.getChildAt(1).getId());
-        assertEquals("new view position", 4, mListView.getChildAt(2).getId());
-
-        assertTrue("bottom most view shouldn't be above list bottom",
-                mListView.getChildAt(2).getBottom() >= mListUtil.getListBottom());
-    }
-
-    @MediumTest
-    public void testFadeOutBottomTwoItems() throws Exception {
-        mListUtil.arrowScrollToSelectedPosition(4);
-
-        // go up to tall item
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-
-        // one more time to scroll off bottom two items
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-
-
-        assertEquals("selected item position", 2, mListView.getSelectedItemPosition());
-        assertTrue("selected item top should be at or above list top",
-                mListView.getSelectedView().getTop() <= mListUtil.getListTop());
-        assertTrue("selected item bottom should be below list bottom",
-                mListView.getSelectedView().getBottom() > mListUtil.getListBottom());
-        assertEquals("should only be 1 child of list (2 should have been scrolled off and removed",
-                1, mListView.getChildCount());
-    }
-
-    @MediumTest
-    public void testFadeInTopTwoItems() throws Exception {
-        mListUtil.arrowScrollToSelectedPosition(4);
-
-        // put 2nd item selected
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-
-        // one more to get two items scrolled off
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        assertEquals("number of list children", 1, mListView.getChildCount());
-
-        // last down brings top two items into view
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        assertEquals("should have scrolled two extra views onto screen",
-                3, mListView.getChildCount());
-        assertEquals("new view position", 0, mListView.getChildAt(0).getId());
-        assertEquals("new view position", 1, mListView.getChildAt(1).getId());
-
-        assertTrue("top most view shouldn't be above list top",
-                mListView.getChildAt(0).getTop() <= mListUtil.getListTop());
-    }
-
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListOfShortTallShortTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListOfShortTallShortTest.java
deleted file mode 100755
index 46c530ec8e6ecfcd7af7b5216372705943fdfe33..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListOfShortTallShortTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.arrowscroll;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.ListView;
-import android.view.KeyEvent;
-import com.mediatek.common.widget.tests.listview.ListOfShortTallShort;
-
-public class ListOfShortTallShortTest extends ActivityInstrumentationTestCase<ListOfShortTallShort> {
-    private ListView mListView;
-
-    public ListOfShortTallShortTest() {
-        super("com.mediatek.common.widget.tests", ListOfShortTallShort.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mListView = getActivity().getListView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertTrue("second item should be taller than screen",
-                mListView.getChildAt(1).getHeight() > mListView.getHeight());
-    }
-
-    @MediumTest
-    public void testGoDownFromShortToTall() {
-        int topBeforeMove = mListView.getChildAt(1).getTop();
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-
-        assertEquals("selection should have moved to tall item below",
-                1, mListView.getSelectedItemPosition());
-        assertEquals("should not have scrolled; top should be the same.",
-                topBeforeMove,
-                mListView.getSelectedView().getTop());
-    }
-
-    @MediumTest
-    public void testGoUpFromShortToTall() {
-        int maxMoves = 8;
-        while (mListView.getSelectedItemPosition() != 2 && maxMoves > 0) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-        assertEquals("couldn't get to 3rd item",
-                2,
-                mListView.getSelectedItemPosition());
-
-        assertEquals("should only be two items on screen",
-                2, mListView.getChildCount());
-        assertEquals("selected item should be last item on screen",
-                mListView.getChildAt(1), mListView.getSelectedView());
-
-        final int bottomBeforeMove = mListView.getChildAt(0).getBottom();
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        assertEquals("should have moved selection to tall item above",
-                1, mListView.getSelectedItemPosition());
-        assertEquals("should not have scrolled, top should be the same",
-                bottomBeforeMove,
-                mListView.getChildAt(0).getBottom());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListOfThinItemsTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListOfThinItemsTest.java
deleted file mode 100755
index 951ca8d52b385a22baaf535637e9758506b08ca2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListOfThinItemsTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.arrowscroll;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.ListView;
-import com.mediatek.common.widget.tests.listview.ListOfThinItems;
-
-public class ListOfThinItemsTest extends ActivityInstrumentationTestCase<ListOfThinItems> {
-    private ListView mListView;
-
-    public ListOfThinItemsTest() {
-        super("com.mediatek.common.widget.tests", ListOfThinItems.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mListView = getActivity().getListView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mListView);
-        assertTrue("need item height less than fading edge length",
-                mListView.getSelectedView().getHeight() < mListView.getVerticalFadingEdgeLength());
-        assertTrue("need items off screen",
-                mListView.getChildCount() < mListView.getAdapter().getCount());
-    }
-
-    @LargeTest
-    public void testScrollToBottom() {
-        final int numItems = mListView.getAdapter().getCount();
-        final int listBottom = mListView.getHeight() - mListView.getListPaddingBottom();
-        for (int i = 0; i < numItems; i++) {
-            assertEquals("wrong selection at position " + i,
-                    i, mListView.getSelectedItemPosition());
-            final int bottomFadingEdge = listBottom - mListView.getVerticalFadingEdgeLength();
-            final View lastChild = mListView.getChildAt(mListView.getChildCount() - 1);
-            final int lastVisiblePosition = lastChild.getId();
-
-
-            int bottomThreshold = (lastVisiblePosition < mListView.getAdapter().getCount() - 1) ?
-                    bottomFadingEdge : listBottom;
-
-            String prefix = "after " + i + " down presses, ";
-
-            assertTrue(prefix + "selected item is below bottom threshold (fading edge or bottom as " +
-                    "appropriate)",
-                    mListView.getSelectedView().getBottom() <= bottomThreshold);
-            assertTrue(prefix + "first item in list must be at very top or just above",
-                    mListView.getChildAt(0).getTop() <= 0);
-            assertTrue(prefix + "last item in list should be at very bottom or just below",
-                    lastChild.getBottom() >= listBottom);
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-    }
-
-    @LargeTest
-    public void testScrollToTop() {
-        final int numItems = mListView.getAdapter().getCount();
-
-        for (int i = 0; i < numItems - 1; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-        assertEquals("should have moved to last position",
-                numItems - 1, mListView.getSelectedItemPosition());
-
-        int listTop = mListView.getListPaddingTop();
-        final int listBottom = mListView.getHeight() - mListView.getListPaddingBottom();
-
-        for (int i = 0; i < numItems; i++) {
-            int expectedPostion = numItems - (i + 1);
-            assertEquals("wrong selection at position " + expectedPostion,
-                    expectedPostion, mListView.getSelectedItemPosition());
-            final int topFadingEdge = listTop + mListView.getVerticalFadingEdgeLength();
-            final View firstChild = mListView.getChildAt(0);
-            final View lastChild = mListView.getChildAt(mListView.getChildCount() - 1);
-            final int firstVisiblePosition = firstChild.getId();
-
-
-            int topThreshold = (firstVisiblePosition > 0) ?
-                    topFadingEdge : listTop;
-
-            String prefix = "after " + i + " up presses, ";
-
-            assertTrue(prefix + "selected item is above top threshold (fading edge or top as " +
-                    "appropriate)",
-                    mListView.getSelectedView().getTop() >= topThreshold);
-            assertTrue(prefix + "first item in list must be at very top or just above",
-                    firstChild.getTop() <= 0);
-            assertTrue(prefix + "last item in list should be at very bottom or just below",
-                    lastChild.getBottom() >= listBottom);
-            sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListWithFirstScreenUnSelectableTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListWithFirstScreenUnSelectableTest.java
deleted file mode 100755
index 62f539c4b21a2ca3b6cb25585a1af21a59a9400c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListWithFirstScreenUnSelectableTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2008 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.arrowscroll;
-
-import com.mediatek.common.widget.tests.listview.ListWithFirstScreenUnSelectable;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.KeyEvent;
-import android.widget.ListView;
-import android.widget.AdapterView;
-
-public class ListWithFirstScreenUnSelectableTest
-        extends ActivityInstrumentationTestCase2<ListWithFirstScreenUnSelectable> {
-    private ListView mListView;
-
-    public ListWithFirstScreenUnSelectableTest() {
-        super("com.mediatek.common.widget.tests", ListWithFirstScreenUnSelectable.class);
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        setActivityInitialTouchMode(true);
-
-        mListView = getActivity().getListView();
-    }
-
-    public void testPreconditions() {
-        assertTrue(mListView.isInTouchMode());
-        assertEquals(1, mListView.getChildCount());
-        assertFalse(mListView.getAdapter().isEnabled(0));
-        assertEquals(AdapterView.INVALID_POSITION, mListView.getSelectedItemPosition());
-    }
-
-    public void testRessurectSelection() {
-        sendKeys(KeyEvent.KEYCODE_SPACE);
-        assertEquals(AdapterView.INVALID_POSITION, mListView.getSelectedItemPosition());
-    }
-
-    public void testScrollUpDoesNothing() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        assertEquals(AdapterView.INVALID_POSITION, mListView.getSelectedItemPosition());
-        assertEquals(1, mListView.getChildCount());
-        assertEquals(0, mListView.getFirstVisiblePosition());
-    }
-
-    public void testScrollDownPansNextItemOn() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        assertEquals(2, mListView.getChildCount());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListWithNoFadingEdgeTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListWithNoFadingEdgeTest.java
deleted file mode 100755
index 7b70b63732a0a9859403eb23daef6ee387914260..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListWithNoFadingEdgeTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.arrowscroll;
-
-import com.mediatek.common.widget.tests.listview.ListWithNoFadingEdge;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.ListView;
-import android.view.KeyEvent;
-
-public class ListWithNoFadingEdgeTest extends ActivityInstrumentationTestCase<ListWithNoFadingEdge> {
-
-    private ListView mListView;
-
-    public ListWithNoFadingEdgeTest() {
-        super("com.mediatek.common.widget.tests", ListWithNoFadingEdge.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mListView = getActivity().getListView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mListView);
-        assertEquals("listview vertical fading edge", 0, mListView.getVerticalFadingEdgeLength());
-        assertTrue("expecting that not all views fit on screen",
-                mListView.getChildCount() < mListView.getCount());
-    }
-
-    @MediumTest
-    public void testScrollDownToBottom() {
-        final int numItems = mListView.getCount();
-
-        for (int i = 0; i < numItems; i++) {
-            assertEquals("selected position", i, mListView.getSelectedItemPosition());
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-        assertEquals("selected position", numItems - 1, mListView.getSelectedItemPosition());
-    }
-
-    @LargeTest
-    public void testScrollFromBottomToTop() {
-        final int numItems = mListView.getCount();
-
-        getActivity().runOnUiThread(new Runnable() {
-            public void run() {
-                mListView.setSelection(numItems - 1);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-
-        for (int i = numItems - 1; i >= 0; i--) {
-            assertEquals(i, mListView.getSelectedItemPosition());
-            sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        }
-
-        assertEquals("selected position", 0, mListView.getSelectedItemPosition());
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListWithOffScreenNextSelectableTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListWithOffScreenNextSelectableTest.java
deleted file mode 100755
index c531620b4417ea05ccefd73a90f628a6f5c6543d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListWithOffScreenNextSelectableTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.arrowscroll;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.ListView;
-import android.widget.TextView;
-import com.mediatek.common.widget.tests.listview.ListWithOffScreenNextSelectable;
-
-public class ListWithOffScreenNextSelectableTest
-        extends ActivityInstrumentationTestCase<ListWithOffScreenNextSelectable> {
-    private ListView mListView;
-
-    public ListWithOffScreenNextSelectableTest() {
-        super("com.mediatek.common.widget.tests", ListWithOffScreenNextSelectable.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mListView = getActivity().getListView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mListView);
-        assertEquals(5, mListView.getAdapter().getCount());
-        assertFalse(mListView.getAdapter().areAllItemsEnabled());
-        assertFalse(mListView.getAdapter().isEnabled(1));
-        assertFalse(mListView.getAdapter().isEnabled(2));
-        assertFalse(mListView.getAdapter().isEnabled(3));
-        assertEquals("only 4 children should be on screen (so that next selectable is off " +
-                "screen) for this test to be meaningful.",
-                4, mListView.getChildCount());
-        assertEquals(0, mListView.getSelectedItemPosition());
-    }
-
-    // when the next items on screen are not selectable, we pan until the next selectable item
-    // is (partially visible), then we jump to it
-    @MediumTest
-    public void testGoDownToOffScreenSelectable() {
-
-        final int listBottom = mListView.getHeight() - mListView.getListPaddingBottom();
-
-        final View lastVisibleView = mListView.getChildAt(mListView.getChildCount() - 1);
-
-        /// M: KK changes its behavior, only one key event can move to the selectable item
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        assertEquals("selection should have moved",
-                4, mListView.getSelectedItemPosition());
-        assertEquals("wrong view created when scrolling",
-                getActivity().getValueAtPosition(4), ((TextView) mListView.getSelectedView()).getText());
-        assertEquals(listBottom, mListView.getSelectedView().getBottom());
-    }
-
-    @MediumTest
-    public void testGoUpToOffScreenSelectable() {
-        final int listBottom = mListView.getHeight() - mListView.getListPaddingBottom();
-        final int listTop = mListView.getListPaddingTop();
-
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-
-        assertEquals(4, mListView.getSelectedItemPosition());
-        assertEquals(listBottom, mListView.getSelectedView().getBottom());
-
-        // now we have the reverse situation: the next selectable position upward is off screen
-        final View firstVisibleView = mListView.getChildAt(0);
-
-        /// M: KK changes its behavior, only one key event can move to the selectable item
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        assertEquals("selection should have moved",
-                0, mListView.getSelectedItemPosition());
-        assertEquals(getActivity().getValueAtPosition(0), ((TextView) mListView.getSelectedView()).getText());
-        assertEquals(listTop, mListView.getSelectedView().getTop());
-
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListWithOnItemSelectedActionTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListWithOnItemSelectedActionTest.java
deleted file mode 100755
index d4af7316e95beed20a3fa745ec114c0513f4dfb3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListWithOnItemSelectedActionTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.arrowscroll;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.view.KeyEvent;
-import com.mediatek.common.widget.tests.listview.ListWithOnItemSelectedAction;
-
-public class ListWithOnItemSelectedActionTest extends ActivityInstrumentationTestCase<ListWithOnItemSelectedAction> {
-    private ListView mListView;
-
-    public ListWithOnItemSelectedActionTest() {
-        super("com.mediatek.common.widget.tests", ListWithOnItemSelectedAction.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mListView = getActivity().getListView();
-    }
-
-    private String getValueOfSelectedTextView() {
-        return ((TextView) mListView.getSelectedView()).getText().toString();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertEquals(0, mListView.getSelectedItemPosition());
-        assertEquals("header text field should be echoing contents of selected item",
-                getValueOfSelectedTextView(),
-                getActivity().getHeaderValue());
-    }
-
-    @MediumTest
-    public void testHeaderEchoesSelectionAfterMove() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-
-        assertEquals(1, mListView.getSelectedItemPosition());
-        assertEquals("header text field should be echoing contents of selected item",
-                getValueOfSelectedTextView(),
-                getActivity().getHeaderValue());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListWithScreenOfNoSelectablesTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListWithScreenOfNoSelectablesTest.java
deleted file mode 100755
index a379e4215b4b478bee6ad3998e67d9e4ffcc609f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListWithScreenOfNoSelectablesTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.arrowscroll;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.ListView;
-import com.mediatek.common.widget.tests.listview.ListWithScreenOfNoSelectables;
-
-public class ListWithScreenOfNoSelectablesTest extends ActivityInstrumentationTestCase2<ListWithScreenOfNoSelectables> {
-
-    private ListView mListView;
-
-    public ListWithScreenOfNoSelectablesTest() {
-        super(ListWithScreenOfNoSelectables.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mListView = getActivity().getListView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertTrue("expecting first position to be selectable",
-                mListView.getAdapter().isEnabled(0));
-        final int numItems = mListView.getCount();
-        for (int i = 1; i < numItems; i++) {
-            assertFalse("expecting item to be unselectable (index " + i + ")",
-                    mListView.getAdapter().isEnabled(i));
-        }
-        assertTrue("expecting that not all views fit on screen",
-                mListView.getChildCount() < mListView.getCount());
-    }
-
-
-    @MediumTest
-    public void testGoFromSelectedViewExistsToNoSelectedViewExists() {
-
-        // go down until first (and only selectable) item is off screen
-        View first = mListView.getChildAt(0);
-        while (first.getParent() != null) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-
-        // nothing should be selected
-        assertEquals("selected position", ListView.INVALID_POSITION, mListView.getSelectedItemPosition());
-        assertNull("selected view", mListView.getSelectedView());
-    }
-
-    @MediumTest
-    public void testPanDownAcrossUnselectableChildrenToBottom() {
-        final int lastPosition = mListView.getCount() - 1;
-        final int maxDowns = 20;
-        for (int count = 0; count < maxDowns && mListView.getLastVisiblePosition() <= lastPosition; count++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-        assertEquals("last visible position not the last position in the list even "
-                + "after " + maxDowns + " downs", lastPosition, mListView.getLastVisiblePosition());
-    }
-
-    @MediumTest
-    public void testGoFromNoSelectionToSelectionExists() {
-        // go down untile first (and only selectable) item is off screen
-        View first = mListView.getChildAt(0);
-        while (first.getParent() != null) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-
-        // nothing should be selected
-        assertEquals("selected position", ListView.INVALID_POSITION, mListView.getSelectedItemPosition());
-        assertNull("selected view", mListView.getSelectedView());
-
-        // go up once to bring the selectable back on screen
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        assertEquals("first visible position", 0, mListView.getFirstVisiblePosition());
-        assertEquals("selected position", ListView.INVALID_POSITION, mListView.getSelectedItemPosition());
-
-
-        // up once more should give it selection
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        assertEquals("selected position", 0, mListView.getSelectedItemPosition());
-
-    }
-
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListWithSeparatorsTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListWithSeparatorsTest.java
deleted file mode 100755
index f7a970731e40a04ac04b9f76fc4d16424156f450..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/arrowscroll/ListWithSeparatorsTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.arrowscroll;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.ListView;
-import android.view.KeyEvent;
-import com.mediatek.common.widget.tests.listview.ListWithSeparators;
-
-public class ListWithSeparatorsTest extends ActivityInstrumentationTestCase<ListWithSeparators> {
-    private ListWithSeparators mActivity;
-    private ListView mListView;
-
-    public ListWithSeparatorsTest() {
-        super("com.mediatek.common.widget.tests", ListWithSeparators.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mListView = getActivity().getListView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mListView);
-        assertFalse(mListView.getAdapter().areAllItemsEnabled());
-        assertFalse(mListView.getAdapter().isEnabled(0));
-        assertFalse(mListView.getAdapter().isEnabled(2));
-        assertEquals(1, mListView.getSelectedItemPosition());
-    }
-
-    @MediumTest
-    public void testGoingUpDoesnNotHitUnselectableItem() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        assertEquals("selected position should remain the same",
-                1, mListView.getSelectedItemPosition());
-
-        assertEquals("seperator should be scrolled flush with top",
-                mListView.getListPaddingTop(), mListView.getChildAt(0).getTop());
-    }
-
-    @MediumTest
-    public void testGoingDownSkipsOverUnselectable() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        assertEquals("should have skipped to next selectable ",
-                3,
-                mListView.getSelectedItemPosition());
-    }
-
-    @MediumTest
-    public void testGoingUpSkippingOverUnselectable() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        assertEquals(1, mListView.getSelectedItemPosition());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/focus/AdjacentListsWithAdjacentISVsInsideTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/focus/AdjacentListsWithAdjacentISVsInsideTest.java
deleted file mode 100755
index 185c6f9d85830979081604ca594f4fa6c1ca4d8d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/focus/AdjacentListsWithAdjacentISVsInsideTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.focus;
-
-import com.mediatek.common.widget.tests.listview.AdjacentListsWithAdjacentISVsInside;
-import com.mediatek.common.widget.tests.util.InternalSelectionView;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-import android.widget.ListView;
-
-public class AdjacentListsWithAdjacentISVsInsideTest extends ActivityInstrumentationTestCase<AdjacentListsWithAdjacentISVsInside> {
-
-    private ListView mLeftListView;
-    private InternalSelectionView mLeftIsv;
-    private InternalSelectionView mLeftMiddleIsv;
-    private ListView mRightListView;
-    private InternalSelectionView mRightMiddleIsv;
-    private InternalSelectionView mRightIsv;
-
-    public AdjacentListsWithAdjacentISVsInsideTest() {
-        super("com.mediatek.common.widget.tests", AdjacentListsWithAdjacentISVsInside.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        final AdjacentListsWithAdjacentISVsInside a = getActivity();
-        mLeftListView = a.getLeftListView();
-        mLeftIsv = a.getLeftIsv();
-        mLeftMiddleIsv = a.getLeftMiddleIsv();
-        mRightListView = a.getRightListView();
-        mRightMiddleIsv = a.getRightMiddleIsv();
-        mRightIsv = a.getRightIsv();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertTrue(mLeftListView.hasFocus());
-        assertTrue(mLeftIsv.isFocused());
-        assertEquals(0, mLeftIsv.getSelectedRow());
-    }
-
-    /**
-     * rockinist test name to date!
-     */
-    @MediumTest
-    public void testFocusedRectAndFocusHintWorkWithinListItemHorizontal() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        assertEquals(1, mLeftIsv.getSelectedRow());
-
-        sendKeys(KeyEvent.KEYCODE_DPAD_RIGHT);
-        assertTrue(mLeftListView.hasFocus());
-        assertTrue(mLeftMiddleIsv.isFocused());
-        assertEquals("mLeftMiddleIsv.getSelectedRow()", 1, mLeftMiddleIsv.getSelectedRow());
-
-        sendKeys(KeyEvent.KEYCODE_DPAD_LEFT);
-        assertTrue(mLeftIsv.isFocused());
-        assertEquals("mLeftIsv.getSelectedRow()", 1, mLeftIsv.getSelectedRow());
-    }
-
-    @MediumTest
-    public void testFocusTransfersOutsideOfListWhenNoCandidateInsideHorizontal() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN, KeyEvent.KEYCODE_DPAD_DOWN, KeyEvent.KEYCODE_DPAD_RIGHT);
-
-        assertTrue(mLeftListView.hasFocus());
-        assertTrue(mLeftMiddleIsv.isFocused());
-        assertEquals(2, mLeftMiddleIsv.getSelectedRow());
-
-        sendKeys(KeyEvent.KEYCODE_DPAD_RIGHT);
-        assertTrue("mRightListView.hasFocus()", mRightListView.hasFocus());
-        assertTrue("mRightMiddleIsv.isFocused()", mRightMiddleIsv.isFocused());
-
-
-        /// M: fix failure cases
-        // assertEquals("mRightMiddleIsv.getSelectedRow()", 2, mRightMiddleIsv.getSelectedRow());
-        assertEquals("mRightMiddleIsv.getSelectedRow()", 0, mRightMiddleIsv.getSelectedRow());
-
-
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/focus/ListButtonsDiagonalAcrossItemsTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/focus/ListButtonsDiagonalAcrossItemsTest.java
deleted file mode 100755
index c3947b9268acd6ec5fd39943203ef44a53501ee2..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/focus/ListButtonsDiagonalAcrossItemsTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.focus;
-
-import com.mediatek.common.widget.tests.listview.ListButtonsDiagonalAcrossItems;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.FocusFinder;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ListView;
-
-/**
- * Test that ListView will override default behavior of focus searching to
- * make sure going right and left doesn't change selection
- */
-public class ListButtonsDiagonalAcrossItemsTest extends ActivityInstrumentationTestCase<ListButtonsDiagonalAcrossItems> {
-
-    private Button mLeftButton;
-    private Button mCenterButton;
-    private Button mRightButton;
-    private ListView mListView;
-
-    public ListButtonsDiagonalAcrossItemsTest() {
-        super("com.mediatek.common.widget.tests", ListButtonsDiagonalAcrossItems.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mLeftButton = getActivity().getLeftButton();
-        mCenterButton = getActivity().getCenterButton();
-        mRightButton = getActivity().getRightButton();
-
-        mListView = getActivity().getListView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        final ListView lv = mListView;
-        assertEquals("num children", 3, lv.getChildCount());
-
-        assertEquals("selected position", 0, lv.getSelectedItemPosition());
-        assertTrue("left button focused", mLeftButton.isFocused());
-
-        assertTrue("left left of center",
-                mLeftButton.getRight()
-                        < mCenterButton.getLeft());
-
-        assertTrue("center left of right",
-                mCenterButton.getRight()
-                        < mRightButton.getLeft());
-
-        assertEquals("focus search right from left button should be center button",
-            mCenterButton,
-            FocusFinder.getInstance().findNextFocus(mListView, mLeftButton, View.FOCUS_RIGHT));
-        assertEquals("focus search right from center button should be right button",
-            mRightButton,
-            FocusFinder.getInstance().findNextFocus(mListView, mCenterButton, View.FOCUS_RIGHT));
-        assertEquals("focus search left from centr button should be left button",
-            mLeftButton,
-            FocusFinder.getInstance().findNextFocus(mListView, mCenterButton, View.FOCUS_LEFT));
-    }
-
-    @MediumTest
-    public void testGoingRightDoesNotChangeSelection() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_RIGHT);
-
-        assertEquals("selected position shouldn't have changed",
-                0,
-                mListView.getSelectedItemPosition());
-        assertTrue("left should still be focused", mLeftButton.isFocused());
-    }
-
-    @MediumTest
-    public void testGoingLeftDoesNotChangeSelection() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        assertEquals("list view postion", 1, mListView.getSelectedItemPosition());
-        assertTrue("mCenterButton.isFocused()", mCenterButton.isFocused());
-
-        sendKeys(KeyEvent.KEYCODE_DPAD_LEFT);
-        assertEquals("selected position shouldn't have changed",
-                1,
-                mListView.getSelectedItemPosition());
-        assertTrue("center should still be focused", mCenterButton.isFocused());
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/focus/ListHorizontalFocusWithinItemWinsTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/focus/ListHorizontalFocusWithinItemWinsTest.java
deleted file mode 100755
index bd4b86f8b96f441ea6384302281f209d97c49648..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/focus/ListHorizontalFocusWithinItemWinsTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.focus;
-
-import com.mediatek.common.widget.tests.listview.ListHorizontalFocusWithinItemWins;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.FocusFinder;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ListView;
-
-public class ListHorizontalFocusWithinItemWinsTest extends ActivityInstrumentationTestCase<ListHorizontalFocusWithinItemWins> {
-
-    private ListView mListView;
-    private Button mTopLeftButton;
-    private Button mTopRightButton;
-    private Button mBottomMiddleButton;
-
-    public ListHorizontalFocusWithinItemWinsTest() {
-        super("com.mediatek.common.widget.tests", ListHorizontalFocusWithinItemWins.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mListView = getActivity().getListView();
-        mTopLeftButton = getActivity().getTopLeftButton();
-        mTopRightButton = getActivity().getTopRightButton();
-        mBottomMiddleButton = getActivity().getBottomMiddleButton();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertEquals("list position", 0, mListView.getSelectedItemPosition());
-        assertTrue("mTopLeftButton.isFocused()", mTopLeftButton.isFocused());
-        assertEquals("global focus search to right from top left is bottom middle",
-                mBottomMiddleButton,
-                FocusFinder.getInstance().findNextFocus(mListView, mTopLeftButton, View.FOCUS_RIGHT));
-        assertEquals("global focus search to left from top right is bottom middle",
-                mBottomMiddleButton,
-                FocusFinder.getInstance().findNextFocus(mListView, mTopRightButton, View.FOCUS_LEFT));
-    }
-
-    @MediumTest
-    public void testOptionWithinItemTrumpsGlobal() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_RIGHT);
-
-        assertEquals("list position", 0, mListView.getSelectedItemPosition());
-        assertTrue("mTopRightButton.isFocused()", mTopRightButton.isFocused());
-
-        sendKeys(KeyEvent.KEYCODE_DPAD_LEFT);
-        assertEquals("list position", 0, mListView.getSelectedItemPosition());
-        assertTrue("mTopLeftButton.isFocused()", mTopLeftButton.isFocused());
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/focus/ListWithEditTextHeaderTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/focus/ListWithEditTextHeaderTest.java
deleted file mode 100755
index 3100bd7da0dd45ffa9fc59ff434234c980095828..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/focus/ListWithEditTextHeaderTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.focus;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.FlakyTest;
-import android.test.TouchUtils;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.AbsListView;
-import android.widget.ListView;
-import com.mediatek.common.widget.tests.listview.ListWithEditTextHeader;
-
-public class ListWithEditTextHeaderTest extends ActivityInstrumentationTestCase2<ListWithEditTextHeader> {
-    private ListView mListView;
-
-    public ListWithEditTextHeaderTest() {
-        super(ListWithEditTextHeader.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mListView = getActivity().getListView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertTrue("listview.getItemsCanFocus()", mListView.getItemsCanFocus());
-        assertFalse("out of touch-mode", mListView.isInTouchMode());
-        assertEquals("header view count", 1, mListView.getHeaderViewsCount());
-        assertTrue("header does not have focus", mListView.getChildAt(0).isFocused());
-    }
-
-    @FlakyTest(tolerance = 2)
-    @LargeTest
-    public void testClickingHeaderKeepsFocus() {
-        TouchUtils.clickView(this, mListView.getChildAt(0));
-        assertTrue("header does not have focus", mListView.getChildAt(0).isFocused());
-        assertEquals("something is selected", AbsListView.INVALID_POSITION, mListView.getSelectedItemPosition());
-    }
-    /* Test Case Fail
-    @LargeTest
-    public void testClickingHeaderWhenOtherItemHasFocusGivesHeaderFocus() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        assertEquals("selected position", 1, mListView.getSelectedItemPosition());
-        TouchUtils.clickView(this, mListView.getChildAt(0));
-        assertTrue("header does not have focus", mListView.getChildAt(0).isFocused());
-        assertEquals("something is selected", AbsListView.INVALID_POSITION, mListView.getSelectedItemPosition());
-    }
-    */
-
-    @LargeTest
-    public void testScrollingDoesNotDetachHeaderViewFromWindow() {
-        View header = mListView.getChildAt(0);
-        assertNotNull("header is not attached to a window (?!)", header.getWindowToken());
-
-        // Scroll header off the screen and back onto the screen
-        int numItemsOnScreen = mListView.getChildCount();
-        for (int i = 0; i < numItemsOnScreen; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-        for (int i = 0; i < numItemsOnScreen; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        }
-
-        // Make sure the header was not accidentally left detached from its window
-        assertNotNull("header has lost its window", header.getWindowToken());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/touch/ListGetSelectedViewTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/touch/ListGetSelectedViewTest.java
deleted file mode 100755
index f4ed4ccb7e6784a2fe9483ac46e7afba39feeb64..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/touch/ListGetSelectedViewTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.touch;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.TouchUtils;
-import android.widget.ListView;
-import android.view.View;
-
-import com.mediatek.common.widget.tests.listview.ListGetSelectedView;
-
-/**
- * This test is made to check that getSelectedView() will return
- * null in touch mode.
- */
-public class ListGetSelectedViewTest extends ActivityInstrumentationTestCase<ListGetSelectedView> {
-    private ListGetSelectedView mActivity;
-    private ListView mListView;
-
-    public ListGetSelectedViewTest() {
-        super("com.mediatek.common.widget.tests", ListGetSelectedView.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mListView = getActivity().getListView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mListView);
-
-        assertEquals(0, mListView.getSelectedItemPosition());
-    }
-
-    @LargeTest
-    public void testGetSelectedView() {
-        View last = mListView.getChildAt(1);
-        TouchUtils.clickView(this, last);
-
-        assertNull(mListView.getSelectedItem());
-        assertNull(mListView.getSelectedView());
-        assertEquals(-1, mListView.getSelectedItemPosition());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/touch/ListOfTouchablesTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/touch/ListOfTouchablesTest.java
deleted file mode 100755
index 76b62c159249767c33385852382ff2bbf4b0d42f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/touch/ListOfTouchablesTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.touch;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.widget.ListView;
-
-import com.mediatek.common.widget.tests.listview.ListOfTouchables;
-import android.test.TouchUtils;
-
-
-/// M: [ALPS00428138] get context for ViewConfiguration
-import android.content.Context;
-
-/**
- * Touch tests for a list where all of the items fit on the screen.
- */
-public class ListOfTouchablesTest extends ActivityInstrumentationTestCase<ListOfTouchables> {
-    private ListOfTouchables mActivity;
-    private ListView mListView;
-
-    /// M: [ALPS00428138] get context for ViewConfiguration
-    private ViewConfiguration mViewConfig;
-
-    public ListOfTouchablesTest() {
-        super("com.mediatek.common.widget.tests", ListOfTouchables.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mListView = getActivity().getListView();
-
-        /// M: [ALPS00428138] get context for ViewConfiguration
-        final Context context = mActivity.getApplicationContext();
-        mViewConfig = ViewConfiguration.get(context);
-
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mListView);
-    }
-
-    // TODO: needs to be adjusted to pass on non-HVGA displays
-    // @LargeTest
-    public void testShortScroll() {
-        View firstChild = mListView.getChildAt(0);
-        View lastChild = mListView.getChildAt(mListView.getChildCount() - 1);
-
-        int firstTop = firstChild.getTop();
-
-        /// M: [ALPS00428138] fix failure cases @{
-        //TouchUtils.dragViewBy(this, lastChild, Gravity.TOP | Gravity.LEFT,
-        //        0, -(ViewConfiguration.getTouchSlop() + 1 + 10));
-        TouchUtils.dragViewBy(this, lastChild, Gravity.TOP | Gravity.LEFT,
-                  0, -(mViewConfig.getScaledTouchSlop() + 10));
-
-        /// @}
-
-
-        View newFirstChild = mListView.getChildAt(0);
-
-        assertEquals("View scrolled too early", firstTop, newFirstChild.getTop() + 10 + 1);
-        assertEquals("Wrong view in first position", 0, newFirstChild.getId());
-    }
-
-    // TODO: needs to be adjusted to pass on non-HVGA displays
-    // @LargeTest
-    public void testLongScroll() {
-        View lastChild = mListView.getChildAt(mListView.getChildCount() - 1);
-
-        int lastTop = lastChild.getTop();
-
-        int distance = TouchUtils.dragViewToY(this, lastChild,
-                Gravity.TOP | Gravity.LEFT, mListView.getTop());
-
-        /// M: [ALPS00428138] fix failure cases @{
-        //assertEquals("View scrolled to wrong position",
-        //        lastTop - (distance - ViewConfiguration.getTouchSlop() - 1), lastChild.getTop());
-        assertEquals("View scrolled to wrong position",
-                  lastTop - (distance - mViewConfig.getScaledTouchSlop()), lastChild.getTop());
-
-        /// @}
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/touch/ListSetSelectionTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/touch/ListSetSelectionTest.java
deleted file mode 100755
index f1370e560e4a94452b21dc9f7e1ea3838ad5c797..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/touch/ListSetSelectionTest.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.touch;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.TouchUtils;
-import android.view.View;
-import android.widget.ListView;
-
-import com.mediatek.common.widget.tests.listview.ListSimple;
-
-/**
- * Tests setting the selection in touch mode
- */
-public class ListSetSelectionTest extends ActivityInstrumentationTestCase<ListSimple> {
-    private ListSimple mActivity;
-    private ListView mListView;
-
-    public ListSetSelectionTest() {
-        super("com.mediatek.common.widget.tests", ListSimple.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mListView = getActivity().getListView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mListView);
-    }
-
-    @LargeTest
-    public void testSetSelection() {
-        TouchUtils.dragQuarterScreenDown(this);
-        TouchUtils.dragQuarterScreenUp(this);
-
-        // Nothing should be selected
-        assertEquals("Selection still available after touch", -1,
-                mListView.getSelectedItemPosition());
-
-        final int targetPosition = mListView.getAdapter().getCount() / 2;
-
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mListView.setSelection(targetPosition);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-
-        boolean found = false;
-        int childCount = mListView.getChildCount();
-        for (int i = 0; i < childCount; i++) {
-            View child = mListView.getChildAt(i);
-            if (child.getId() == targetPosition) {
-                found = true;
-                break;
-            }
-        }
-        assertTrue("Selected item not visible in list", found);
-    }
-
-    @LargeTest
-    public void testSetSelectionFromTop() {
-        TouchUtils.dragQuarterScreenDown(this);
-        TouchUtils.dragQuarterScreenUp(this);
-
-        // Nothing should be selected
-        assertEquals("Selection still available after touch", -1,
-                mListView.getSelectedItemPosition());
-
-        final int targetPosition = mListView.getAdapter().getCount() / 2;
-
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mListView.setSelectionFromTop(targetPosition, 100);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-
-        View target = null;
-        boolean found = false;
-        int childCount = mListView.getChildCount();
-        for (int i = 0; i < childCount; i++) {
-            View child = mListView.getChildAt(i);
-            if (child.getId() == targetPosition) {
-                target = child;
-                found = true;
-                break;
-            }
-        }
-        assertTrue("Selected item not visible in list", found);
-
-        if (target != null) {
-            assertEquals("Selection not at correct location", 100 + mListView.getPaddingTop(),
-                    target.getTop());
-        }
-    }
-
-    @LargeTest
-    public void testSetSelection0() {
-        TouchUtils.dragQuarterScreenDown(this);
-        TouchUtils.dragQuarterScreenDown(this);
-        TouchUtils.dragQuarterScreenDown(this);
-
-        // Nothing should be selected
-        assertEquals("Selection still available after touch", -1,
-                mListView.getSelectedItemPosition());
-
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mListView.setSelection(0);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-
-        boolean found = false;
-        int childCount = mListView.getChildCount();
-        for (int i = 0; i < childCount; i++) {
-            View child = mListView.getChildAt(i);
-            if (child.getId() == 0 && i == 0) {
-                found = true;
-                break;
-            }
-        }
-        assertTrue("Selected item not visible in list", found);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/touch/ListTouchBottomGravityManyTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/touch/ListTouchBottomGravityManyTest.java
deleted file mode 100755
index 09cfdbae54b6779c27d52e3df93e1acfd5e8d50c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/touch/ListTouchBottomGravityManyTest.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.touch;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.TouchUtils;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.widget.ListView;
-
-import com.mediatek.common.widget.tests.listview.ListBottomGravityMany;
-
-/// M: [ALPS00428138] get context for ViewConfiguration
-import android.content.Context;
-
-/**
- * Touch tests for a list where all of the items do not fit on the screen, and the list
- * stacks from the bottom.
- */
-public class ListTouchBottomGravityManyTest extends ActivityInstrumentationTestCase<ListBottomGravityMany> {
-    private ListBottomGravityMany mActivity;
-    private ListView mListView;
-
-    /// M: [ALPS00428138] get context for ViewConfiguration
-    private ViewConfiguration mViewConfig;
-
-
-    public ListTouchBottomGravityManyTest() {
-        super("com.mediatek.common.widget.tests", ListBottomGravityMany.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mListView = getActivity().getListView();
-
-        /// M: [ALPS00428138] get context for ViewConfiguration
-        final Context context = mActivity.getApplicationContext();
-        mViewConfig = ViewConfiguration.get(context);
-
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mListView);
-
-        // Last item should be selected
-        assertEquals(mListView.getAdapter().getCount() - 1, mListView.getSelectedItemPosition());
-    }
-
-    @LargeTest
-    public void testPullDown() {
-        int originalCount = mListView.getChildCount();
-
-        TouchUtils.scrollToTop(this, mListView);
-
-        // Nothing should be selected
-        assertEquals("Selection still available after touch", -1,
-                mListView.getSelectedItemPosition());
-
-        View firstChild = mListView.getChildAt(0);
-
-        assertEquals("Item zero not the first child in the list", 0, firstChild.getId());
-
-        assertEquals("Item zero not at the top of the list", mListView.getListPaddingTop(),
-                firstChild.getTop());
-
-        assertTrue(String.format("Too many children created: %d expected no more than %d",
-                mListView.getChildCount(), originalCount + 1),
-                mListView.getChildCount() <= originalCount + 1);
-    }
-
-    @MediumTest
-    public void testPushUp() {
-        TouchUtils.scrollToBottom(this, mListView);
-
-        // Nothing should be selected
-        assertEquals("Selection still available after touch", -1,
-                mListView.getSelectedItemPosition());
-
-        View lastChild = mListView.getChildAt(mListView.getChildCount() - 1);
-
-        assertEquals("List is not scrolled to the bottom", mListView.getAdapter().getCount() - 1,
-                lastChild.getId());
-
-        assertEquals("Last item is not touching the bottom edge",
-                mListView.getHeight() - mListView.getListPaddingBottom(), lastChild.getBottom());
-    }
-
-    @MediumTest
-    public void testNoScroll() {
-        View firstChild = mListView.getChildAt(0);
-        View lastChild = mListView.getChildAt(mListView.getChildCount() - 1);
-
-        int lastTop = lastChild.getTop();
-
-        /// M: [ALPS00428138] fix failure cases @{
-        //TouchUtils.dragViewBy(this, firstChild, Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL,
-        //        0, ViewConfiguration.getTouchSlop());
-        TouchUtils.dragViewBy(this, firstChild, Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL,
-                  0, mViewConfig.getScaledTouchSlop() - 1);
-        /// @}
-
-        View newLastChild = mListView.getChildAt(mListView.getChildCount() - 1);
-
-        assertEquals("View scrolled too early", lastTop, newLastChild.getTop());
-        assertEquals("Wrong view in last position", mListView.getAdapter().getCount() - 1,
-                newLastChild.getId());
-    }
-
-    // TODO: needs to be adjusted to pass on non-HVGA displays
-    // @LargeTest
-    public void testShortScroll() {
-        View firstChild = mListView.getChildAt(0);
-        if (firstChild.getTop() < this.mListView.getListPaddingTop()) {
-            firstChild = mListView.getChildAt(1);
-        }
-
-        View lastChild = mListView.getChildAt(mListView.getChildCount() - 1);
-
-        int lastTop = lastChild.getTop();
-
-        /// M: [ALPS00428138] fix failure cases @{
-        //TouchUtils.dragViewBy(this, firstChild, Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL,
-        //        0, ViewConfiguration.getTouchSlop() + 1 + 10);
-        TouchUtils.dragViewBy(this, firstChild, Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL,
-                0, mViewConfig.getScaledTouchSlop() + 10);
-        /// @}
-
-        View newLastChild = mListView.getChildAt(mListView.getChildCount() - 1);
-
-        assertEquals("View scrolled to wrong position", lastTop, newLastChild.getTop() - 10);
-        assertEquals("Wrong view in last position", mListView.getAdapter().getCount() - 1,
-                newLastChild.getId());
-    }
-
-    // TODO: needs to be adjusted to pass on non-HVGA displays
-    // @LargeTest
-    public void testLongScroll() {
-        View firstChild = mListView.getChildAt(0);
-        if (firstChild.getTop() < mListView.getListPaddingTop()) {
-            firstChild = mListView.getChildAt(1);
-        }
-
-        int firstTop = firstChild.getTop();
-
-        int distance = TouchUtils.dragViewBy(this, firstChild,
-                Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL, 0,
-                (int) (mActivity.getWindowManager().getDefaultDisplay().getHeight() * 0.75f));
-
-        /// M: [ALPS00428138] fix failure cases @{
-        //assertEquals("View scrolled to wrong position", firstTop
-        //        + (distance - ViewConfiguration.getTouchSlop() - 1), firstChild.getTop());
-        assertEquals("View scrolled to wrong position", firstTop
-                  + (distance - mViewConfig.getScaledTouchSlop()), firstChild.getTop());
-        /// @}
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/touch/ListTouchBottomGravityTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/touch/ListTouchBottomGravityTest.java
deleted file mode 100755
index 2394f287272cd28ad7f40b63cf842833c4f27ac7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/touch/ListTouchBottomGravityTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.touch;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.TouchUtils;
-import android.view.View;
-import android.widget.ListView;
-
-import com.mediatek.common.widget.tests.listview.ListBottomGravity;
-
-/**
- * Touch tests for a list where all of the items fit on the screen, and the list
- * stacks from the bottom.
- */
-public class ListTouchBottomGravityTest extends ActivityInstrumentationTestCase<ListBottomGravity> {
-    private ListBottomGravity mActivity;
-    private ListView mListView;
-
-    public ListTouchBottomGravityTest() {
-        super("com.mediatek.common.widget.tests", ListBottomGravity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mListView = getActivity().getListView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mListView);
-
-        // First item should be selected
-        assertEquals(mListView.getAdapter().getCount() - 1, mListView.getSelectedItemPosition());
-    }
-
-    @MediumTest
-    public void testPullDown() {
-        View firstChild = mListView.getChildAt(0);
-
-        TouchUtils.dragViewToBottom(this, firstChild);
-
-        View lastChild = mListView.getChildAt(mListView.getChildCount() - 1);
-
-        // Nothing should be selected
-        assertEquals("Selection still available after touch", -1,
-                mListView.getSelectedItemPosition());
-
-        assertEquals("List is not scrolled to the bottom", mListView.getAdapter().getCount() - 1,
-                lastChild.getId());
-
-        assertEquals("Last item is not touching the bottom edge",
-                mListView.getHeight() - mListView.getListPaddingBottom(), lastChild.getBottom());
-    }
-
-    @MediumTest
-    public void testPushUp() {
-        View lastChild = mListView.getChildAt(mListView.getChildCount() - 1);
-
-        TouchUtils.dragViewToTop(this, lastChild);
-
-        lastChild = mListView.getChildAt(mListView.getChildCount() - 1);
-
-        // Nothing should be selected
-        assertEquals("Selection still available after touch", -1,
-                mListView.getSelectedItemPosition());
-
-        assertEquals("List is not scrolled to the bottom", mListView.getAdapter().getCount() - 1,
-                lastChild.getId());
-
-        assertEquals("Last item is not touching the bottom edge",
-                mListView.getHeight() - mListView.getListPaddingBottom(), lastChild.getBottom());
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/touch/ListTouchManyTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/touch/ListTouchManyTest.java
deleted file mode 100755
index 4755ea876f1e8bb9c1f2e6b32271cdc95f5b8093..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/touch/ListTouchManyTest.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.touch;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.TouchUtils;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.widget.ListView;
-
-import com.mediatek.common.widget.tests.listview.ListTopGravityMany;
-
-/// M: [ALPS00428138] get context for ViewConfiguration
-import android.content.Context;
-
-/**
- * Touch tests for a list where all of the items do not fit on the screen.
- */
-public class ListTouchManyTest extends ActivityInstrumentationTestCase<ListTopGravityMany> {
-    private ListTopGravityMany mActivity;
-    private ListView mListView;
-
-    /// M: [ALPS00428138] get context for ViewConfiguration
-    private ViewConfiguration mViewConfig;
-
-
-    public ListTouchManyTest() {
-        super("com.mediatek.common.widget.tests", ListTopGravityMany.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mListView = getActivity().getListView();
-
-        /// M: [ALPS00428138] get context for ViewConfiguration
-        final Context context = mActivity.getApplicationContext();
-        mViewConfig = ViewConfiguration.get(context);
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mListView);
-
-        // First item should be selected
-        assertEquals(0, mListView.getSelectedItemPosition());
-    }
-
-    @MediumTest
-    public void testPullDown() {
-        TouchUtils.scrollToTop(this, mListView);
-
-        // Nothing should be selected
-        assertEquals("Selection still available after touch", -1,
-                mListView.getSelectedItemPosition());
-
-        View firstChild = mListView.getChildAt(0);
-
-        assertEquals("Item zero not the first child in the list", 0, firstChild.getId());
-
-        assertEquals("Item zero not at the top of the list", mListView.getListPaddingTop(),
-                firstChild.getTop());
-    }
-
-    @LargeTest
-    public void testPushUp() {
-        int originalCount = mListView.getChildCount();
-
-        TouchUtils.scrollToBottom(this, mListView);
-
-        // Nothing should be selected
-        assertEquals("Selection still available after touch", -1,
-                mListView.getSelectedItemPosition());
-
-        View lastChild = mListView.getChildAt(mListView.getChildCount() - 1);
-
-        assertEquals("List is not scrolled to the bottom", mListView.getAdapter().getCount() - 1,
-                lastChild.getId());
-
-        assertEquals("Last item is not touching the bottom edge",
-                mListView.getHeight() - mListView.getListPaddingBottom(), lastChild.getBottom());
-
-        assertTrue(String.format("Too many children created: %d expected no more than %d",
-                mListView.getChildCount(), originalCount + 1),
-                mListView.getChildCount() <= originalCount + 1);
-    }
-
-    @LargeTest
-    public void testPress() {
-        int i;
-        int count = mListView.getChildCount();
-        mActivity.setClickedPosition(-1);
-        mActivity.setLongClickedPosition(-1);
-
-        for (i = 0; i < count; i++) {
-            View child = mListView.getChildAt(i);
-            if ((child.getTop() >= mListView.getListPaddingTop())
-                    && (child.getBottom() <=
-                        mListView.getHeight() - mListView.getListPaddingBottom())) {
-                TouchUtils.clickView(this, child);
-
-                assertEquals("Incorrect view position reported being clicked", i,
-                        mActivity.getClickedPosition());
-                assertEquals("View falsely reported being long clicked", -1,
-                        mActivity.getLongClickedPosition());
-                try {
-                    Thread.sleep((long) (ViewConfiguration.getLongPressTimeout() * 1.25f));
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    @LargeTest
-    public void testLongPress() {
-        int i;
-        int count = mListView.getChildCount();
-        mActivity.enableLongPress();
-        mActivity.setClickedPosition(-1);
-        mActivity.setLongClickedPosition(-1);
-
-        for (i = 0; i < count; i++) {
-            View child = mListView.getChildAt(i);
-            if ((child.getTop() >= mListView.getListPaddingTop())
-                    && (child.getBottom() <=
-                        mListView.getHeight() - mListView.getListPaddingBottom())) {
-                TouchUtils.longClickView(this, child);
-                assertEquals("Incorrect view position reported being long clicked", i,
-                        mActivity.getLongClickedPosition());
-                assertEquals("View falsely reported being clicked", -1,
-                        mActivity.getClickedPosition());
-            }
-        }
-    }
-
-    @MediumTest
-    public void testNoScroll() {
-        View firstChild = mListView.getChildAt(0);
-        View lastChild = mListView.getChildAt(mListView.getChildCount() - 1);
-
-        int firstTop = firstChild.getTop();
-
-        /// M: [ALPS00428138] fix failure cases @{
-        //TouchUtils.dragViewBy(this, lastChild, Gravity.TOP | Gravity.LEFT,
-        //        0, -(ViewConfiguration.getTouchSlop()));
-        TouchUtils.dragViewBy(this, lastChild, Gravity.TOP | Gravity.LEFT,
-                0, -(mViewConfig.getScaledTouchSlop() - 1));
-        /// @}
-
-        View newFirstChild = mListView.getChildAt(0);
-
-        assertEquals("View scrolled too early", firstTop, newFirstChild.getTop());
-        assertEquals("Wrong view in first position", 0, newFirstChild.getId());
-    }
-
-    // TODO: needs to be adjusted to pass on non-HVGA displays
-    // @LargeTest
-    public void testShortScroll() {
-        View firstChild = mListView.getChildAt(0);
-        View lastChild = mListView.getChildAt(mListView.getChildCount() - 1);
-
-        int firstTop = firstChild.getTop();
-
-        /// M: [ALPS00428138] fix failure cases @{
-        //TouchUtils.dragViewBy(this, lastChild, Gravity.TOP | Gravity.LEFT,
-        //        0, -(ViewConfiguration.getTouchSlop() + 1 + 10));
-        TouchUtils.dragViewBy(this, lastChild, Gravity.TOP | Gravity.LEFT,
-                0, -(mViewConfig.getScaledTouchSlop() + 10));
-        /// @}
-
-        View newFirstChild = mListView.getChildAt(0);
-
-        assertEquals("View scrolled too early", firstTop, newFirstChild.getTop() + 10 + 1);
-        assertEquals("Wrong view in first position", 0, newFirstChild.getId());
-    }
-
-    // TODO: needs to be adjusted to pass on non-HVGA displays
-    // @LargeTest
-    public void testLongScroll() {
-        View lastChild = mListView.getChildAt(mListView.getChildCount() - 1);
-
-        int lastTop = lastChild.getTop();
-
-        int distance = TouchUtils.dragViewToY(this, lastChild,
-                Gravity.TOP | Gravity.LEFT, mListView.getTop());
-
-        /// M: [ALPS00428138] fix failure cases @{
-        //assertEquals("View scrolled to wrong position",
-        //        lastTop - (distance - ViewConfiguration.getTouchSlop() - 1), lastChild.getTop());
-        assertEquals("View scrolled to wrong position",
-                lastTop - (distance - mViewConfig.getScaledTouchSlop()), lastChild.getTop());
-        /// @}
-    }
-
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/touch/ListTouchTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/touch/ListTouchTest.java
deleted file mode 100755
index 2f766805ec2a3f4f1baeb0238545734020fa6543..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/listview/touch/ListTouchTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.listview.touch;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.TouchUtils;
-import android.view.View;
-import android.widget.ListView;
-
-import com.mediatek.common.widget.tests.listview.ListTopGravity;
-
-/**
- * Touch tests for a list where all of the items fit on the screen.
- */
-public class ListTouchTest extends ActivityInstrumentationTestCase<ListTopGravity> {
-    private ListTopGravity mActivity;
-    private ListView mListView;
-
-    public ListTouchTest() {
-        super("com.mediatek.common.widget.tests", ListTopGravity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mListView = getActivity().getListView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mListView);
-
-        // First item should be selected
-        assertEquals(0, mListView.getSelectedItemPosition());
-    }
-
-    @MediumTest
-    public void testPullDown() {
-        View firstChild = mListView.getChildAt(0);
-
-        TouchUtils.dragViewToBottom(this, firstChild);
-
-        // Nothing should be selected
-        assertEquals("Selection still available after touch", -1,
-                mListView.getSelectedItemPosition());
-
-        firstChild = mListView.getChildAt(0);
-
-        assertEquals("Item zero not the first child in the list", 0, firstChild.getId());
-
-        assertEquals("Item zero not at the top of the list", mListView.getListPaddingTop(),
-                firstChild.getTop());
-    }
-
-    @MediumTest
-    public void testPushUp() {
-        View lastChild = mListView.getChildAt(mListView.getChildCount() - 1);
-
-        TouchUtils.dragViewToTop(this, lastChild);
-
-        // Nothing should be selected
-        assertEquals("Selection still available after touch", -1,
-                mListView.getSelectedItemPosition());
-
-        View firstChild = mListView.getChildAt(0);
-
-        assertEquals("Item zero not the first child in the list", 0, firstChild.getId());
-
-        assertEquals("Item zero not at the top of the list", mListView.getListPaddingTop(),
-                firstChild.getTop());
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/ButtonAboveTallInternalSelectionView.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/ButtonAboveTallInternalSelectionView.java
deleted file mode 100755
index 34ef27dae4977601dbe1fef40b09e11882192885..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/ButtonAboveTallInternalSelectionView.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.scroll;
-
-import com.mediatek.common.widget.tests.util.InternalSelectionView;
-import com.mediatek.common.widget.tests.util.ScrollViewScenario;
-
-import android.widget.Button;
-
-/**
- * A button above a tall internal selection view, wrapped in a scroll view.
- */
-public class ButtonAboveTallInternalSelectionView extends ScrollViewScenario {
-
-    private final int mNumRowsInIsv = 5;
-
-
-    public Button getButtonAbove() {
-        return getContentChildAt(0);
-    }
-
-    public InternalSelectionView getIsv() {
-        return getContentChildAt(1);
-    }
-
-
-    protected void init(Params params) {
-        params.addButton("howdy", 0.1f)
-                .addInternalSelectionView(mNumRowsInIsv, 1.1f)
-                .addButton("below", 0.1f);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/ButtonAboveTallInternalSelectionViewTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/ButtonAboveTallInternalSelectionViewTest.java
deleted file mode 100755
index 87e2c9cfec1a05f64e36b400694953b8fceb3768..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/ButtonAboveTallInternalSelectionViewTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.scroll;
-
-import com.mediatek.common.widget.tests.util.InternalSelectionView;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-
-public class ButtonAboveTallInternalSelectionViewTest extends
-        ActivityInstrumentationTestCase<ButtonAboveTallInternalSelectionView> {
-
-    public ButtonAboveTallInternalSelectionViewTest() {
-        super("com.mediatek.common.widget.tests", ButtonAboveTallInternalSelectionView.class);
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertTrue("expecting the top button to have focus",
-                getActivity().getButtonAbove().isFocused());
-        assertEquals("scrollview scroll y",
-                0,
-                getActivity().getScrollView().getScrollY());
-        assertTrue("internal selection view should be taller than screen",
-                getActivity().getIsv().getHeight() > getActivity().getScrollView().getHeight());
-
-        assertTrue("top of ISV should be on screen",
-                getActivity().getIsv().getTop() >
-                getActivity().getScrollView().getScrollY());
-
-    }
-
-    @MediumTest
-    public void testMovingFocusDownToItemTallerThanScreenStillOnScreen() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        getInstrumentation().waitForIdleSync();
-
-        final InternalSelectionView isv = getActivity().getIsv();
-        assertTrue("internal selection view should have taken focus",
-                isv.isFocused());
-        assertEquals("internal selection view selected row",
-                0, isv.getSelectedRow());
-
-        /// M: [ALPS00428138] fix failure cases @{
-        /*assertTrue("top of ISV should still be on screen",
-                getActivity().getIsv().getTop() >
-                getActivity().getScrollView().getScrollY());*/
-        assertTrue("top of ISV should still be on screen",
-                getActivity().getIsv().getTop() >=
-                getActivity().getScrollView().getScrollY());
-        /// @}
-    }
-
-
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/ButtonsWithTallTextViewInBetween.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/ButtonsWithTallTextViewInBetween.java
deleted file mode 100755
index 355a1eba168ee583188c776036b9415b358123a3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/ButtonsWithTallTextViewInBetween.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.scroll;
-
-import com.mediatek.common.widget.tests.util.ScrollViewScenario;
-
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-/**
- * Two buttons sandwiching a tall text view (good for testing panning across
- * before getting to next button).
- */
-public class ButtonsWithTallTextViewInBetween extends ScrollViewScenario {
-
-    public Button getTopButton() {
-        return getContentChildAt(0);
-    }
-
-    public TextView getMiddleFiller() {
-        return getContentChildAt(1);
-    }
-
-    public Button getBottomButton() {
-        LinearLayout ll = getContentChildAt(2);
-        return (Button) ll.getChildAt(0);
-    }
-
-    protected void init(Params params) {
-
-        params.addButton("top button", 0.2f)
-                .addTextView("middle filler", 1.51f)
-                .addVerticalLLOfButtons("bottom", 1, 0.2f);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/HorizontalScrollViewActivity.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/HorizontalScrollViewActivity.java
deleted file mode 100755
index 995269a053944557e443bf2497b1e1857783a58b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/HorizontalScrollViewActivity.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.mediatek.common.widget.tests.scroll;
-
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.HorizontalScrollView;
-import android.view.View;
-
-import com.mediatek.common.widget.tests.R;
-
-public class HorizontalScrollViewActivity extends Activity {
-
-    private HorizontalScrollView mHorizontalScrollView;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.horizontal_scroll_view);
-
-        mHorizontalScrollView = (HorizontalScrollView) findViewById(R.id.hsv);
-
-    }
-
-    public HorizontalScrollView getHorizontalScrollView() {
-        return mHorizontalScrollView;
-    }
-
-    public View getButton4() {
-        return findViewById(R.id.button4);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/HorizontalScrollViewActivityTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/HorizontalScrollViewActivityTest.java
deleted file mode 100755
index b04d113995cf4c4b79e7e9698b01dd90c60cbc1f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/HorizontalScrollViewActivityTest.java
+++ /dev/null
@@ -1,295 +0,0 @@
-package com.mediatek.common.widget.tests.scroll;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.TouchUtils;
-import android.widget.HorizontalScrollView;
-import android.view.MotionEvent;
-import android.view.MotionEvent.PointerProperties;
-import android.view.MotionEvent.PointerCoords;
-import android.view.View;
-import android.view.Gravity;
-
-import android.os.SystemClock;
-import android.app.Instrumentation;
-
-
-public class HorizontalScrollViewActivityTest extends
-        ActivityInstrumentationTestCase2<HorizontalScrollViewActivity> {
-
-    HorizontalScrollViewActivity mActivity;
-    HorizontalScrollView mHorizontalScrollView;
-
-    public HorizontalScrollViewActivityTest() {
-        super("com.mediatek.common.widget.tests",
-                HorizontalScrollViewActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mHorizontalScrollView = mActivity.getHorizontalScrollView();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-
-    }
-
-    public void testPreconditions() {
-        assertTrue(mActivity != null);
-        assertTrue(mHorizontalScrollView != null);
-    }
-
-    public void testScroll() {
-
-        /*
-         * int halfWidth = (int)(mHorizontalScrollView.getWidth() / 2.0); int
-         * halfHeight = (int)(mHorizontalScrollView.getHeight() / 2.0);
-         *
-         * int[] location = new int[2];
-         * mHorizontalScrollView.getLocationOnScreen(location);
-         *
-         * TouchUtils.drag(this, location[0] + halfWidth + 50, location[0] +
-         * halfWidth - 50, location[1] + halfHeight, location[1] + halfHeight,
-         * 100);
-         */
-
-        View child = mActivity.getButton4();
-        TouchUtils.dragViewBy(this, child, Gravity.CENTER_VERTICAL
-                | Gravity.CENTER_HORIZONTAL, -100, 0);
-
-        getInstrumentation().waitForIdleSync();
-
-        assertTrue("ScrollX should not be zero after scrolling",
-                mHorizontalScrollView.getScrollX() != 0);
-    }
-
-    public void testFlingAndDrag() {
-
-        int halfWidth = (int) (mHorizontalScrollView.getWidth() / 2.0);
-        int halfHeight = (int) (mHorizontalScrollView.getHeight() / 2.0);
-
-        int[] location = new int[2];
-        mHorizontalScrollView.getLocationOnScreen(location);
-
-        Instrumentation inst = getInstrumentation();
-
-        long downTime = SystemClock.uptimeMillis();
-        long eventTime = SystemClock.uptimeMillis();
-
-        float y = location[1] + halfHeight;
-        float x = location[0] + halfWidth;
-
-        MotionEvent event = MotionEvent.obtain(downTime, eventTime,
-                MotionEvent.ACTION_DOWN, x, y, 0);
-        inst.sendPointerSync(event);
-        inst.waitForIdleSync();
-
-        for (int i = 0; i < 2; ++i) {
-            x -= 60;
-            eventTime = SystemClock.uptimeMillis();
-            event = MotionEvent.obtain(downTime, eventTime,
-                    MotionEvent.ACTION_MOVE, x, y, 0);
-            inst.sendPointerSync(event);
-            inst.waitForIdleSync();
-        }
-
-        eventTime = SystemClock.uptimeMillis();
-        event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_UP,
-                x, y, 0);
-        inst.sendPointerSync(event);
-        inst.waitForIdleSync();
-
-        x = location[0] + halfWidth;
-        downTime = SystemClock.uptimeMillis();
-        eventTime = SystemClock.uptimeMillis();
-
-        event = MotionEvent.obtain(downTime, eventTime,
-                MotionEvent.ACTION_DOWN, x, y, 0);
-        inst.sendPointerSync(event);
-        inst.waitForIdleSync();
-
-        for (int i = 0; i < 30; ++i) {
-            x += 1;
-            eventTime = SystemClock.uptimeMillis();
-            event = MotionEvent.obtain(downTime, eventTime,
-                    MotionEvent.ACTION_MOVE, x, y, 0);
-            inst.sendPointerSync(event);
-            inst.waitForIdleSync();
-        }
-
-        eventTime = SystemClock.uptimeMillis();
-        event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_UP,
-                x, y, 0);
-        inst.sendPointerSync(event);
-        inst.waitForIdleSync();
-
-        assertTrue("ScrollX should not be zero after scrolling",
-                mHorizontalScrollView.getScrollX() != 0);
-    }
-
-    public void testMutiTouchScroll() {
-
-        int halfWidth = (int) (mHorizontalScrollView.getWidth() / 2.0);
-        int halfHeight = (int) (mHorizontalScrollView.getHeight() / 2.0);
-
-        int[] location = new int[2];
-        mHorizontalScrollView.getLocationOnScreen(location);
-
-        float y = location[1] + halfHeight;
-        float x = location[0] + halfWidth;
-
-        float[] from1 = new float[2];
-        float[] from2 = new float[2];
-        float[] to1 = new float[2];
-        float[] to2 = new float[2];
-
-        from1[0] = x - 100;
-        from1[1] = y;
-        from2[0] = x + 100;
-        from2[1] = y;
-        to1[0] = x - 50;
-        to1[1] = y;
-        to2[0] = x + 20;
-        to2[1] = y;
-
-        generateZoomGesture(from1, from2, to1, to2, 50);
-
-
-        assertTrue("ScrollX should not be zero after Zooming",
-                mHorizontalScrollView.getScrollX() != 0);
-    }
-
-    private void generateZoomGesture(float[] from1, float[] from2, float[] to1, float[] to2, int steps) {
-
-        Instrumentation inst = getInstrumentation();
-
-        long eventTime = SystemClock.uptimeMillis();
-        long downTime = SystemClock.uptimeMillis();
-        MotionEvent event;
-        float eventX1, eventY1, eventX2, eventY2;
-
-        eventX1 = from1[0];
-        eventY1 = from1[1];
-        eventX2 = from2[0];
-        eventY2 = from2[1];
-
-        // specify the property for the two touch points
-        PointerProperties[] properties = new PointerProperties[2];
-        PointerProperties pp1 = new PointerProperties();
-        pp1.id = 0;
-        pp1.toolType = MotionEvent.TOOL_TYPE_FINGER;
-        PointerProperties pp2 = new PointerProperties();
-        pp2.id = 1;
-        pp2.toolType = MotionEvent.TOOL_TYPE_FINGER;
-
-        properties[0] = pp1;
-        properties[1] = pp2;
-
-        // specify the coordinations of the two touch points
-        // NOTE: you MUST set the pressure and size value, or it doesn't work
-        PointerCoords[] pointerCoords = new PointerCoords[2];
-        PointerCoords pc1 = new PointerCoords();
-        pc1.x = eventX1;
-        pc1.y = eventY1;
-        pc1.pressure = 1;
-        pc1.size = 1;
-        PointerCoords pc2 = new PointerCoords();
-        pc2.x = eventX2;
-        pc2.y = eventY2;
-        pc2.pressure = 1;
-        pc2.size = 1;
-        pointerCoords[0] = pc1;
-        pointerCoords[1] = pc2;
-
-        // ////////////////////////////////////////////////////////////
-        // events sequence of zoom gesture
-        // 1. send ACTION_DOWN event of one start point
-        // 2. send ACTION_POINTER_2_DOWN of two start points
-        // 3. send ACTION_MOVE of two middle points
-        // 4. repeat step 3 with updated middle points (x,y),
-        // until reach the end points
-        // 5. send ACTION_POINTER_2_UP of two end points
-        // 6. send ACTION_UP of one end point
-        // ////////////////////////////////////////////////////////////
-
-        // step 1
-        event = MotionEvent.obtain(downTime, eventTime,
-                MotionEvent.ACTION_DOWN, 1, properties, pointerCoords, 0, 0, 1,
-                1, 0, 0, 0, 0);
-
-        inst.sendPointerSync(event);
-        inst.waitForIdleSync();
-
-        // step 2
-        event = MotionEvent.obtain(downTime, eventTime,
-                MotionEvent.ACTION_POINTER_2_DOWN, 2, properties,
-                pointerCoords, 0, 0, 1, 1, 0, 0, 0, 0);
-
-        inst.sendPointerSync(event);
-        inst.waitForIdleSync();
-
-        // step 3, 4
-        if (true) {
-            int moveEventNumber = 1;
-            moveEventNumber = steps;
-
-            float stepX1, stepY1, stepX2, stepY2;
-
-            stepX1 = (to1[0] - from1[0]) / moveEventNumber;
-            stepY1 = (to1[1] - from1[1]) / moveEventNumber;
-            stepX2 = (to2[0] - from2[0]) / moveEventNumber;
-            stepY2 = (to2[1] - from2[1]) / moveEventNumber;
-
-            for (int i = 0; i < moveEventNumber; i++) {
-                // update the move events
-                eventTime = SystemClock.uptimeMillis();
-                eventX1 += stepX1;
-                eventY1 += stepY1;
-                eventX2 += stepX2;
-                eventY2 += stepY2;
-
-                pc1.x = eventX1;
-                pc1.y = eventY1;
-                pc2.x = eventX2;
-                pc2.y = eventY2;
-
-                pointerCoords[0] = pc1;
-                pointerCoords[1] = pc2;
-
-                event = MotionEvent.obtain(downTime, eventTime,
-                        MotionEvent.ACTION_MOVE, 2, properties, pointerCoords,
-                        0, 0, 1, 1, 0, 0, 0, 0);
-
-                inst.sendPointerSync(event);
-                inst.waitForIdleSync();
-            }
-        }
-
-        // step 5
-        pc1.x = to1[0];
-        pc1.y = to1[1];
-        pc2.x = to2[0];
-        pc2.y = to2[1];
-        pointerCoords[0] = pc1;
-        pointerCoords[1] = pc2;
-
-        eventTime = SystemClock.uptimeMillis();
-        event = MotionEvent.obtain(downTime, eventTime,
-                MotionEvent.ACTION_POINTER_2_UP, 2, properties, pointerCoords,
-                0, 0, 1, 1, 0, 0, 0, 0);
-        inst.sendPointerSync(event);
-        inst.waitForIdleSync();
-
-        // step 6
-        eventTime = SystemClock.uptimeMillis();
-        event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_UP,
-                1, properties, pointerCoords, 0, 0, 1, 1, 0, 0, 0, 0);
-        inst.sendPointerSync(event);
-        inst.waitForIdleSync();
-    }
-
-}
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/RequestRectangleVisible.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/RequestRectangleVisible.java
deleted file mode 100755
index b77c38e2ac2dd93cd105c9bf83c2c4a0caca0eef..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/RequestRectangleVisible.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.scroll;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.graphics.Rect;
-import android.view.View;
-import android.widget.TextView;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * A screen with some scenarios that exercise {@link ScrollView}'s implementation
- * of {@link android.view.ViewGroup#requestChildRectangleOnScreen}:
- * <li>Scrolling to something off screen (from top and from bottom)
- * <li>Scrolling to bring something that is larger than the screen on screen
- *  (from top and from bottom).
- */
-public class RequestRectangleVisible extends Activity {
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        setContentView(R.layout.scroll_to_rectangle);
-
-        final Rect rect = new Rect();
-        final View childToMakeVisible = findViewById(R.id.childToMakeVisible);
-
-        final TextView topBlob = (TextView) findViewById(R.id.topBlob);
-        final TextView bottomBlob = (TextView) findViewById(R.id.bottomBlob);
-
-        // estimate to get blobs larger than screen
-        int screenHeight = getWindowManager().getDefaultDisplay().getHeight();
-        int numLinesForScreen = screenHeight / 18;
-
-        for (int i = 0; i < numLinesForScreen; i++) {
-            topBlob.append(i + " another line in the blob\n");
-            bottomBlob.append(i + " another line in the blob\n");
-        }
-
-        findViewById(R.id.scrollToRectFromTop).setOnClickListener(new View.OnClickListener() {
-
-            public void onClick(View v) {
-                rect.set(0, 0, childToMakeVisible.getLeft(), childToMakeVisible.getHeight());
-                childToMakeVisible.requestRectangleOnScreen(rect, true);
-            }
-        });
-
-        findViewById(R.id.scrollToRectFromTop2).setOnClickListener(new View.OnClickListener() {
-
-            public void onClick(View v) {
-                rect.set(0, 0, topBlob.getWidth(), topBlob.getHeight());
-                topBlob.requestRectangleOnScreen(rect, true);
-            }
-        });
-
-        findViewById(R.id.scrollToRectFromBottom).setOnClickListener(new View.OnClickListener() {
-
-            public void onClick(View v) {
-                rect.set(0, 0, childToMakeVisible.getLeft(), childToMakeVisible.getHeight());
-                childToMakeVisible.requestRectangleOnScreen(rect, true);
-            }
-        });
-
-        findViewById(R.id.scrollToRectFromBottom2).setOnClickListener(new View.OnClickListener() {
-
-            public void onClick(View v) {
-                rect.set(0, 0, bottomBlob.getWidth(), bottomBlob.getHeight());
-                bottomBlob.requestRectangleOnScreen(rect, true);
-            }
-        });
-
-    }
-
-
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/RequestRectangleVisibleTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/RequestRectangleVisibleTest.java
deleted file mode 100755
index bfb980a820a4d3e125b53b57a9382603e81d5566..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/RequestRectangleVisibleTest.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.scroll;
-
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.ViewAsserts;
-import android.widget.Button;
-import android.widget.ScrollView;
-import android.widget.TextView;
-import android.view.View;
-import android.view.KeyEvent;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * {@link RequestRectangleVisible} is set up to exercise the cases of moving a
- * rectangle that is either off screen or not entirely on the screen onto the screen.
- */
-public class RequestRectangleVisibleTest extends ActivityInstrumentationTestCase<RequestRectangleVisible> {
-
-    private ScrollView mScrollView;
-
-    private Button mClickToScrollFromAbove;
-    private Button mClickToScrollToUpperBlob;
-    private TextView mTopBlob;
-
-    private View mChildToScrollTo;
-
-    private TextView mBottomBlob;
-    private Button mClickToScrollToBlobLowerBlob;
-    private Button mClickToScrollFromBelow;
-
-    public RequestRectangleVisibleTest() {
-        super("com.mediatek.common.widget.tests", RequestRectangleVisible.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        RequestRectangleVisible a = getActivity();
-
-        mScrollView = (ScrollView) a.findViewById(R.id.scrollView);
-        mClickToScrollFromAbove = (Button) a.findViewById(R.id.scrollToRectFromTop);
-        mClickToScrollToUpperBlob = (Button) a.findViewById(R.id.scrollToRectFromTop2);
-        mTopBlob = (TextView) a.findViewById(R.id.topBlob);
-        mChildToScrollTo = a.findViewById(R.id.childToMakeVisible);
-        mBottomBlob = (TextView) a.findViewById(R.id.bottomBlob);
-        mClickToScrollToBlobLowerBlob = (Button) a.findViewById(R.id.scrollToRectFromBottom2);
-        mClickToScrollFromBelow = (Button) a.findViewById(R.id.scrollToRectFromBottom);
-
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mScrollView);
-        assertNotNull(mClickToScrollFromAbove);
-        assertNotNull(mClickToScrollToUpperBlob);
-        assertNotNull(mTopBlob);
-        assertNotNull(mChildToScrollTo);
-        assertNotNull(mBottomBlob);
-        assertNotNull(mClickToScrollToBlobLowerBlob);
-        assertNotNull(mClickToScrollFromBelow);
-
-        assertTrue("top blob needs to be taller than the screen for many of the "
-                + "tests below to work.",
-                mTopBlob.getHeight() > mScrollView.getHeight());
-
-        assertTrue("bottom blob needs to be taller than the screen for many of the "
-                + "tests below to work.",
-                mBottomBlob.getHeight() > mScrollView.getHeight());
-
-        assertTrue("top blob needs to be lower than the fading edge region",
-                mTopBlob.getTop() > mScrollView.getVerticalFadingEdgeLength());
-    }
-
-    @MediumTest
-    public void testScrollToOffScreenRectangleFromTop() {
-        // view is off screen
-        assertTrue(mClickToScrollFromAbove.hasFocus());
-        ViewAsserts.assertOffScreenBelow(mScrollView, mChildToScrollTo);
-
-        // click
-        sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
-        getInstrumentation().waitForIdleSync();  // wait for scrolling to finish
-
-        // should be on screen, positioned at the bottom (with room for
-        // fading edge)
-        ViewAsserts.assertOnScreen(mScrollView, mChildToScrollTo);
-        ViewAsserts.assertHasScreenCoordinates(
-                mScrollView, mChildToScrollTo,
-                0,
-                mScrollView.getHeight()
-                        - mChildToScrollTo.getHeight()
-                        - mScrollView.getVerticalFadingEdgeLength());
-    }
-
-    @MediumTest
-    public void testScrollToPartiallyOffScreenRectFromTop() {
-        pressDownUntilViewInFocus(mClickToScrollToUpperBlob, 4);
-
-        // make sure the blob is indeed partially on screen below
-        assertOnBottomEdgeOfScreen(mScrollView, mTopBlob);
-
-        // click
-        sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
-        getInstrumentation().waitForIdleSync();  // wait for scrolling to finish
-
-        // blob should have moved so top of it is at top of screen (with
-        // room for the vertical fading edge
-        ViewAsserts.assertHasScreenCoordinates(
-                mScrollView, mTopBlob, 0, mScrollView.getVerticalFadingEdgeLength());
-    }
-
-    @LargeTest
-    public void testScrollToOffScreenRectangleFromBottom() {
-        // go to bottom button
-        pressDownUntilViewInFocus(mClickToScrollFromBelow, 100);
-
-        // view is off screen above
-        assertTrue(mClickToScrollFromBelow.hasFocus());
-        ViewAsserts.assertOffScreenAbove(mScrollView, mChildToScrollTo);
-
-        // click
-        sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
-        getInstrumentation().waitForIdleSync();  // wait for scrolling to finish
-
-        // on screen, positioned at top (with room for fading edge)
-        ViewAsserts.assertOnScreen(mScrollView, mChildToScrollTo);
-        ViewAsserts.assertHasScreenCoordinates(
-                mScrollView, mChildToScrollTo, 0, mScrollView.getVerticalFadingEdgeLength());
-    }
-
-
-    @LargeTest
-    public void testScrollToPartiallyOffScreenRectFromBottom() {
-        pressDownUntilViewInFocus(mClickToScrollToBlobLowerBlob, 100);
-
-        // make sure the blob is indeed partially on screen above
-        assertOnTopEdgeOfScreen(mScrollView, mBottomBlob);
-
-        // click
-        sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
-        getInstrumentation().waitForIdleSync();  // wait for scrolling to finish
-
-        /// M: may fail due to bugs in view.getLocationInWindow()
-        // blob should have moved so bottom of it is at bottom of screen
-        // with room for vertical fading edge
-        ViewAsserts.assertHasScreenCoordinates(
-                mScrollView, mBottomBlob,
-                0,
-                mScrollView.getHeight() - mBottomBlob.getHeight()
-                    - mScrollView.getVerticalFadingEdgeLength());
-    }
-
-
-    /**
-     * Press the down key until a particular view is in focus
-     * @param view The view to get in focus.
-     * @param maxKeyPress The maximum times to press down before failing.
-     */
-    private void pressDownUntilViewInFocus(View view, int maxKeyPress) {
-        int count = 0;
-        while (!view.hasFocus()) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-            getInstrumentation().waitForIdleSync();
-
-            // just in case...
-            if (++count > maxKeyPress) {
-                fail("couldn't move down to bottom button within "
-                        + maxKeyPress + " key presses.");
-            }
-        }
-    }
-
-    /**
-     * Assert that view overlaps the bottom edge of the screen
-     * @param origin The root view of the screen.
-     * @param view The view
-     */
-    static public void assertOnBottomEdgeOfScreen(View origin, View view) {
-        int[] xy = new int[2];
-        view.getLocationOnScreen(xy);
-
-        int[] xyRoot = new int[2];
-        origin.getLocationOnScreen(xyRoot);
-
-        int bottom = xy[1] + view.getHeight();
-        int bottomOfRoot = xyRoot[1] + origin.getHeight();
-
-        assertTrue(bottom > bottomOfRoot);
-
-        assertTrue(xy[1] < bottomOfRoot);
-        assertTrue(bottom > bottomOfRoot);
-    }
-
-    /**
-     * Assert that view overlaps the bottom edge of the screen
-     * @param origin The root view of the screen.
-     * @param view The view
-     */
-    static public void assertOnTopEdgeOfScreen(View origin, View view) {
-        int[] xy = new int[2];
-        view.getLocationOnScreen(xy);
-
-        int[] xyRoot = new int[2];
-        origin.getLocationOnScreen(xyRoot);
-
-        int bottom = xy[1] + view.getHeight();
-        int bottomOfRoot = xyRoot[1] + origin.getHeight();
-
-        assertTrue(bottom < bottomOfRoot);
-        assertTrue(bottom > xyRoot[1]);
-
-        assertTrue(xy[1] < xyRoot[1]);
-    }
-
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/RequestRectangleVisibleWithInternalScroll.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/RequestRectangleVisibleWithInternalScroll.java
deleted file mode 100755
index 42c4385cbd68138e324020a86431f52356218a14..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/RequestRectangleVisibleWithInternalScroll.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.scroll;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.TextView;
-import android.widget.Button;
-import android.view.View;
-import android.graphics.Rect;
-
-import com.mediatek.common.widget.tests.R;
-
-public class RequestRectangleVisibleWithInternalScroll extends Activity {
-
-    private int scrollYofBlob = 52;
-
-    private TextView mTextBlob;
-    private Button mScrollToBlob;
-
-
-    public int getScrollYofBlob() {
-        return scrollYofBlob;
-    }
-
-
-    public TextView getTextBlob() {
-        return mTextBlob;
-    }
-
-
-    public Button getScrollToBlob() {
-        return mScrollToBlob;
-    }
-
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        setContentView(R.layout.scroll_to_rect_with_internal_scroll);
-
-        mTextBlob = (TextView) findViewById(R.id.blob);
-        mTextBlob.scrollBy(0, scrollYofBlob);
-
-
-        mScrollToBlob = (Button) findViewById(R.id.scrollToBlob);
-        mScrollToBlob.setOnClickListener(new View.OnClickListener() {
-
-            public void onClick(View v) {
-
-                // the rect we want to make visible is offset to match
-                // the internal scroll
-                Rect rect = new Rect();
-                rect.set(0, 0, 0, mTextBlob.getHeight());
-                rect.offset(0, mTextBlob.getScrollY());
-                mTextBlob.requestRectangleOnScreen(rect);
-            }
-        });
-    }
-
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/RequestRectangleVisibleWithInternalScrollTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/RequestRectangleVisibleWithInternalScrollTest.java
deleted file mode 100755
index cef9f1432c46eda7e8697b857eb5735f8d9108f3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/RequestRectangleVisibleWithInternalScrollTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.scroll;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.ViewAsserts;
-import android.test.suitebuilder.annotation.Suppress;
-import android.view.KeyEvent;
-import android.widget.Button;
-import android.widget.ScrollView;
-import android.widget.TextView;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * This is suppressed because {@link TextView#scrollBy} isn't working.
- */
-@Suppress
-public class RequestRectangleVisibleWithInternalScrollTest
-        extends ActivityInstrumentationTestCase<RequestRectangleVisibleWithInternalScroll> {
-
-    private TextView mTextBlob;
-    private Button mScrollToBlob;
-
-    private ScrollView mScrollView;
-
-
-    public RequestRectangleVisibleWithInternalScrollTest() {
-        super("com.mediatek.common.widget.tests",
-                RequestRectangleVisibleWithInternalScroll.class);
-    }
-
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mTextBlob = getActivity().getTextBlob();
-        mScrollToBlob = getActivity().getScrollToBlob();
-
-        mScrollView = (ScrollView) getActivity().findViewById(R.id.scrollView);
-    }
-
-    public void testPreconditions() {
-        assertNotNull(mTextBlob);
-        assertNotNull(mScrollToBlob);
-        assertEquals(getActivity().getScrollYofBlob(), mTextBlob.getScrollY());
-    }
-
-    public void testMoveToChildWithScrollYBelow() {
-        assertTrue(mScrollToBlob.hasFocus());
-
-        ViewAsserts.assertOffScreenBelow(mScrollView, mTextBlob);
-
-        // click
-        sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
-        getInstrumentation().waitForIdleSync();  // wait for scrolling to finish
-
-        // should be on screen, positioned at the bottom (with enough room for
-        // fading edge)
-        ViewAsserts.assertOnScreen(mScrollView, mTextBlob);
-        ViewAsserts.assertHasScreenCoordinates(
-                mScrollView, mTextBlob,
-                0,
-                mScrollView.getHeight()
-                        - mTextBlob.getHeight()
-                        - mScrollView.getVerticalFadingEdgeLength());
-
-    }
-
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/ScrollViewButtonsAndLabels.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/ScrollViewButtonsAndLabels.java
deleted file mode 100755
index 61ab22be777cf04f7f7b61e9c2d098d80352e548..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/ScrollViewButtonsAndLabels.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.scroll;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.LinearLayout;
-import android.widget.ScrollView;
-import android.widget.TextView;
-import android.widget.Button;
-
-/// M: [ALPS00428138] get ViewConfirguration for friction
-import android.view.ViewConfiguration;
-
-import com.mediatek.common.widget.tests.R;
-
-/**
- * Basic scroll view example
- */
-public class ScrollViewButtonsAndLabels extends Activity {
-
-    private ScrollView mScrollView;
-    private LinearLayout mLinearLayout;
-
-    private int mNumGroups = 10;
-
-
-    public ScrollView getScrollView() {
-        return mScrollView;
-    }
-
-    public LinearLayout getLinearLayout() {
-        return mLinearLayout;
-    }
-
-    public int getNumButtons() {
-        return mNumGroups;
-    }
-
-    public Button getButton(int groupNum) {
-        if (groupNum > mNumGroups) {
-            throw new IllegalArgumentException("groupNum > " + mNumGroups);
-        }
-        return (Button) mLinearLayout.getChildAt(2 * groupNum);
-    }
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.scrollview_linear_layout);
-
-
-        // estimated ratio to get enough buttons so a couple are off screen
-        int screenHeight = getWindowManager().getDefaultDisplay().getHeight();
-        mNumGroups = screenHeight / 30;
-
-        mScrollView = (ScrollView) findViewById(R.id.scrollView);
-        mLinearLayout = (LinearLayout) findViewById(R.id.layout);
-
-        LinearLayout.LayoutParams p = new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.MATCH_PARENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT
-        );
-
-        for (int i = 0; i < mNumGroups; i++) {
-            // want button to be first and last
-            if (i > 0) {
-                TextView textView = new TextView(this);
-                textView.setText("Text View " + i);
-                mLinearLayout.addView(textView, p);
-            }
-
-            Button button = new Button(this);
-            button.setText("Button " + (i + 1));
-            mLinearLayout.addView(button, p);
-        }
-
-        /// M: [ALPS00428138] test more functions @{
-        mScrollView.setVerticalFadingEdgeEnabled(true);
-        mScrollView.setFadingEdgeLength(screenHeight / 15);
-        mScrollView.setFriction(ViewConfiguration.getScrollFriction());
-        /// @}
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/ScrollViewButtonsAndLabelsTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/ScrollViewButtonsAndLabelsTest.java
deleted file mode 100755
index eb3c1c05a2838d17c354cf42430c76d07eb2fc0b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/ScrollViewButtonsAndLabelsTest.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.scroll;
-
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.ScrollView;
-import android.view.KeyEvent;
-
-
-public class ScrollViewButtonsAndLabelsTest
-        extends ActivityInstrumentationTestCase<ScrollViewButtonsAndLabels> {
-
-    private ScrollView mScrollView;
-    private LinearLayout mLinearLayout;
-    private int mScreenBottom;
-    private int mScreenTop;
-
-    public ScrollViewButtonsAndLabelsTest() {
-        super("com.mediatek.common.widget.tests",
-              ScrollViewButtonsAndLabels.class);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mScrollView = getActivity().getScrollView();
-        mLinearLayout = getActivity().getLinearLayout();
-
-        int origin[] = {0, 0};
-        mScrollView.getLocationOnScreen(origin);
-        mScreenTop = origin[1];
-        mScreenBottom = origin[1] + mScrollView.getHeight();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertTrue("vertical fading edge width needs to be non-zero for this "
-                + "test to be worth anything",
-                mScrollView.getVerticalFadingEdgeLength() > 0);
-    }
-
-    // moving down to something off screen should move the element
-    // onto the screen just above the vertical fading edge
-    @LargeTest
-    public void testArrowScrollDownOffScreenVerticalFadingEdge() {
-
-        int offScreenIndex = findFirstButtonOffScreenTop2Bottom();
-        Button firstButtonOffScreen = getActivity().getButton(offScreenIndex);
-
-        for (int i = 0; i < offScreenIndex; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-        getInstrumentation().waitForIdleSync();
-        assertTrue(firstButtonOffScreen.hasFocus());
-
-        assertTrue("the button we've moved to off screen must not be the last "
-                + "button in the scroll view for this test to work (since we "
-                + "are expecting the fading edge to be there).",
-                offScreenIndex < getActivity().getNumButtons());
-
-        // now we are at the first button off screen
-        int buttonLoc[] = {0, 0};
-        firstButtonOffScreen.getLocationOnScreen(buttonLoc);
-        int buttonBottom = buttonLoc[1] + firstButtonOffScreen.getHeight();
-
-        int verticalFadingEdgeLength = mScrollView
-                .getVerticalFadingEdgeLength();
-        assertEquals("bottom of button should be verticalFadingEdgeLength "
-                + "above the bottom of the screen",
-                buttonBottom, mScreenBottom - verticalFadingEdgeLength);
-    }
-
-    // there should be no offset for vertical fading edge
-    // if the item is the last one on screen
-    @LargeTest
-    public void testArrowScrollDownToBottomElementOnScreen() {
-
-        int numGroups = getActivity().getNumButtons();
-        Button lastButton = getActivity().getButton(numGroups - 1);
-
-        assertEquals("button needs to be at the very bottom of the layout for "
-                + "this test to work",
-                mLinearLayout.getHeight(), lastButton.getBottom());
-
-        // move down to last button
-        for (int i = 0; i < numGroups; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-        getInstrumentation().waitForIdleSync();
-        assertTrue("last button should have focus", lastButton.hasFocus());
-
-        int buttonLoc[] = {0, 0};
-        lastButton.getLocationOnScreen(buttonLoc);
-        int buttonBottom = buttonLoc[1] + lastButton.getHeight();
-        assertEquals("button should be at very bottom of screen",
-                mScreenBottom, buttonBottom);
-    }
-
-    @LargeTest
-    public void testArrowScrollUpOffScreenVerticalFadingEdge() {
-        // get to bottom button
-        int numGroups = goToBottomButton();
-
-        // go up to first off screen button
-        int offScreenIndex = findFirstButtonOffScreenBottom2Top();
-        Button offScreenButton = getActivity().getButton(offScreenIndex);
-        int clicksToOffScreenIndex = numGroups - offScreenIndex - 1;
-        for (int i = 0; i < clicksToOffScreenIndex; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        }
-        getInstrumentation().waitForIdleSync();
-        assertTrue("we want to be at offScreenButton", offScreenButton.hasFocus());
-
-        // top should take into account fading edge
-        int buttonLoc[] = {0, 0};
-        offScreenButton.getLocationOnScreen(buttonLoc);
-        assertEquals("top should take into account fading edge",
-            mScreenTop + mScrollView.getVerticalFadingEdgeLength(), buttonLoc[1]);
-    }
-
-
-    @LargeTest
-    public void testArrowScrollUpToTopElementOnScreen() {
-        // get to bottom button
-        int numButtons = goToBottomButton();
-
-        // go back to the top
-        for (int i = 0; i < numButtons; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        }
-        getInstrumentation().waitForIdleSync();
-
-        Button topButton = getActivity().getButton(0);
-        assertTrue("should be back at top button", topButton.hasFocus());
-
-
-        int buttonLoc[] = {0, 0};
-        topButton.getLocationOnScreen(buttonLoc);
-        assertEquals("top of top button should be at top of screen; no need to take"
-                + " into account vertical fading edge.",
-                mScreenTop, buttonLoc[1]);
-    }
-
-    private int goToBottomButton() {
-        int numButtons = getActivity().getNumButtons();
-        Button lastButton = getActivity().getButton(numButtons - 1);
-
-        for (int i = 0; i < numButtons; i++) {
-          sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-        getInstrumentation().waitForIdleSync();
-        assertTrue("we want to be at the last button", lastButton.hasFocus());
-        return numButtons;
-    }
-
-    // search from top to bottom for the first button off screen
-    private int findFirstButtonOffScreenTop2Bottom() {
-        int origin[] = {0, 0};
-        mScrollView.getLocationOnScreen(origin);
-        int screenHeight = mScrollView.getHeight();
-
-        for (int i = 0; i < getActivity().getNumButtons(); i++) {
-
-            int buttonLoc[] = {0, 0};
-            Button button = getActivity().getButton(i);
-            button.getLocationOnScreen(buttonLoc);
-
-            if (buttonLoc[1] - origin[1] > screenHeight) {
-                return i;
-            }
-        }
-        fail("couldn't find first button off screen");
-        return -1; // this won't execute, but the compiler needs it
-    }
-
-    private int findFirstButtonOffScreenBottom2Top() {
-        int origin[] = {0, 0};
-        mScrollView.getLocationOnScreen(origin);
-
-        for (int i = getActivity().getNumButtons() - 1; i >= 0; i--) {
-
-            int buttonLoc[] = {0, 0};
-            Button button = getActivity().getButton(i);
-            button.getLocationOnScreen(buttonLoc);
-
-            if (buttonLoc[1] < 0) {
-                return i;
-            }
-        }
-        fail("couldn't find first button off screen");
-        return -1; // this won't execute, but the compiler needs it
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/ShortButtons.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/ShortButtons.java
deleted file mode 100755
index b53522b2611a429a3dc6316f82a939f7926370dd..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/ShortButtons.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.scroll;
-
-import com.mediatek.common.widget.tests.util.ScrollViewScenario;
-
-import android.widget.Button;
-import android.widget.LinearLayout;
-
-/**
- * A series of short buttons, some of which are embedded within another
- * layout.
- */
-public class ShortButtons extends ScrollViewScenario {
-
-    private final int mNumButtons = 10;
-    protected final float mButtonHeightFactor = 0.2f;
-
-    public int getNumButtons() {
-        return mNumButtons;
-    }
-
-    public Button getButtonAt(int index) {
-        if (index < 3) {
-            return getContentChildAt(index);
-        } else {
-            LinearLayout ll = getContentChildAt(3);
-            return (Button) ll.getChildAt(index - 3);
-        }
-    }
-
-    @Override
-    protected void init(Params params) {
-        final int numButtonsInSubLayout = getNumButtons() - 3;
-        params.addButtons(3, "top-level", mButtonHeightFactor)
-                .addVerticalLLOfButtons("embedded",
-                        numButtonsInSubLayout,
-                        numButtonsInSubLayout * mButtonHeightFactor);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/TallTextAboveButton.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/TallTextAboveButton.java
deleted file mode 100755
index 7892c8b904facf73d86c71fe752696c7cf5fe414..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/TallTextAboveButton.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.scroll;
-
-import com.mediatek.common.widget.tests.util.ScrollViewScenario;
-
-/**
- * An (unfocusable) text view that takes up more than the height
- * of the screen followed by a button.
- */
-public class TallTextAboveButton extends ScrollViewScenario {
-
-    protected void init(Params params) {
-        params.addTextView("top tall", 1.1f)
-                .addButton("button", 0.2f);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/arrowscroll/ButtonsWithTallTextViewInBetweenTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/arrowscroll/ButtonsWithTallTextViewInBetweenTest.java
deleted file mode 100755
index a9b6b5a7be32763b253e5c827fc36d190666aa9d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/arrowscroll/ButtonsWithTallTextViewInBetweenTest.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.scroll.arrowscroll;
-
-import com.mediatek.common.widget.tests.scroll.ButtonsWithTallTextViewInBetween;
-
-import android.graphics.Rect;
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ScrollView;
-import android.widget.TextView;
-
-public class ButtonsWithTallTextViewInBetweenTest
-        extends ActivityInstrumentationTestCase<ButtonsWithTallTextViewInBetween> {
-
-    private ScrollView mScrollView;
-    private Button mTopButton;
-    private TextView mMiddleFiller;
-    private TextView mBottomButton;
-
-    public ButtonsWithTallTextViewInBetweenTest() {
-        super("com.mediatek.common.widget.tests", ButtonsWithTallTextViewInBetween.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mScrollView = getActivity().getScrollView();
-        mTopButton = getActivity().getTopButton();
-        mMiddleFiller = getActivity().getMiddleFiller();
-        mBottomButton = getActivity().getBottomButton();
-    }
-
-    private Rect mTempRect = new Rect();
-
-    private int getTopWithinScrollView(View descendant) {
-        descendant.getDrawingRect(mTempRect);
-        mScrollView.offsetDescendantRectToMyCoords(descendant, mTempRect);
-        return mTempRect.top;
-    }
-
-    private int getBottomWithinScrollView(View descendant) {
-        descendant.getDrawingRect(mTempRect);
-        mScrollView.offsetDescendantRectToMyCoords(descendant, mTempRect);
-        return mTempRect.bottom;
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertTrue("top button should be shorter than max scroll amount",
-                mTopButton.getHeight() <
-                mScrollView.getMaxScrollAmount());
-        assertTrue("bottom button should be further than max scroll amount off screen",
-                getTopWithinScrollView(mBottomButton) - mScrollView.getBottom() > mScrollView.getMaxScrollAmount());
-    }
-
-    @MediumTest
-    public void testPanTopButtonOffScreenLosesFocus() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-
-        assertEquals("scroll view should be scrolled by the max amount for one "
-                + "arrow navigation",
-                mScrollView.getMaxScrollAmount(),
-                mScrollView.getScrollY());
-
-        assertTrue("top button should be off screen",
-                getBottomWithinScrollView(mTopButton) < mScrollView.getScrollY());
-
-        assertFalse("top button should have lost focus",
-                mTopButton.isFocused());
-
-        assertTrue("scroll view should be focused", mScrollView.isFocused());
-    }
-
-    @MediumTest
-    public void testScrollDownToBottomButton() throws Exception {
-        final int screenBottom = mScrollView.getScrollY() + mScrollView.getHeight();
-        final int numDownsToButtonButton =
-                ((getBottomWithinScrollView(mBottomButton) - screenBottom)) / mScrollView.getMaxScrollAmount() + 1;
-
-        for (int i = 0; i < numDownsToButtonButton; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-
-        assertTrue("bottombutton.isFocused", mBottomButton.isFocused());
-
-        assertEquals("should be fully scrolled to bottom",
-                getActivity().getLinearLayout().getHeight() - mScrollView.getHeight(),
-                mScrollView.getScrollY());
-    }
-
-    @MediumTest
-    public void testPanBottomButtonOffScreenLosesFocus() throws Exception {
-        mBottomButton.post(new Runnable() {
-            public void run() {
-                mBottomButton.requestFocus();
-            }
-        });
-
-        getInstrumentation().waitForIdleSync();
-
-        assertTrue("bottombutton.isFocused", mBottomButton.isFocused());
-        final int maxScroll = getActivity().getLinearLayout().getHeight()
-                - mScrollView.getHeight();
-        assertEquals("should be fully scrolled to bottom",
-                maxScroll,
-                mScrollView.getScrollY());
-
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-
-        assertEquals("scroll view should have scrolled by the max amount for one "
-                + "arrow navigation",
-                maxScroll - mScrollView.getMaxScrollAmount(),
-                mScrollView.getScrollY());
-
-        assertTrue("bottom button should be off screen",
-                getTopWithinScrollView(mBottomButton) > mScrollView.getScrollY() + mScrollView.getHeight());
-
-        assertFalse("bottom button should have lost focus",
-                mBottomButton.isFocused());
-
-        assertTrue("scroll view should be focused", mScrollView.isFocused());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/arrowscroll/MultiPageTextWithPadding.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/arrowscroll/MultiPageTextWithPadding.java
deleted file mode 100755
index 17be857d7c33e7ac2862db738805c07b701c67b9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/arrowscroll/MultiPageTextWithPadding.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.scroll.arrowscroll;
-
-import com.mediatek.common.widget.tests.util.ScrollViewScenario;
-
-/**
- * One TextView with a text covering several pages. Padding is added
- * above and below the ScrollView.
- */
-public class MultiPageTextWithPadding extends ScrollViewScenario {
-
-    @Override
-    protected void init(Params params) {
-
-        String text = "This is a long text.";
-        String longText = "First text.";
-        for (int i = 0; i < 300; i++) {
-            longText = longText + " " + text;
-        }
-        longText = longText + " Last text.";
-        params.addTextView(longText, -1.0f).addPaddingToScrollView(50, 50);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/arrowscroll/MultiPageTextWithPaddingTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/arrowscroll/MultiPageTextWithPaddingTest.java
deleted file mode 100755
index c8c9d8c49799c8c38c6df8b39f1c395539b7adf9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/arrowscroll/MultiPageTextWithPaddingTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2011 Sony Ericsson Mobile Communications AB.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.scroll.arrowscroll;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-import android.widget.TextView;
-import android.widget.ScrollView;
-
-public class MultiPageTextWithPaddingTest extends
-        ActivityInstrumentationTestCase<MultiPageTextWithPadding> {
-
-    private ScrollView mScrollView;
-
-    private TextView mTextView;
-
-    public MultiPageTextWithPaddingTest() {
-        super("com.mediatek.common.widget.tests", MultiPageTextWithPadding.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mScrollView = getActivity().getScrollView();
-        mTextView = getActivity().getContentChildAt(0);
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertTrue("text should not fit on screen",
-                   mTextView.getHeight() > mScrollView.getHeight());
-    }
-
-    @LargeTest
-    public void testScrollDownToBottom() throws Exception {
-        // Calculate the number of arrow scrolls needed to reach the bottom
-
-        /// M: [ALPS00428138] fix failure cases @{
-        //int scrollsNeeded = (int)Math.ceil(Math.max(0.0f,
-        //        (mTextView.getHeight() - mScrollView.getHeight()))
-        //        / mScrollView.getMaxScrollAmount());
-        int scrollsNeeded = (int) Math.ceil(Math.max(0.0f,
-                (mTextView.getHeight() - (mScrollView.getHeight() - mScrollView.getPaddingTop() - mScrollView
-                        .getPaddingBottom())))
-                / mScrollView.getMaxScrollAmount());
-        /// @}
-
-        for (int i = 0; i < scrollsNeeded; i++) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-
-        assertEquals(
-                "should be fully scrolled to bottom",
-                getActivity().getLinearLayout().getHeight()
-                        - (mScrollView.getHeight() - mScrollView.getPaddingTop() - mScrollView
-                                .getPaddingBottom()), mScrollView.getScrollY());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/arrowscroll/ShortButtonsTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/arrowscroll/ShortButtonsTest.java
deleted file mode 100755
index bcd462182ba34932503680727e7d2c3f52617ddc..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/arrowscroll/ShortButtonsTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.scroll.arrowscroll;
-
-import com.mediatek.common.widget.tests.scroll.ShortButtons;
-
-import android.graphics.Rect;
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-import android.widget.Button;
-import android.widget.ScrollView;
-
-public class ShortButtonsTest extends ActivityInstrumentationTestCase<ShortButtons> {
-
-    private ScrollView mScrollView;
-
-    public ShortButtonsTest() {
-        super("com.mediatek.common.widget.tests", ShortButtons.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mScrollView = getActivity().getScrollView();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertTrue("buttons should be shorter than screen",
-                getActivity().getButtonAt(0).getHeight()
-                        < mScrollView.getHeight());
-
-        assertTrue("should be enough buttons to have some scrolled off screen",
-                getActivity().getLinearLayout().getHeight()
-                        > getActivity().getScrollView().getHeight());
-    }
-
-    @LargeTest
-    public void testScrollDownToBottomThroughButtons() throws Exception {
-        final int numButtons = getActivity().getNumButtons();
-
-        for (int i = 0; i < numButtons; i++) {
-            String prefix = "after " + i + " downs expected button " + i;
-            final Button button = getActivity().getButtonAt(i);
-            assertTrue(prefix + "  to have focus", button.isFocused());
-            assertTrue(prefix + " to be on screen", isButtonOnScreen(button));
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-
-        assertEquals("should be fully scrolled to bottom",
-                getActivity().getLinearLayout().getHeight() - mScrollView.getHeight(),
-                mScrollView.getScrollY());
-    }
-
-    @LargeTest
-    public void testScrollFromBottomToTopThroughButtons() throws Exception {
-        final int numButtons = getActivity().getNumButtons();
-
-        final Button lastButton = getActivity().getButtonAt(numButtons - 1);
-
-        lastButton.post(new Runnable() {
-            public void run() {
-                lastButton.requestFocus();
-            }
-        });
-
-        getInstrumentation().waitForIdleSync();
-
-        assertTrue("lastButton.isFocused()", lastButton.isFocused());
-
-        for (int i = numButtons - 1; i >= 0; i--) {
-            String prefix = "after " + i + " ups expected button " + i;
-            final Button button = getActivity().getButtonAt(i);
-            assertTrue(prefix + "  to have focus", button.isFocused());
-            assertTrue(prefix + " to be on screen", isButtonOnScreen(button));
-            sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        }
-
-        assertEquals("should be fully scrolled to top",
-                0,
-                mScrollView.getScrollY());
-    }
-
-    private Rect mTempRect = new Rect();
-    protected boolean isButtonOnScreen(Button b) {
-        b.getDrawingRect(mTempRect);
-        mScrollView.offsetDescendantRectToMyCoords(b, mTempRect);
-        return mTempRect.bottom >= mScrollView.getScrollY()
-                && mTempRect.top <= (mScrollView.getScrollY() + mScrollView.getHeight());
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/arrowscroll/TallTextAboveButtonTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/arrowscroll/TallTextAboveButtonTest.java
deleted file mode 100755
index d9883fd20321dc05e173f0b99151fc65d3fc0344..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/scroll/arrowscroll/TallTextAboveButtonTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.scroll.arrowscroll;
-
-import com.mediatek.common.widget.tests.scroll.TallTextAboveButton;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-import android.widget.ScrollView;
-import android.widget.TextView;
-
-public class TallTextAboveButtonTest extends ActivityInstrumentationTestCase<TallTextAboveButton> {
-    private ScrollView mScrollView;
-    private TextView mTopText;
-    private TextView mBottomButton;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mScrollView = getActivity().getScrollView();
-        mTopText = getActivity().getContentChildAt(0);
-        mBottomButton = getActivity().getContentChildAt(1);
-    }
-
-    public TallTextAboveButtonTest() {
-        super("com.mediatek.common.widget.tests", TallTextAboveButton.class);
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertTrue("top text should be larger than screen",
-                mTopText.getHeight() > mScrollView.getHeight());
-        assertTrue("scroll view should have focus (because nothing else focusable "
-                + "is on screen), but " + getActivity().getScrollView().findFocus() + " does instead",
-                getActivity().getScrollView().isFocused());
-    }
-
-    @MediumTest
-    public void testGainFocusAsScrolledOntoScreen() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-
-        assertTrue("button should have scrolled onto screen",
-                mBottomButton.getBottom() >= mScrollView.getBottom());
-        assertTrue("button should have gained focus as it was scrolled completely "
-                + "into view", mBottomButton.isFocused());
-
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        assertTrue("scroll view should have focus, but " + getActivity().getScrollView().findFocus() + " does instead",
-                getActivity().getScrollView().isFocused());
-    }
-
-    @MediumTest
-    public void testScrollingButtonOffScreenLosesFocus() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        assertTrue("button should have focus", mBottomButton.isFocused());
-        sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-        assertTrue("scroll view should have focus, but " + getActivity().getScrollView().findFocus() + " does instead",
-                getActivity().getScrollView().isFocused());
-    }
-
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/touchmode/ChangeTouchModeTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/touchmode/ChangeTouchModeTest.java
deleted file mode 100755
index 7513d99ca865a52abd0467d47d2d2081ebe4b18d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/touchmode/ChangeTouchModeTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.touchmode;
-
-import com.mediatek.common.widget.tests.layout.linear.LLOfButtons1;
-import com.mediatek.common.widget.tests.layout.linear.LLOfButtons2;
-import static com.mediatek.common.widget.tests.util.TouchModeFlexibleAsserts.assertInTouchModeAfterClick;
-import static com.mediatek.common.widget.tests.util.TouchModeFlexibleAsserts.assertNotInTouchModeAfterKey;
-import static com.mediatek.common.widget.tests.util.TouchModeFlexibleAsserts.assertInTouchModeAfterTap;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-
-/**
- * Tests that the touch mode changes from various events, and that the state
- * persists across activities.
- */
-public class ChangeTouchModeTest extends ActivityInstrumentationTestCase<LLOfButtons1> {
-
-    public ChangeTouchModeTest() {
-        super("com.mediatek.common.widget.tests", LLOfButtons1.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
-    @MediumTest
-    public void testPreconditions() throws Exception {
-        assertFalse("touch mode", getActivity().isInTouchMode());
-    }
-
-    @MediumTest
-    public void testTouchingScreenEntersTouchMode() throws Exception {
-        assertInTouchModeAfterTap(this, getActivity().getFirstButton());
-        assertTrue("touch mode", getActivity().isInTouchMode());
-    }
-
-    // TODO: reenable when more reliable
-    public void DISABLE_testDpadDirectionLeavesTouchMode() throws Exception {
-        assertInTouchModeAfterClick(this, getActivity().getFirstButton());
-        sendKeys(KeyEvent.KEYCODE_DPAD_RIGHT);
-        assertNotInTouchModeAfterKey(this, KeyEvent.KEYCODE_DPAD_RIGHT, getActivity().getFirstButton());
-        assertFalse("touch mode", getActivity().isInTouchMode());
-    }
-
-    public void TODO_touchTrackBallMovementLeavesTouchMode() throws Exception {
-
-    }
-
-    @MediumTest
-    public void testTouchModeFalseAcrossActivites() throws Exception {
-
-        getInstrumentation().waitForIdleSync();
-
-        LLOfButtons2 otherActivity = null;
-        try {
-            otherActivity =
-                    launchActivity("com.mediatek.common.widget.tests", LLOfButtons2.class, null);
-            assertNotNull(otherActivity);
-            assertFalse(otherActivity.isInTouchMode());
-        } finally {
-            if (otherActivity != null) {
-                otherActivity.finish();
-            }
-        }
-    }
-
-    @LargeTest
-    public void testTouchModeTrueAcrossActivites() throws Exception {
-        assertInTouchModeAfterClick(this, getActivity().getFirstButton());
-        LLOfButtons2 otherActivity = null;
-        try {
-            otherActivity =
-                    launchActivity("com.mediatek.common.widget.tests", LLOfButtons2.class, null);
-            assertNotNull(otherActivity);
-            assertTrue(otherActivity.isInTouchMode());
-        } finally {
-            if (otherActivity != null) {
-                otherActivity.finish();
-            }
-        }
-    }
-
-    @LargeTest
-    public void testTouchModeChangedInOtherActivity() throws Exception {
-
-        assertFalse("touch mode", getActivity().isInTouchMode());
-
-        LLOfButtons2 otherActivity = null;
-        try {
-            otherActivity =
-                    launchActivity("com.mediatek.common.widget.tests", LLOfButtons2.class, null);
-            assertNotNull(otherActivity);
-            assertFalse(otherActivity.isInTouchMode());
-            assertInTouchModeAfterClick(this, otherActivity.getFirstButton());
-            assertTrue(otherActivity.isInTouchMode());
-        } finally {
-            if (otherActivity != null) {
-                otherActivity.finish();
-            }
-        }
-
-        // need to wait for async update back to window to occur
-        Thread.sleep(200);
-
-        assertTrue("touch mode", getActivity().isInTouchMode());
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/touchmode/FocusableInTouchModeClickTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/touchmode/FocusableInTouchModeClickTest.java
deleted file mode 100755
index b8124b1cd9a01fa3e6bd7361f7ed83e99cf5ddb0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/touchmode/FocusableInTouchModeClickTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.touchmode;
-
-import com.mediatek.common.widget.tests.layout.linear.LLOfTwoFocusableInTouchMode;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.TouchUtils;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-
-public class FocusableInTouchModeClickTest extends ActivityInstrumentationTestCase2<LLOfTwoFocusableInTouchMode> {
-
-    public FocusableInTouchModeClickTest() {
-        super("com.mediatek.common.widget.tests", LLOfTwoFocusableInTouchMode.class);
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        setActivityInitialTouchMode(true);
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertTrue("should start in touch mode", getActivity().getButton1().isInTouchMode());
-        assertTrue(getActivity().getButton1().isFocused());
-    }
-
-    @LargeTest
-    public void testClickGivesFocusNoClickFired() {
-        TouchUtils.clickView(this, getActivity().getButton2());
-        assertTrue("click should give focusable in touch mode focus",
-                getActivity().getButton2().isFocused());
-        assertFalse("getting focus should result in no on click",
-                getActivity().isB2Fired());
-
-        TouchUtils.clickView(this, getActivity().getButton2());
-        assertTrue("subsequent click while focused should fire on click",
-                getActivity().isB2Fired());
-    }
-
-    @MediumTest
-    public void testTapGivesFocusNoClickFired() {
-        TouchUtils.touchAndCancelView(this, getActivity().getButton2());
-        assertFalse("button shouldn't have fired click", getActivity().isB2Fired());
-        assertFalse("button shouldn't have focus", getActivity().getButton2().isFocused());
-    }
-
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/touchmode/StartInTouchWithViewInFocusTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/touchmode/StartInTouchWithViewInFocusTest.java
deleted file mode 100755
index 76925e38d89dda65941f98c5d55021695d146efb..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/touchmode/StartInTouchWithViewInFocusTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.touchmode;
-
-import com.mediatek.common.widget.tests.layout.linear.LLEditTextThenButton;
-import static com.mediatek.common.widget.tests.util.TouchModeFlexibleAsserts.assertNotInTouchModeAfterKey;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-import android.widget.Button;
-import android.widget.EditText;
-
-public class StartInTouchWithViewInFocusTest extends
-        ActivityInstrumentationTestCase2<LLEditTextThenButton> {
-
-    private EditText mEditText;
-
-    private Button mButton;
-
-    public StartInTouchWithViewInFocusTest() {
-        super("com.mediatek.common.widget.tests", LLEditTextThenButton.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        this.setActivityInitialTouchMode(true);
-        mEditText = getActivity().getEditText();
-        mButton = getActivity().getButton();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertTrue("should start in touch mode", mEditText.isInTouchMode());
-        assertTrue("edit text is focusable in touch mode, should have focus", mEditText.isFocused());
-    }
-
-    // TODO: reenable when more reliable
-    public void DISABLE_testKeyDownLeavesTouchModeAndGoesToNextView() {
-        assertNotInTouchModeAfterKey(this, KeyEvent.KEYCODE_DPAD_DOWN, mEditText);
-        assertFalse("should have left touch mode", mEditText.isInTouchMode());
-        assertTrue("should have given focus to next view", mButton.isFocused());
-    }
-
-    // TODO: reenable when more reliable
-    public void DISABLE_testNonDirectionalKeyExitsTouchMode() {
-        assertNotInTouchModeAfterKey(this, KeyEvent.KEYCODE_A, mEditText);
-        assertFalse("should have left touch mode", mEditText.isInTouchMode());
-        assertTrue("edit text should still have focus", mEditText.isFocused());
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/touchmode/TouchModeFocusChangeTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/touchmode/TouchModeFocusChangeTest.java
deleted file mode 100755
index 7c5ec4e60db7aeb94d7c38491e3f5ea7778bb605..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/touchmode/TouchModeFocusChangeTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.touchmode;
-
-import com.mediatek.common.widget.tests.layout.linear.LLOfButtons1;
-import static com.mediatek.common.widget.tests.util.TouchModeFlexibleAsserts.assertInTouchModeAfterClick;
-import static com.mediatek.common.widget.tests.util.TouchModeFlexibleAsserts.assertInTouchModeAfterTap;
-import static com.mediatek.common.widget.tests.util.TouchModeFlexibleAsserts.assertNotInTouchModeAfterKey;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-import android.widget.Button;
-
-/**
- * Make sure focus isn't kept by buttons when entering touch mode.
- *
- * When in touch mode and hitting the d-pad, we should leave touch mode and the
- * top most focusable gets focus.
- */
-public class TouchModeFocusChangeTest extends ActivityInstrumentationTestCase<LLOfButtons1> {
-    private LLOfButtons1 mActivity;
-    private Button mFirstButton;
-
-    public TouchModeFocusChangeTest() {
-        super("com.mediatek.common.widget.tests", LLOfButtons1.class);
-    }
-
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mFirstButton = mActivity.getFirstButton();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertFalse("we should not be in touch mode", mActivity.isInTouchMode());
-        assertTrue("top button should have focus", mFirstButton.isFocused());
-    }
-
-    @MediumTest
-    public void testTouchButtonNotTakeFocus() {
-        assertInTouchModeAfterTap(this, mFirstButton);
-
-        assertTrue("should be in touch mode", mActivity.isInTouchMode());
-        assertFalse("button.isFocused",
-                mFirstButton.isFocused());
-        assertFalse("button.hasFocus",
-                mFirstButton.hasFocus());
-        assertNull("activity shouldn't have focus", mActivity.getCurrentFocus());
-        assertFalse("linear layout should not have focus",
-                mActivity.getLayout().hasFocus());
-
-        assertTrue("button's onClickListener should have fired",
-                mActivity.buttonClickListenerFired());
-    }
-
-    // TODO: reenable when more reliable
-    public void DISABLE_testLeaveTouchModeWithDpadEvent() {
-        assertInTouchModeAfterClick(this, mFirstButton);
-
-        assertTrue("should be in touch mode", mActivity.isInTouchMode());
-        assertFalse("button should not have focus when touched",
-                mFirstButton.isFocused());
-
-        assertNotInTouchModeAfterKey(this, KeyEvent.KEYCODE_DPAD_RIGHT, mFirstButton);
-        assertFalse("should be out of touch mode", mActivity.isInTouchMode());
-        assertTrue("first button (the top most focusable) should have gained focus",
-                mFirstButton.isFocused());
-    }
-
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/touchmode/TouchModeFocusableTest.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/touchmode/TouchModeFocusableTest.java
deleted file mode 100755
index fd4887af4c807a5b6d4e7845b49f008455619155..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/touchmode/TouchModeFocusableTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.touchmode;
-
-import com.mediatek.common.widget.tests.layout.linear.LLEditTextThenButton;
-import static com.mediatek.common.widget.tests.util.TouchModeFlexibleAsserts.assertInTouchModeAfterTap;
-import static com.mediatek.common.widget.tests.util.TouchModeFlexibleAsserts.assertInTouchModeAfterClick;
-
-import android.test.ActivityInstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-import android.widget.Button;
-import android.widget.EditText;
-
-/**
- * Some views, like edit texts, can keep and gain focus even when in touch mode.
- */
-public class TouchModeFocusableTest extends ActivityInstrumentationTestCase<LLEditTextThenButton> {
-    private EditText mEditText;
-    private Button mButton;
-
-
-    public TouchModeFocusableTest() {
-        super("com.mediatek.common.widget.tests", LLEditTextThenButton.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mEditText = getActivity().getEditText();
-        mButton = getActivity().getButton();
-    }
-
-    @MediumTest
-    public void testPreconditions() {
-        assertFalse("should not be in touch mode to start off", mButton.isInTouchMode());
-        assertTrue("edit text should have focus", mEditText.isFocused());
-        assertTrue("edit text should be focusable in touch mode", mEditText.isFocusableInTouchMode());
-    }
-
-    @MediumTest
-    public void testClickButtonEditTextKeepsFocus() {
-        assertInTouchModeAfterTap(this, mButton);
-        assertTrue("should be in touch mode", mButton.isInTouchMode());
-        assertTrue("edit text should still have focus", mEditText.isFocused());
-    }
-
-    @LargeTest
-    public void testClickEditTextGivesItFocus() {
-        // go down to button
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-        assertTrue("button should have focus", mButton.isFocused());
-
-        assertInTouchModeAfterClick(this, mEditText);
-        assertTrue("clicking edit text should have entered touch mode", mButton.isInTouchMode());
-        assertTrue("clicking edit text should have given it focus", mEditText.isFocused());
-    }
-
-
-    // entering touch mode takes focus away from the currently focused item if it
-    // isn't focusable in touch mode.
-    @LargeTest
-    public void testEnterTouchModeGivesFocusBackToFocusableInTouchMode() {
-        sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-
-        assertTrue("button should have focus",
-                mButton.isFocused());
-
-        assertInTouchModeAfterClick(this, mButton);
-        assertTrue("should be in touch mode", mButton.isInTouchMode());
-        assertNull("nothing should have focus", getActivity().getCurrentFocus());
-        assertFalse("layout should not have focus",
-                getActivity().getLayout().hasFocus());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/util/GridScenario.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/util/GridScenario.java
deleted file mode 100755
index b6dc38f75918133ffbd92e751d03a6ac58296ad6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/util/GridScenario.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.util;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.widget.AbsListView;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.GridView;
-import android.widget.ListAdapter;
-import android.widget.TextView;
-
-import com.google.android.collect.Maps;
-
-import java.util.Map;
-
-/**
- * Utility base class for creating various GridView scenarios.  Configurable by the number
- * of items, how tall each item should be (in relation to the screen height), and
- * what item should start with selection.
- */
-public abstract class GridScenario extends Activity {
-
-    private GridView mGridView;
-
-    private int mNumItems;
-
-    private int mStartingSelectionPosition;
-    private double mItemScreenSizeFactor;
-    private Map<Integer, Double> mOverrideItemScreenSizeFactors = Maps.newHashMap();
-
-    private int mScreenHeight;
-
-    private boolean mStackFromBottom;
-
-    private int mColumnWidth;
-
-    private int mNumColumns;
-
-    private int mStretchMode;
-
-    private int mVerticalSpacing;
-
-    public GridView getGridView() {
-        return mGridView;
-    }
-
-    protected int getScreenHeight() {
-        return mScreenHeight;
-    }
-
-    /**
-     * @return The initial number of items in the grid as specified by the scenario.
-     * This number may change over time.
-     */
-    protected int getInitialNumItems() {
-        return mNumItems;
-    }
-
-    /**
-     * @return The desired height of 1 item, ignoring overrides
-     */
-    public int getDesiredItemHeight() {
-        return (int) (mScreenHeight * mItemScreenSizeFactor);
-    }
-
-    /**
-     * Better way to pass in optional params than a honkin' paramater list :)
-     */
-    public static class Params {
-        private int mNumItems = 4;
-        private int mStartingSelectionPosition = -1;
-        private double mItemScreenSizeFactor = 1 / 5;
-
-        private Map<Integer, Double> mOverrideItemScreenSizeFactors = Maps.newHashMap();
-
-        private boolean mStackFromBottom = false;
-        private boolean mMustFillScreen = true;
-
-        private int mColumnWidth = 0;
-        private int mNumColumns = GridView.AUTO_FIT;
-        private int mStretchMode = GridView.STRETCH_COLUMN_WIDTH;
-        private int mVerticalSpacing = 0;
-
-        /**
-         * Set the number of items in the grid.
-         */
-        public Params setNumItems(int numItems) {
-            mNumItems = numItems;
-            return this;
-        }
-
-        /**
-         * Set the position that starts selected.
-         *
-         * @param startingSelectionPosition The selected position within the adapter's data set.
-         * Pass -1 if you do not want to force a selection.
-         * @return
-         */
-        public Params setStartingSelectionPosition(int startingSelectionPosition) {
-            mStartingSelectionPosition = startingSelectionPosition;
-            return this;
-        }
-
-        /**
-         * Set the factor that determines how tall each item is in relation to the
-         * screen height.
-         */
-        public Params setItemScreenSizeFactor(double itemScreenSizeFactor) {
-            mItemScreenSizeFactor = itemScreenSizeFactor;
-            return this;
-        }
-
-        /**
-         * Override the item screen size factor for a particular item.  Useful for
-         * creating grids with non-uniform item height.
-         * @param position The position in the grid.
-         * @param itemScreenSizeFactor The screen size factor to use for the height.
-         */
-        public Params setPositionScreenSizeFactorOverride(
-                int position, double itemScreenSizeFactor) {
-            mOverrideItemScreenSizeFactors.put(position, itemScreenSizeFactor);
-            return this;
-        }
-
-        /**
-         * Sets the stacking direction
-         * @param stackFromBottom
-         * @return
-         */
-        public Params setStackFromBottom(boolean stackFromBottom) {
-            mStackFromBottom = stackFromBottom;
-            return this;
-        }
-
-        /**
-         * Sets whether the sum of the height of the grid items must be at least the
-         * height of the grid view.
-         */
-        public Params setMustFillScreen(boolean fillScreen) {
-            mMustFillScreen = fillScreen;
-            return this;
-        }
-
-        /**
-         * Sets the individual width of each column.
-         *
-         * @param requestedWidth the width in pixels of the column
-         */
-        public Params setColumnWidth(int requestedWidth) {
-            mColumnWidth = requestedWidth;
-            return this;
-        }
-
-        /**
-         * Sets the number of columns in the grid.
-         */
-        public Params setNumColumns(int numColumns) {
-            mNumColumns = numColumns;
-            return this;
-        }
-
-        /**
-         * Sets the stretch mode.
-         */
-        public Params setStretchMode(int stretchMode) {
-            mStretchMode = stretchMode;
-            return this;
-        }
-
-        /**
-         * Sets the spacing between rows in the grid
-         */
-        public Params setVerticalSpacing(int verticalSpacing) {
-            mVerticalSpacing  = verticalSpacing;
-            return this;
-        }
-    }
-
-    /**
-     * How each scenario customizes its behavior.
-     * @param params
-     */
-    protected abstract void init(Params params);
-
-    /**
-     * Override this to provide an different adapter for your scenario
-     * @return The adapter that this scenario will use
-     */
-    protected ListAdapter createAdapter() {
-        return new MyAdapter();
-    }
-
-    /**
-     * Override this if you want to know when something has been selected (perhaps
-     * more importantly, that {@link android.widget.AdapterView.OnItemSelectedListener} has
-     * been triggered).
-     */
-    @SuppressWarnings({ "UnusedDeclaration" })
-    protected void positionSelected(int positon) {
-
-    }
-
-    /**
-     * Override this if you want to know that nothing is selected.
-     */
-    protected void nothingSelected() {
-
-    }
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        // turn off title bar
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-
-        mScreenHeight = getWindowManager().getDefaultDisplay().getHeight();
-
-        final Params params = new Params();
-        init(params);
-
-        readAndValidateParams(params);
-
-        mGridView = new GridView(this);
-        mGridView.setLayoutParams(new ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT));
-        mGridView.setDrawSelectorOnTop(false);
-        if (mNumColumns >= GridView.AUTO_FIT) {
-            mGridView.setNumColumns(mNumColumns);
-        }
-        if (mColumnWidth > 0) {
-            mGridView.setColumnWidth(mColumnWidth);
-        }
-        if (mVerticalSpacing > 0) {
-            mGridView.setVerticalSpacing(mVerticalSpacing);
-        }
-        mGridView.setStretchMode(mStretchMode);
-        mGridView.setAdapter(createAdapter());
-        if (mStartingSelectionPosition >= 0) {
-            mGridView.setSelection(mStartingSelectionPosition);
-        }
-        mGridView.setPadding(10, 10, 10, 10);
-        mGridView.setStackFromBottom(mStackFromBottom);
-
-        mGridView.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            public void onItemSelected(AdapterView parent, View v, int position, long id) {
-                positionSelected(position);
-            }
-
-            public void onNothingSelected(AdapterView parent) {
-                nothingSelected();
-            }
-        });
-
-        /// M: [ALPS00428138] set small velocity scale to prevent from flinging
-        mGridView.setVelocityScale(0.1f);
-
-        setContentView(mGridView);
-    }
-
-
-
-    /**
-     * Read in and validate all of the params passed in by the scenario.
-     * @param params
-     */
-    private void readAndValidateParams(Params params) {
-        if (params.mMustFillScreen) {
-            double totalFactor = 0.0;
-            for (int i = 0; i < params.mNumItems; i++) {
-                if (params.mOverrideItemScreenSizeFactors.containsKey(i)) {
-                    totalFactor += params.mOverrideItemScreenSizeFactors.get(i);
-                } else {
-                    totalFactor += params.mItemScreenSizeFactor;
-                }
-            }
-            if (totalFactor < 1.0) {
-                throw new IllegalArgumentException("grid items must combine to be at least " +
-                        "the height of the screen.  this is not the case with " + params.mNumItems
-                        + " items and " + params.mItemScreenSizeFactor + " screen factor and " +
-                        "screen height of " + mScreenHeight);
-            }
-        }
-
-        mNumItems = params.mNumItems;
-        mStartingSelectionPosition = params.mStartingSelectionPosition;
-        mItemScreenSizeFactor = params.mItemScreenSizeFactor;
-
-        mOverrideItemScreenSizeFactors.putAll(params.mOverrideItemScreenSizeFactors);
-
-        mStackFromBottom = params.mStackFromBottom;
-        mColumnWidth = params.mColumnWidth;
-        mNumColumns = params.mNumColumns;
-        mStretchMode = params.mStretchMode;
-        mVerticalSpacing = params.mVerticalSpacing;
-    }
-
-    public final String getValueAtPosition(int position) {
-        return "postion " + position;
-    }
-
-    /**
-     * Create a view for a grid item.  Override this to create a custom view beyond
-     * the simple focusable / unfocusable text view.
-     * @param position The position.
-     * @param parent The parent
-     * @param desiredHeight The height the view should be to respect the desired item
-     *   to screen height ratio.
-     * @return a view for the grid.
-     */
-    protected View createView(int position, ViewGroup parent, int desiredHeight) {
-        TextView result = new TextView(parent.getContext());
-        result.setHeight(desiredHeight);
-        result.setText(getValueAtPosition(position));
-        final ViewGroup.LayoutParams lp = new AbsListView.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT);
-        result.setLayoutParams(lp);
-        result.setId(position);
-        result.setBackgroundColor(0x55ffffff);
-        return result;
-    }
-
-
-
-    private class MyAdapter extends BaseAdapter {
-        public int getCount() {
-            return mNumItems;
-        }
-
-        public Object getItem(int position) {
-            return getValueAtPosition(position);
-        }
-
-        public long getItemId(int position) {
-            return position;
-        }
-
-        public View getView(int position, View convertView, ViewGroup parent) {
-            if (convertView != null) {
-                ((TextView) convertView).setText(getValueAtPosition(position));
-                convertView.setId(position);
-                return convertView;
-            }
-
-            int desiredHeight = getDesiredItemHeight();
-            if (mOverrideItemScreenSizeFactors.containsKey(position)) {
-                desiredHeight = (int) (mScreenHeight * mOverrideItemScreenSizeFactors.get(position));
-            }
-            return createView(position, parent, desiredHeight);
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/util/InternalSelectionView.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/util/InternalSelectionView.java
deleted file mode 100755
index 187891e56241fe142518a251d13e2b92526bf42f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/util/InternalSelectionView.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.util;
-
-import android.view.View;
-import android.view.KeyEvent;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Paint;
-import android.graphics.Canvas;
-import android.graphics.Rect;
-import android.graphics.Color;
-import android.util.AttributeSet;
-
-import com.mediatek.common.widget.tests.R;
-
-
-
-/**
- * A view that has a known number of selectable rows, and maintains a notion of which
- * row is selected. The rows take up the
- * entire width of the view.  The height of the view is divided evenly among
- * the rows.
- *
- * Note: If the height of the view does not divide exactly to the number of rows,
- *       the last row's height is inflated with the remainder. For example, if the
- *       view height is 22 and there are two rows, the height of the first row is
- *       10 and the second 22.
- *
- * Notice what this view does to be a good citizen w.r.t its internal selection:
- * 1) calls {@link View#requestRectangleOnScreen} each time the selection changes due to
- *    internal navigation.
- * 2) implements {@link View#getFocusedRect} by filling in the rectangle of the currently
- *    selected row
- * 3) overrides {@link View#onFocusChanged} and sets selection appropriately according to
- *    the previously focused rectangle.
- */
-public class InternalSelectionView extends View {
-
-    private Paint mPainter = new Paint();
-    private Paint mTextPaint = new Paint();
-    private Rect mTempRect = new Rect();
-
-    private int mNumRows = 5;
-    private int mSelectedRow = 0;
-    private final int mEstimatedPixelHeight = 10;
-
-    private Integer mDesiredHeight = null;
-    private String mLabel = null;
-
-    public InternalSelectionView(Context context, int numRows, String label) {
-        super(context);
-        mNumRows = numRows;
-        mLabel = label;
-        init();
-    }
-
-    public InternalSelectionView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        TypedArray a =
-                context.obtainStyledAttributes(
-                        attrs, R.styleable.SelectableRowView);
-        mNumRows = a.getInt(R.styleable.SelectableRowView_numRows, 5);
-        init();
-    }
-
-    private void init() {
-        setFocusable(true);
-        mTextPaint.setAntiAlias(true);
-        mTextPaint.setTextSize(10);
-        mTextPaint.setColor(Color.WHITE);
-    }
-
-    public int getNumRows() {
-        return mNumRows;
-    }
-
-    public int getSelectedRow() {
-        return mSelectedRow;
-    }
-
-    public void setDesiredHeight(int desiredHeight) {
-        mDesiredHeight = desiredHeight;
-    }
-
-    public String getLabel() {
-        return mLabel;
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        setMeasuredDimension(
-            measureWidth(widthMeasureSpec),
-            measureHeight(heightMeasureSpec));
-    }
-
-    private int measureWidth(int measureSpec) {
-        int specMode = MeasureSpec.getMode(measureSpec);
-        int specSize = MeasureSpec.getSize(measureSpec);
-
-        int desiredWidth = 300 + mPaddingLeft + mPaddingRight;
-        if (specMode == MeasureSpec.EXACTLY) {
-            // We were told how big to be
-            return specSize;
-        } else if (specMode == MeasureSpec.AT_MOST) {
-            return desiredWidth < specSize ? desiredWidth : specSize;
-        } else {
-            return desiredWidth;
-        }
-    }
-
-    private int measureHeight(int measureSpec) {
-        int specMode = MeasureSpec.getMode(measureSpec);
-        int specSize = MeasureSpec.getSize(measureSpec);
-
-        int desiredHeight = mDesiredHeight != null ?
-                mDesiredHeight :
-                mNumRows * mEstimatedPixelHeight + mPaddingTop + mPaddingBottom;
-        if (specMode == MeasureSpec.EXACTLY) {
-            // We were told how big to be
-            return specSize;
-        } else if (specMode == MeasureSpec.AT_MOST) {
-            return desiredHeight < specSize ? desiredHeight : specSize;
-        } else {
-            return desiredHeight;
-        }
-    }
-
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        int rectTop = mPaddingTop;
-        int rectLeft = mPaddingLeft;
-        int rectRight = getWidth() - mPaddingRight;
-        for (int i = 0; i < mNumRows; i++) {
-
-            mPainter.setColor(Color.BLACK);
-            mPainter.setAlpha(0x20);
-
-            int rowHeight = getRowHeight(i);
-
-            // draw background rect
-            mTempRect.set(rectLeft, rectTop, rectRight, rectTop + rowHeight);
-            canvas.drawRect(mTempRect, mPainter);
-
-            // draw forground rect
-            if (i == mSelectedRow && hasFocus()) {
-                mPainter.setColor(Color.RED);
-                mPainter.setAlpha(0xF0);
-                mTextPaint.setAlpha(0xFF);
-            } else {
-                mPainter.setColor(Color.BLACK);
-                mPainter.setAlpha(0x40);
-                mTextPaint.setAlpha(0xF0);
-            }
-            mTempRect.set(rectLeft + 2, rectTop + 2,
-                    rectRight - 2, rectTop + rowHeight - 2);
-            canvas.drawRect(mTempRect, mPainter);
-
-            // draw text to help when visually inspecting
-            canvas.drawText(
-                    Integer.toString(i),
-                    rectLeft + 2,
-                    rectTop + 2 - (int) mTextPaint.ascent(),
-                    mTextPaint);
-
-            rectTop += rowHeight;
-        }
-    }
-
-    private int getRowHeight(int row) {
-        final int availableHeight = getHeight() - mPaddingTop - mPaddingBottom;
-        final int desiredRowHeight = availableHeight / mNumRows;
-        if (row < mNumRows - 1) {
-            return desiredRowHeight;
-        } else {
-            final int residualHeight = availableHeight % mNumRows;
-            return desiredRowHeight + residualHeight;
-        }
-    }
-
-    public void getRectForRow(Rect rect, int row) {
-        final int rowHeight = getRowHeight(row);
-        final int top = mPaddingTop + row * rowHeight;
-        rect.set(mPaddingLeft,
-                top,
-                getWidth() - mPaddingRight,
-                top + rowHeight);
-    }
-
-
-    void ensureRectVisible() {
-        getRectForRow(mTempRect, mSelectedRow);
-        requestRectangleOnScreen(mTempRect);
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        switch(event.getKeyCode()) {
-            case KeyEvent.KEYCODE_DPAD_UP:
-                if (mSelectedRow > 0) {
-                    mSelectedRow--;
-                    invalidate();
-                    ensureRectVisible();
-                    return true;
-                }
-                break;
-            case KeyEvent.KEYCODE_DPAD_DOWN:
-                if (mSelectedRow < (mNumRows - 1)) {
-                    mSelectedRow++;
-                    invalidate();
-                    ensureRectVisible();
-                    return true;
-                }
-                break;
-        }
-        return false;
-    }
-
-
-    @Override
-    public void getFocusedRect(Rect r) {
-        getRectForRow(r, mSelectedRow);
-    }
-
-    @Override
-    protected void onFocusChanged(boolean focused, int direction,
-            Rect previouslyFocusedRect) {
-        super.onFocusChanged(focused, direction, previouslyFocusedRect);
-
-        if (focused) {
-            switch (direction) {
-                case View.FOCUS_DOWN:
-                    mSelectedRow = 0;
-                    break;
-                case View.FOCUS_UP:
-                    mSelectedRow = mNumRows - 1;
-                    break;
-                case View.FOCUS_LEFT:  // fall through
-                case View.FOCUS_RIGHT:
-                    // set the row that is closest to the rect
-                    if (previouslyFocusedRect != null) {
-                        int y = previouslyFocusedRect.top
-                                + (previouslyFocusedRect.height() / 2);
-                        int yPerRow = getHeight() / mNumRows;
-                        mSelectedRow = y / yPerRow;
-                    } else {
-                        mSelectedRow = 0;
-                    }
-                    break;
-                default:
-                    // can't gleam any useful information about what internal
-                    // selection should be...
-                    return;
-            }
-            invalidate();
-        }
-    }
-
-    @Override
-    public String toString() {
-        if (mLabel != null) {
-            return mLabel;
-        }
-        return super.toString();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/util/ListItemFactory.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/util/ListItemFactory.java
deleted file mode 100755
index 788fcf6212aff47eacfbe43fc2c0d81a1286488d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/util/ListItemFactory.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.util;
-
-import android.content.Context;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AbsListView;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-/**
- * Reusable methods for creating more complex list items.
- */
-public class ListItemFactory {
-
-    /**
-     * Create a view with a button at the top and bottom, with filler in between.
-     * The filler is sized to take up any space left over within desiredHeight.
-     *
-     * @param position      The position within the list.
-     * @param context       The context.
-     * @param desiredHeight The desired height of the entire view.
-     * @return The created view.
-     */
-    public static View twoButtonsSeparatedByFiller(int position, Context context, int desiredHeight) {
-        if (desiredHeight < 90) {
-            throw new IllegalArgumentException("need at least 90 pixels of height " +
-                    "to create the two buttons and leave 10 pixels for the filler");
-        }
-
-        final LinearLayout ll = new LinearLayout(context);
-        ll.setOrientation(LinearLayout.VERTICAL);
-
-        final LinearLayout.LayoutParams buttonLp =
-                new LinearLayout.LayoutParams(
-                        ViewGroup.LayoutParams.MATCH_PARENT,
-                        50);
-
-        final Button topButton = new Button(context);
-        topButton.setLayoutParams(
-                buttonLp);
-        topButton.setText("top (position " + position + ")");
-        ll.addView(topButton);
-
-        final TextView middleFiller = new TextView(context);
-        middleFiller.setLayoutParams(new LinearLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                desiredHeight - 100));
-        middleFiller.setText("filler");
-        ll.addView(middleFiller);
-
-        final Button bottomButton = new Button(context);
-        bottomButton.setLayoutParams(buttonLp);
-        bottomButton.setText("bottom (position " + position + ")");
-        ll.addView(bottomButton);
-        ll.setTag("twoButtons");
-        return ll;
-    }
-
-    public enum Slot {
-        Left,
-        Middle,
-        Right
-    }
-
-    /**
-     * Create a horizontal linear layout divided into thirds (with some margins
-     * separating the thirds), filled with buttons into some slots.
-     * @param context The context.
-     * @param desiredHeight The height of the LL.
-     * @param slots Which slots to fill with buttons.
-     * @return The linear layout.
-     */
-    public static View horizontalButtonSlots(Context context, int desiredHeight, Slot... slots) {
-
-        final LinearLayout ll = new LinearLayout(context);
-        ll.setOrientation(LinearLayout.HORIZONTAL);
-
-        final LinearLayout.LayoutParams lp
-                = new LinearLayout.LayoutParams(0, desiredHeight);
-        lp.setMargins(10, 0, 10, 0);
-        lp.weight = 0.33f;
-
-        boolean left = false;
-        boolean middle = false;
-        boolean right = false;
-        for (Slot slot : slots) {
-            switch (slot) {
-                case Left:
-                    left = true;
-                    break;
-                case Middle:
-                    middle = true;
-                    break;
-                case Right:
-                    right = true;
-                    break;
-            }
-        }
-
-        if (left) {
-            final Button button = new Button(context);
-            button.setText("left");
-            ll.addView(button, lp);
-        } else {
-           ll.addView(new View(context), lp);
-        }
-
-        if (middle) {
-            final Button button = new Button(context);
-            button.setText("center");
-            ll.addView(button, lp);
-        } else {
-           ll.addView(new View(context), lp);
-        }
-
-        if (right) {
-            final Button button = new Button(context);
-            button.setText("right");
-            ll.addView(button, lp);
-        } else {
-           ll.addView(new View(context), lp);
-        }
-
-        return ll;
-    }
-
-
-    /**
-     * Create a button ready to be a list item.
-     *
-     * @param position      The position within the list.
-     * @param context       The context.
-     * @param text          The text of the button
-     * @param desiredHeight The desired height of the button
-     * @return The created view.
-     */
-    public static View button(int position, Context context, String text, int desiredHeight) {
-        TextView result = new Button(context);
-        result.setHeight(desiredHeight);
-        result.setText(text);
-        final ViewGroup.LayoutParams lp = new AbsListView.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT);
-        result.setLayoutParams(lp);
-        result.setId(position);
-        result.setTag("button");
-        return result;
-    }
-
-    /**
-     * Convert an existing button view to display the data at a new position.
-     *
-     * @param convertView Non-null Button created by {@link #button}
-     * @param text The text of the button
-     * @param position The position withion the list
-     * @return The converted view
-     */
-    public static View convertButton(View convertView, String text, int position) {
-        if (((String) convertView.getTag()).equals("button")) {
-            ((Button) convertView).setText(text);
-            convertView.setId(position);
-            return convertView;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Create a text view ready to be a list item.
-     *
-     * @param position      The position within the list.
-     * @param context       The context.
-     * @param text          The text to display
-     * @param desiredHeight The desired height of the text view
-     * @return The created view.
-     */
-    public static View text(int position, Context context, String text, int desiredHeight) {
-        TextView result = new TextView(context);
-        result.setHeight(desiredHeight);
-        result.setText(text);
-        final ViewGroup.LayoutParams lp = new AbsListView.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT);
-        result.setLayoutParams(lp);
-        result.setId(position);
-        result.setTag("text");
-        return result;
-    }
-
-    /**
-     * Convert an existing text view to display the data at a new position.
-     *
-     * @param convertView Non-null TextView created by {@link #text}
-     * @param text The text to display
-     * @param position The position withion the list
-     * @return The converted view
-     */
-    public static View convertText(View convertView, String text, int position) {
-        if (convertView.getTag() != null && ((String) convertView.getTag()).equals("text")) {
-            ((TextView) convertView).setText(text);
-            convertView.setId(position);
-            return convertView;
-
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Create a text view ready to be a list item.
-     *
-     * @param position      The position within the list.
-     * @param context       The context.
-     * @param text          The text of the button
-     * @param desiredHeight The desired height of the button
-     * @return The created view.
-     */
-    public static View doubleText(int position, Context context, String text, int desiredHeight) {
-        final LinearLayout ll = new LinearLayout(context);
-        ll.setOrientation(LinearLayout.HORIZONTAL);
-
-        final AbsListView.LayoutParams lp =
-                new AbsListView.LayoutParams(
-                        ViewGroup.LayoutParams.MATCH_PARENT,
-                        desiredHeight);
-        ll.setLayoutParams(lp);
-        ll.setId(position);
-
-        TextView t1 = new TextView(context);
-        t1.setHeight(desiredHeight);
-        t1.setText(text);
-        t1.setGravity(Gravity.LEFT | Gravity.CENTER_VERTICAL);
-        final ViewGroup.LayoutParams lp1 = new LinearLayout.LayoutParams(
-                0,
-                ViewGroup.LayoutParams.WRAP_CONTENT, 1.0f);
-        ll.addView(t1, lp1);
-
-        TextView t2 = new TextView(context);
-        t2.setHeight(desiredHeight);
-        t2.setText(text);
-        t2.setGravity(Gravity.RIGHT | Gravity.CENTER_VERTICAL);
-        final ViewGroup.LayoutParams lp2 = new LinearLayout.LayoutParams(
-                0,
-                ViewGroup.LayoutParams.WRAP_CONTENT,
-                1.0f);
-
-        ll.addView(t2, lp2);
-        ll.setTag("double");
-        return ll;
-    }
-
-
-    /**
-     * Convert an existing button view to display the data at a new position.
-     *
-     * @param convertView Non-null view created by {@link #doubleText}
-     * @param text The text of the button
-     * @param position The position withion the list
-     * @return The converted view
-     */
-    public static View convertDoubleText(View convertView, String text, int position) {
-        if (((String) convertView.getTag()).equals("double")) {
-            TextView t1 = (TextView) ((LinearLayout) convertView).getChildAt(0);
-            TextView t2 = (TextView) ((LinearLayout) convertView).getChildAt(1);
-            t1.setText(text);
-            t2.setText(text);
-            convertView.setId(position);
-            return convertView;
-        } else {
-            return null;
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/util/ListScenario.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/util/ListScenario.java
deleted file mode 100755
index 99fbadfc2cd517795edb6b01faaf0e53f25e4a35..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/util/ListScenario.java
+++ /dev/null
@@ -1,671 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.util;
-
-import android.app.Activity;
-import android.graphics.Rect;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.ListView;
-import android.widget.TextView;
-import com.google.android.collect.Maps;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Utility base class for creating various List scenarios.  Configurable by the number
- * of items, how tall each item should be (in relation to the screen height), and
- * what item should start with selection.
- */
-public abstract class ListScenario extends Activity {
-
-    private ListView mListView;
-    private TextView mHeaderTextView;
-
-    private int mNumItems;
-    protected boolean mItemsFocusable;
-
-    private int mStartingSelectionPosition;
-    private double mItemScreenSizeFactor;
-    private Map<Integer, Double> mOverrideItemScreenSizeFactors = Maps.newHashMap();
-
-    private int mScreenHeight;
-
-    // whether to include a text view above the list
-    private boolean mIncludeHeader;
-
-    // separators
-    private Set<Integer> mUnselectableItems = new HashSet<Integer>();
-
-    private boolean mStackFromBottom;
-
-    private int mClickedPosition = -1;
-
-    private int mLongClickedPosition = -1;
-
-    private int mConvertMisses = 0;
-
-    private int mHeaderViewCount;
-    private boolean mHeadersFocusable;
-
-    private int mFooterViewCount;
-    private LinearLayout mLinearLayout;
-
-    public ListView getListView() {
-        return mListView;
-    }
-
-    protected int getScreenHeight() {
-        return mScreenHeight;
-    }
-
-    /**
-     * Return whether the item at position is selectable (i.e is a separator).
-     * (external users can access this info using the adapter)
-     */
-    private boolean isItemAtPositionSelectable(int position) {
-        return !mUnselectableItems.contains(position);
-    }
-
-    /**
-     * Better way to pass in optional params than a honkin' paramater list :)
-     */
-    public static class Params {
-        private int mNumItems = 4;
-        private boolean mItemsFocusable = false;
-        private int mStartingSelectionPosition = 0;
-        private double mItemScreenSizeFactor = 1 / 5;
-        private Double mFadingEdgeScreenSizeFactor = null;
-
-        private Map<Integer, Double> mOverrideItemScreenSizeFactors = Maps.newHashMap();
-
-        // separators
-        private List<Integer> mUnselectableItems = new ArrayList<Integer>(8);
-        // whether to include a text view above the list
-        private boolean mIncludeHeader = false;
-        private boolean mStackFromBottom = false;
-        public boolean mMustFillScreen = true;
-        private int mHeaderViewCount;
-        private boolean mHeaderFocusable = false;
-        private int mFooterViewCount;
-
-        private boolean mConnectAdapter = true;
-
-        /**
-         * Set the number of items in the list.
-         */
-        public Params setNumItems(int numItems) {
-            mNumItems = numItems;
-            return this;
-        }
-
-        /**
-         * Set whether the items are focusable.
-         */
-        public Params setItemsFocusable(boolean itemsFocusable) {
-            mItemsFocusable = itemsFocusable;
-            return this;
-        }
-
-        /**
-         * Set the position that starts selected.
-         *
-         * @param startingSelectionPosition The selected position within the adapter's data set.
-         * Pass -1 if you do not want to force a selection.
-         * @return
-         */
-        public Params setStartingSelectionPosition(int startingSelectionPosition) {
-            mStartingSelectionPosition = startingSelectionPosition;
-            return this;
-        }
-
-        /**
-         * Set the factor that determines how tall each item is in relation to the
-         * screen height.
-         */
-        public Params setItemScreenSizeFactor(double itemScreenSizeFactor) {
-            mItemScreenSizeFactor = itemScreenSizeFactor;
-            return this;
-        }
-
-        /**
-         * Override the item screen size factor for a particular item.  Useful for
-         * creating lists with non-uniform item height.
-         * @param position The position in the list.
-         * @param itemScreenSizeFactor The screen size factor to use for the height.
-         */
-        public Params setPositionScreenSizeFactorOverride(
-                int position, double itemScreenSizeFactor) {
-            mOverrideItemScreenSizeFactors.put(position, itemScreenSizeFactor);
-            return this;
-        }
-
-        /**
-         * Set a position as unselectable (a.k.a a separator)
-         * @param position
-         * @return
-         */
-        public Params setPositionUnselectable(int position) {
-            mUnselectableItems.add(position);
-            return this;
-        }
-
-        /**
-         * Set positions as unselectable (a.k.a a separator)
-         */
-        public Params setPositionsUnselectable(int ...positions) {
-            for (int pos : positions) {
-                setPositionUnselectable(pos);
-            }
-            return this;
-        }
-
-        /**
-         * Include a header text view above the list.
-         * @param includeHeader
-         * @return
-         */
-        public Params includeHeaderAboveList(boolean includeHeader) {
-            mIncludeHeader = includeHeader;
-            return this;
-        }
-
-        /**
-         * Sets the stacking direction
-         * @param stackFromBottom
-         * @return
-         */
-        public Params setStackFromBottom(boolean stackFromBottom) {
-            mStackFromBottom = stackFromBottom;
-            return this;
-        }
-
-        /**
-         * Sets whether the sum of the height of the list items must be at least the
-         * height of the list view.
-         */
-        public Params setMustFillScreen(boolean fillScreen) {
-            mMustFillScreen = fillScreen;
-            return this;
-        }
-
-        /**
-         * Set the factor for the fading edge length.
-         */
-        public Params setFadingEdgeScreenSizeFactor(double fadingEdgeScreenSizeFactor) {
-            mFadingEdgeScreenSizeFactor = fadingEdgeScreenSizeFactor;
-            return this;
-        }
-
-        /**
-         * Set the number of header views to appear within the list
-         */
-        public Params setHeaderViewCount(int headerViewCount) {
-            mHeaderViewCount = headerViewCount;
-            return this;
-        }
-
-        /**
-         * Set whether the headers should be focusable.
-         * @param headerFocusable Whether the headers should be focusable (i.e
-         *   created as edit texts rather than text views).
-         */
-        public Params setHeaderFocusable(boolean headerFocusable) {
-            mHeaderFocusable = headerFocusable;
-            return this;
-        }
-
-        /**
-         * Set the number of footer views to appear within the list
-         */
-        public Params setFooterViewCount(int footerViewCount) {
-            mFooterViewCount = footerViewCount;
-            return this;
-        }
-
-        /**
-         * Sets whether the {@link ListScenario} will automatically set the
-         * adapter on the list view. If this is false, the client MUST set it
-         * manually (this is useful when adding headers to the list view, which
-         * must be done before the adapter is set).
-         */
-        public Params setConnectAdapter(boolean connectAdapter) {
-            mConnectAdapter = connectAdapter;
-            return this;
-        }
-    }
-
-    /**
-     * How each scenario customizes its behavior.
-     * @param params
-     */
-    protected abstract void init(Params params);
-
-    /**
-     * Override this if you want to know when something has been selected (perhaps
-     * more importantly, that {@link android.widget.AdapterView.OnItemSelectedListener} has
-     * been triggered).
-     */
-    protected void positionSelected(int positon) {
-    }
-
-    /**
-     * Override this if you want to know that nothing is selected.
-     */
-    protected void nothingSelected() {
-    }
-
-    /**
-     * Override this if you want to know when something has been clicked (perhaps
-     * more importantly, that {@link android.widget.AdapterView.OnItemClickListener} has
-     * been triggered).
-     */
-    protected void positionClicked(int position) {
-        setClickedPosition(position);
-    }
-
-    /**
-     * Override this if you want to know when something has been long clicked (perhaps
-     * more importantly, that {@link android.widget.AdapterView.OnItemLongClickListener} has
-     * been triggered).
-     */
-    protected void positionLongClicked(int position) {
-        setLongClickedPosition(position);
-    }
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        // for test stability, turn off title bar
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-
-
-        mScreenHeight = getWindowManager().getDefaultDisplay().getHeight();
-
-        final Params params = createParams();
-        init(params);
-
-        readAndValidateParams(params);
-
-
-        mListView = createListView();
-        mListView.setLayoutParams(new ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT));
-        mListView.setDrawSelectorOnTop(false);
-
-        for (int i = 0; i < mHeaderViewCount; i++) {
-            TextView header = mHeadersFocusable ?
-                    new EditText(this) :
-                    new TextView(this);
-            header.setText("Header: " + i);
-            mListView.addHeaderView(header);
-        }
-
-        for (int i = 0; i < mFooterViewCount; i++) {
-            TextView header = new TextView(this);
-            header.setText("Footer: " + i);
-            mListView.addFooterView(header);
-        }
-
-        if (params.mConnectAdapter) {
-            setAdapter(mListView);
-        }
-
-        mListView.setItemsCanFocus(mItemsFocusable);
-        if (mStartingSelectionPosition >= 0) {
-            mListView.setSelection(mStartingSelectionPosition);
-        }
-        mListView.setPadding(0, 0, 0, 0);
-        mListView.setStackFromBottom(mStackFromBottom);
-        mListView.setDivider(null);
-
-        mListView.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            public void onItemSelected(AdapterView parent, View v, int position, long id) {
-                positionSelected(position);
-            }
-
-            public void onNothingSelected(AdapterView parent) {
-                nothingSelected();
-            }
-        });
-
-        mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            public void onItemClick(AdapterView parent, View v, int position, long id) {
-                positionClicked(position);
-            }
-        });
-
-        // set the fading edge length porportionally to the screen
-        // height for test stability
-        if (params.mFadingEdgeScreenSizeFactor != null) {
-            mListView.setFadingEdgeLength((int) (params.mFadingEdgeScreenSizeFactor * mScreenHeight));
-        } else {
-            mListView.setFadingEdgeLength((int) ((64.0 / 480) * mScreenHeight));
-        }
-
-        /**
-         * M: [ALPS00428138] 1. enable fading edge, otherwise setting fading edge length is unmeaning
-         * 2. set small velocity scale to disable fling @{
-         */
-        mListView.setVerticalFadingEdgeEnabled(true);
-        mListView.setVelocityScale(0.0f);
-        /** @} */
-
-
-        if (mIncludeHeader) {
-            mLinearLayout = new LinearLayout(this);
-
-            mHeaderTextView = new TextView(this);
-            mHeaderTextView.setText("hi");
-            mHeaderTextView.setLayoutParams(new LinearLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.WRAP_CONTENT));
-            mLinearLayout.addView(mHeaderTextView);
-
-            mLinearLayout.setOrientation(LinearLayout.VERTICAL);
-            mLinearLayout.setLayoutParams(new ViewGroup.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.MATCH_PARENT));
-            mListView.setLayoutParams((new LinearLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    0,
-                    1f)));
-
-            mLinearLayout.addView(mListView);
-            setContentView(mLinearLayout);
-        } else {
-            mLinearLayout = new LinearLayout(this);
-            mLinearLayout.setOrientation(LinearLayout.VERTICAL);
-            mLinearLayout.setLayoutParams(new ViewGroup.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.MATCH_PARENT));
-            mListView.setLayoutParams((new LinearLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    0,
-                    1f)));
-            mLinearLayout.addView(mListView);
-            setContentView(mLinearLayout);
-        }
-    }
-
-    /**
-     * Returns the LinearLayout containing the ListView in this scenario.
-     *
-     * @return The LinearLayout in which the ListView is held.
-     */
-    protected LinearLayout getListViewContainer() {
-        return mLinearLayout;
-    }
-
-    /**
-     * Attaches a long press listener. You can find out which views were clicked by calling
-     * {@link #getLongClickedPosition()}.
-     */
-    public void enableLongPress() {
-        mListView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
-            public boolean onItemLongClick(AdapterView parent, View v, int position, long id) {
-                positionLongClicked(position);
-                return true;
-            }
-        });
-    }
-
-    /**
-     * @return The newly created ListView widget.
-     */
-    protected ListView createListView() {
-        return new ListView(this);
-    }
-
-    /**
-     * @return The newly created Params object.
-     */
-    protected Params createParams() {
-        return new Params();
-    }
-
-    /**
-     * Sets an adapter on a ListView.
-     *
-     * @param listView The ListView to set the adapter on.
-     */
-    protected void setAdapter(ListView listView) {
-        listView.setAdapter(new MyAdapter());
-    }
-
-    /**
-     * Read in and validate all of the params passed in by the scenario.
-     * @param params
-     */
-    protected void readAndValidateParams(Params params) {
-        if (params.mMustFillScreen) {
-            double totalFactor = 0.0;
-            for (int i = 0; i < params.mNumItems; i++) {
-                if (params.mOverrideItemScreenSizeFactors.containsKey(i)) {
-                    totalFactor += params.mOverrideItemScreenSizeFactors.get(i);
-                } else {
-                    totalFactor += params.mItemScreenSizeFactor;
-                }
-            }
-            if (totalFactor < 1.0) {
-                throw new IllegalArgumentException("list items must combine to be at least " +
-                        "the height of the screen.  this is not the case with " + params.mNumItems
-                        + " items and " + params.mItemScreenSizeFactor + " screen factor and " +
-                        "screen height of " + mScreenHeight);
-            }
-        }
-
-        mNumItems = params.mNumItems;
-        mItemsFocusable = params.mItemsFocusable;
-        mStartingSelectionPosition = params.mStartingSelectionPosition;
-        mItemScreenSizeFactor = params.mItemScreenSizeFactor;
-
-        mOverrideItemScreenSizeFactors.putAll(params.mOverrideItemScreenSizeFactors);
-
-        mUnselectableItems.addAll(params.mUnselectableItems);
-        mIncludeHeader = params.mIncludeHeader;
-        mStackFromBottom = params.mStackFromBottom;
-        mHeaderViewCount = params.mHeaderViewCount;
-        mHeadersFocusable = params.mHeaderFocusable;
-        mFooterViewCount = params.mFooterViewCount;
-    }
-
-    public final String getValueAtPosition(int position) {
-        return isItemAtPositionSelectable(position)
-                ?
-                "position " + position :
-                "------- " + position;
-    }
-
-    /**
-     * @return The height that will be set for a particular position.
-     */
-    public int getHeightForPosition(int position) {
-        int desiredHeight = (int) (mScreenHeight * mItemScreenSizeFactor);
-        if (mOverrideItemScreenSizeFactors.containsKey(position)) {
-            desiredHeight = (int) (mScreenHeight * mOverrideItemScreenSizeFactors.get(position));
-        }
-        return desiredHeight;
-    }
-
-
-    /**
-     * @return The contents of the header above the list.
-     * @throws IllegalArgumentException if there is no header.
-     */
-    public final String getHeaderValue() {
-        if (!mIncludeHeader) {
-            throw new IllegalArgumentException("no header above list");
-        }
-        return mHeaderTextView.getText().toString();
-    }
-
-    /**
-     * @param value What to put in the header text view
-     * @throws IllegalArgumentException if there is no header.
-     */
-    protected final void setHeaderValue(String value) {
-        if (!mIncludeHeader) {
-            throw new IllegalArgumentException("no header above list");
-        }
-        mHeaderTextView.setText(value);
-    }
-
-    /**
-     * Create a view for a list item.  Override this to create a custom view beyond
-     * the simple focusable / unfocusable text view.
-     * @param position The position.
-     * @param parent The parent
-     * @param desiredHeight The height the view should be to respect the desired item
-     *   to screen height ratio.
-     * @return a view for the list.
-     */
-    protected View createView(int position, ViewGroup parent, int desiredHeight) {
-        return ListItemFactory.text(position, parent.getContext(), getValueAtPosition(position),
-                desiredHeight);
-    }
-
-    /**
-     * Convert a non-null view.
-     */
-    public View convertView(int position, View convertView, ViewGroup parent) {
-        return ListItemFactory.convertText(convertView, getValueAtPosition(position), position);
-    }
-
-    public void setClickedPosition(int clickedPosition) {
-        mClickedPosition = clickedPosition;
-    }
-
-    public int getClickedPosition() {
-        return mClickedPosition;
-    }
-
-    public void setLongClickedPosition(int longClickedPosition) {
-        mLongClickedPosition = longClickedPosition;
-    }
-
-    public int getLongClickedPosition() {
-        return mLongClickedPosition;
-    }
-
-    /**
-     * Have a child of the list view call {@link View#requestRectangleOnScreen(android.graphics.Rect)}.
-     * @param childIndex The index into the viewgroup children (i.e the children that are
-     *   currently visible).
-     * @param rect The rectangle, in the child's coordinates.
-     */
-    public void requestRectangleOnScreen(int childIndex, final Rect rect) {
-        final View child = getListView().getChildAt(childIndex);
-
-        child.post(new Runnable() {
-            public void run() {
-                child.requestRectangleOnScreen(rect);
-            }
-        });
-    }
-
-    /**
-     * Return an item type for the specified position in the adapter. Override if your
-     * adapter creates more than one type.
-     */
-    public int getItemViewType(int position) {
-        return 0;
-    }
-
-    /**
-     * Return the number of types created by the adapter. Override if your
-     * adapter creates more than one type.
-     */
-    public int getViewTypeCount() {
-        return 1;
-    }
-
-    /**
-     * @return The number of times convertView failed
-     */
-    public int getConvertMisses() {
-        return mConvertMisses;
-    }
-
-    private class MyAdapter extends BaseAdapter {
-
-        public int getCount() {
-            return mNumItems;
-        }
-
-        public Object getItem(int position) {
-            return getValueAtPosition(position);
-        }
-
-        public long getItemId(int position) {
-            return position;
-        }
-
-        @Override
-        public boolean areAllItemsEnabled() {
-            return mUnselectableItems.isEmpty();
-        }
-
-        @Override
-        public boolean isEnabled(int position) {
-            return isItemAtPositionSelectable(position);
-        }
-
-        public View getView(int position, View convertView, ViewGroup parent) {
-            View result = null;
-            if (position >= mNumItems || position < 0) {
-                throw new IllegalStateException("position out of range for adapter!");
-            }
-
-            if (convertView != null) {
-                result = convertView(position, convertView, parent);
-                if (result == null) {
-                    mConvertMisses++;
-                }
-            }
-
-            if (result == null) {
-                int desiredHeight = getHeightForPosition(position);
-                result = createView(position, parent, desiredHeight);
-            }
-            return result;
-        }
-
-        @Override
-        public int getItemViewType(int position) {
-            return ListScenario.this.getItemViewType(position);
-        }
-
-        @Override
-        public int getViewTypeCount() {
-            return ListScenario.this.getViewTypeCount();
-        }
-
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/util/ListUtil.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/util/ListUtil.java
deleted file mode 100755
index b7c77c48510f500a850269822725de33c3946fa8..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/util/ListUtil.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.util;
-
-import android.app.Instrumentation;
-import android.view.KeyEvent;
-import android.widget.ListView;
-
-
-/**
- * Various useful stuff for instrumentation testing listview.
- */
-public class ListUtil {
-
-
-    private final ListView mListView;
-    private final Instrumentation mInstrumentation;
-
-    /**
-     * @param listView The listview to act on
-     * @param instrumentation The instrumentation to use.
-     */
-    public ListUtil(ListView listView, Instrumentation instrumentation) {
-        mListView = listView;
-        mInstrumentation = instrumentation;
-    }
-
-    /**
-     * Set the selected position of the list view.
-     * @param pos The desired position.
-     */
-    public final void setSelectedPosition(final int pos) {
-        mListView.post(new Runnable() {
-            public void run() {
-                mListView.setSelection(pos);
-            }
-        });
-        mInstrumentation.waitForIdleSync();
-    }
-
-    /**
-     * Get the top of the list.
-     */
-    public final int getListTop() {
-        return mListView.getListPaddingTop();
-    }
-
-    /**
-     * Get the bottom of the list.
-     */
-    public final int getListBottom() {
-        return mListView.getHeight() - mListView.getListPaddingBottom();
-    }
-
-    /**
-     * Arrow (up or down as appropriate) to the desired position in the list.
-     * @param desiredPos The desired position
-     * @throws IllegalStateException if the position can't be reached within 20 presses.
-     */
-    public final void arrowScrollToSelectedPosition(int desiredPos) {
-        if (desiredPos > mListView.getSelectedItemPosition()) {
-            arrowDownToSelectedPosition(desiredPos);
-        } else {
-            arrowUpToSelectedPosition(desiredPos);
-        }
-    }
-
-    private void arrowDownToSelectedPosition(int position) {
-        int maxDowns = 20;
-        while (mListView.getSelectedItemPosition() < position && --maxDowns > 0) {
-            mInstrumentation.sendCharacterSync(KeyEvent.KEYCODE_DPAD_DOWN);
-        }
-        if (position != mListView.getSelectedItemPosition()) {
-            throw new IllegalStateException("couldn't get to item after 20 downs");
-        }
-
-    }
-
-    private void arrowUpToSelectedPosition(int position) {
-        int maxUps = 20;
-        while (mListView.getSelectedItemPosition() > position && --maxUps > 0) {
-            mInstrumentation.sendCharacterSync(KeyEvent.KEYCODE_DPAD_UP);
-        }
-        if (position != mListView.getSelectedItemPosition()) {
-            throw new IllegalStateException("couldn't get to item after 20 ups");
-        }
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/util/ScrollViewScenario.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/util/ScrollViewScenario.java
deleted file mode 100755
index 6e05ed60bbc3989c77c1fd629d6b11fad43dd6d3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/util/ScrollViewScenario.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.util;
-
-import com.google.android.collect.Lists;
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.ScrollView;
-import android.widget.TextView;
-
-import java.util.List;
-
-/**
- * Utility base class for creating scroll view scenarios, allowing you to add
- * a series of different kinds of views arranged vertically, taking up a
- * specified amount of the screen height.
- */
-public abstract class ScrollViewScenario extends Activity {
-
-    /**
-     * Holds content of scroll view
-     */
-    private LinearLayout mLinearLayout;
-
-    /**
-     * The actual scroll view
-     */
-    private ScrollView mScrollView;
-
-
-    /**
-     * What we need of each view that the user wants: the view, and the ratio
-     * to the screen height for its desired height.
-     */
-    private interface ViewFactory {
-        View create(final Context context);
-
-        float getHeightRatio();
-    }
-
-    /**
-     * Partially implement ViewFactory given a height ratio.
-     * A negative height ratio means that WRAP_CONTENT will be used as height
-     */
-    private static abstract class ViewFactoryBase implements ViewFactory {
-
-        private float mHeightRatio;
-
-        @SuppressWarnings({"UnusedDeclaration" })
-        private ViewFactoryBase() { throw new UnsupportedOperationException("don't call this!"); }
-
-        protected ViewFactoryBase(float heightRatio) {
-            mHeightRatio = heightRatio;
-        }
-
-        public float getHeightRatio() {
-            return mHeightRatio;
-        }
-    }
-
-    /**
-     * Builder for selecting the views to be vertically arranged in the scroll
-     * view.
-     */
-    @SuppressWarnings({"JavaDoc" })
-    public static class Params {
-
-        List<ViewFactory> mViewFactories = Lists.newArrayList();
-
-        int mTopPadding = 0;
-        int mBottomPadding = 0;
-
-        /**
-         * Add a text view.
-         * @param text The text of the text view.
-         * @param heightRatio The view's height will be this * the screen height.
-         */
-        public Params addTextView(final String text, float heightRatio) {
-            mViewFactories.add(new ViewFactoryBase(heightRatio) {
-                public View create(final Context context) {
-                    final TextView tv = new TextView(context);
-                    tv.setText(text);
-                    return tv;
-                }
-            });
-            return this;
-        }
-
-        /**
-         * Add multiple text views.
-         * @param numViews the number of views to add.
-         * @param textPrefix The text to prepend to each text view.
-         * @param heightRatio The view's height will be this * the screen height.
-         */
-        public Params addTextViews(int numViews, String textPrefix, float heightRatio) {
-            for (int i = 0; i < numViews; i++) {
-                addTextView(textPrefix + i, heightRatio);
-            }
-            return this;
-        }
-
-        /**
-         * Add a button.
-         * @param text The text of the button.
-         * @param heightRatio The view's height will be this * the screen height.
-         */
-        public Params addButton(final String text, float heightRatio) {
-            mViewFactories.add(new ViewFactoryBase(heightRatio) {
-                public View create(final Context context) {
-                    final Button button = new Button(context);
-                    button.setText(text);
-                    return button;
-                }
-            });
-            return this;
-        }
-
-        /**
-         * Add multiple buttons.
-         * @param numButtons the number of views to add.
-         * @param textPrefix The text to prepend to each button.
-         * @param heightRatio The view's height will be this * the screen height.
-         */
-        public Params addButtons(int numButtons, String textPrefix, float heightRatio) {
-            for (int i = 0; i < numButtons; i++) {
-                addButton(textPrefix + i, heightRatio);
-            }
-            return this;
-        }
-
-        /**
-         * Add an {@link InternalSelectionView}.
-         * @param numRows The number of rows in the internal selection view.
-         * @param heightRatio The view's height will be this * the screen height.
-         */
-        public Params addInternalSelectionView(final int numRows, float heightRatio) {
-            mViewFactories.add(new ViewFactoryBase(heightRatio) {
-                public View create(final Context context) {
-                    return new InternalSelectionView(context, numRows, "isv");
-                }
-            });
-            return this;
-        }
-
-        /**
-         * Add a sublayout of buttons as a single child of the scroll view.
-         * @param numButtons The number of buttons in the sub layout
-         * @param heightRatio The layout's height will be this * the screen height.
-         */
-        public Params addVerticalLLOfButtons(final String prefix, final int numButtons, float heightRatio) {
-            mViewFactories.add(new ViewFactoryBase(heightRatio) {
-
-                public View create(Context context) {
-                    final LinearLayout ll = new LinearLayout(context);
-                    ll.setOrientation(LinearLayout.VERTICAL);
-
-                    // fill width, equally weighted on height
-                    final LinearLayout.LayoutParams lp =
-                            new LinearLayout.LayoutParams(
-                                    ViewGroup.LayoutParams.MATCH_PARENT, 0, 1f);
-                    for (int i = 0; i < numButtons; i++) {
-                        final Button button = new Button(context);
-                        button.setText(prefix + i);
-                        ll.addView(button, lp);
-                    }
-
-                    return ll;
-                }
-            });
-            return this;
-        }
-
-        public Params addPaddingToScrollView(int topPadding, int bottomPadding) {
-            mTopPadding = topPadding;
-            mBottomPadding = bottomPadding;
-
-            return this;
-        }
-    }
-
-    /**
-     * Override this and initialized the views in the scroll view.
-     * @param params Used to configure the contents of the scroll view.
-     */
-    protected abstract void init(Params params);
-
-    public LinearLayout getLinearLayout() {
-        return mLinearLayout;
-    }
-
-    public ScrollView getScrollView() {
-        return mScrollView;
-    }
-
-    /**
-     * Get the child contained within the vertical linear layout of the
-     * scroll view.
-     * @param index The index within the linear layout.
-     * @return the child within the vertical linear layout of the scroll view
-     *   at the specified index.
-     */
-    @SuppressWarnings({"unchecked" })
-    public <T extends View> T getContentChildAt(int index) {
-        return (T) mLinearLayout.getChildAt(index);
-    }
-
-    /**
-     * Hook for changing how scroll view's are created.
-     */
-    @SuppressWarnings({"JavaDoc" })
-    protected ScrollView createScrollView() {
-        return new ScrollView(this);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // for test stability, turn off title bar
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        int screenHeight = getWindowManager().getDefaultDisplay().getHeight()
-                - 25;
-        mLinearLayout = new LinearLayout(this);
-        mLinearLayout.setOrientation(LinearLayout.VERTICAL);
-
-        // initialize params
-        final Params params = new Params();
-        init(params);
-
-        // create views specified by params
-        for (ViewFactory viewFactory : params.mViewFactories) {
-            int height = ViewGroup.LayoutParams.WRAP_CONTENT;
-            if (viewFactory.getHeightRatio() >= 0) {
-                height = (int) (viewFactory.getHeightRatio() * screenHeight);
-            }
-            final LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT, height);
-            mLinearLayout.addView(viewFactory.create(this), lp);
-        }
-
-        mScrollView = createScrollView();
-        mScrollView.setPadding(0, params.mTopPadding, 0, params.mBottomPadding);
-        mScrollView.addView(mLinearLayout, new ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT));
-
-        // no animation to speed up tests
-        mScrollView.setSmoothScrollingEnabled(false);
-
-        setContentView(mScrollView);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/util/TouchModeFlexibleAsserts.java b/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/util/TouchModeFlexibleAsserts.java
deleted file mode 100755
index 6403429321577ed28ac0a3f07e3610dd24ae803c..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/widget/src/com/mediatek/common/widget/tests/util/TouchModeFlexibleAsserts.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mediatek.common.widget.tests.util;
-
-import junit.framework.Assert;
-
-import android.test.InstrumentationTestCase;
-import android.test.TouchUtils;
-import android.view.View;
-
-/**
- * When entering touch mode via touch, the tests can be flaky.  These asserts
- * are more flexible (allowing up to MAX_ATTEMPTS touches to enter touch mode via touch or
- * tap) until we can find a way to solve the flakiness.
- */
-public class TouchModeFlexibleAsserts {
-
-    private static int MAX_ATTEMPTS = 2;
-
-    private static int MAX_DELAY_MILLIS = 2000;
-
-    public static void assertInTouchModeAfterClick(InstrumentationTestCase test, View viewToTouch) {
-        int numAttemptsAtTouchMode = 0;
-        while (numAttemptsAtTouchMode < MAX_ATTEMPTS &&
-                !viewToTouch.isInTouchMode()) {
-            TouchUtils.clickView(test, viewToTouch);
-            numAttemptsAtTouchMode++;
-        }
-        Assert.assertTrue("even after " + MAX_ATTEMPTS + " clicks, did not enter "
-                + "touch mode", viewToTouch.isInTouchMode());
-        //Assert.assertEquals("number of touches to enter touch mode", 1, numAttemptsAtTouchMode);
-    }
-
-    public static void assertInTouchModeAfterTap(InstrumentationTestCase test, View viewToTouch) {
-        int numAttemptsAtTouchMode = 0;
-        while (numAttemptsAtTouchMode < MAX_ATTEMPTS &&
-                !viewToTouch.isInTouchMode()) {
-            TouchUtils.tapView(test, viewToTouch);
-            numAttemptsAtTouchMode++;
-        }
-        Assert.assertTrue("even after " + MAX_ATTEMPTS + " taps, did not enter "
-                + "touch mode", viewToTouch.isInTouchMode());
-        //Assert.assertEquals("number of touches to enter touch mode", 1, numAttemptsAtTouchMode);
-    }
-
-    public static void assertNotInTouchModeAfterKey(InstrumentationTestCase test, int keyCode, View checkForTouchMode) {
-        test.sendKeys(keyCode);
-        int amountLeft = MAX_DELAY_MILLIS;
-
-        while (checkForTouchMode.isInTouchMode() && amountLeft > 0) {
-            amountLeft -= 200;
-            try {
-                Thread.sleep(200);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-        }
-        Assert.assertFalse("even after waiting " + MAX_DELAY_MILLIS + " millis after "
-                + "pressing key event, still in touch mode", checkForTouchMode.isInTouchMode());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/wifi/Android.mk b/proprietary/frameworks/base/tests/wifi/Android.mk
deleted file mode 100755
index 05f91ccc0092c1ce3828ecb2b7898a72374a1254..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifi/Android.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := tests
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES += android.test.runner
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MediaTekCtsWifiTestCases
-
-LOCAL_CERTIFICATE:= platform
-
-# uncomment when dalvik.annotation.Test* are removed or part of SDK
-#LOCAL_SDK_VERSION := current
-
-include $(BUILD_PACKAGE)
-
-# Build the test APK using its own makefile, and any other CTS-related packages
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
diff --git a/proprietary/frameworks/base/tests/wifi/Android.mk_ b/proprietary/frameworks/base/tests/wifi/Android.mk_
deleted file mode 100755
index 05f91ccc0092c1ce3828ecb2b7898a72374a1254..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifi/Android.mk_
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := tests
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES += android.test.runner
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MediaTekCtsWifiTestCases
-
-LOCAL_CERTIFICATE:= platform
-
-# uncomment when dalvik.annotation.Test* are removed or part of SDK
-#LOCAL_SDK_VERSION := current
-
-include $(BUILD_PACKAGE)
-
-# Build the test APK using its own makefile, and any other CTS-related packages
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
diff --git a/proprietary/frameworks/base/tests/wifi/AndroidManifest.xml b/proprietary/frameworks/base/tests/wifi/AndroidManifest.xml
deleted file mode 100755
index 70ec14f9ed3f0599737d1c346b4be4676fdc0307..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifi/AndroidManifest.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mediatek.cts.net.wifi">
-
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
-    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" /> 
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.mediatek.cts.net.wifi"
-                     android:label="CTS tests of android.net.wifi"/>
-</manifest>
-
diff --git a/proprietary/frameworks/base/tests/wifi/NOTICE b/proprietary/frameworks/base/tests/wifi/NOTICE
deleted file mode 100755
index 4637a4c4429745a16e84567299dc414019efdd4d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifi/NOTICE
+++ /dev/null
@@ -1,34 +0,0 @@
-* Copyright (C) 2012 The Android Open Source Project:
-
-
-
-* Copyright (C) 2008 The Android Open Source Project:
-
-
-
-* Copyright (C) 2013 The Android Open Source Project:
-
-
-
-* Copyright (C) 2009 The Android Open Source Project:
-
-
-
-/*
-* Copyright (C) 2011-2014 MediaTek Inc.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-:
- 
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/wifi/README b/proprietary/frameworks/base/tests/wifi/README
deleted file mode 100755
index 12d1e6e7d1d937f0ffa51268f4c99033cb654101..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifi/README
+++ /dev/null
@@ -1,21 +0,0 @@
-WHAT IT DOES?
-=============
-This is a wifi auto test APK
-The purpose of wifi test  is to test wifi functionality
-including CTS wifi test and MTK proprietary APIs test/
-The RD should be able to verify wifi issues easily by using this program. 
-
-
-HOW IT WAS BUILT?
-==================
-
-
-[Build Method]
-
-mmm vendor/mediatek/proprietary/frameworks/base/tests/wifi
-
-HOW TO USE IT?
-==============
-install -r MediaTekCtsWifiTestCases.apk
-adb shell pm list instrumentation
-adb shell am instrument -w com.mediatek.cts.net.wifi/android.test.InstrumentationTestRunner
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/ConcurrencyTest.java b/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/ConcurrencyTest.java
deleted file mode 100755
index d60d516104f4af26342953a56e90cb06e3d28ee3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/ConcurrencyTest.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.net.wifi.cts;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.wifi.WifiManager;
-import android.net.wifi.p2p.WifiP2pManager;
-import android.test.AndroidTestCase;
-
-public class ConcurrencyTest extends AndroidTestCase {
-    private class MySync {
-        int expectedWifiState;
-        int expectedP2pState;
-    }
-
-    private WifiManager mWifiManager;
-    private MySync mMySync = new MySync();
-
-    private static final String TAG = "WifiInfoTest";
-    private static final int TIMEOUT_MSEC = 6000;
-    private static final int WAIT_MSEC = 60;
-    private static final int DURATION = 10000;
-    private IntentFilter mIntentFilter;
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            final String action = intent.getAction();
-            if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) {
-                synchronized (mMySync) {
-                    mMySync.expectedWifiState = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE,
-                            WifiManager.WIFI_STATE_DISABLED);
-                    mMySync.notify();
-                }
-            } else if (action.equals(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION)) {
-                synchronized (mMySync) {
-                    mMySync.expectedP2pState = intent.getIntExtra(WifiP2pManager.EXTRA_WIFI_STATE,
-                            WifiP2pManager.WIFI_P2P_STATE_DISABLED);
-                    mMySync.notify();
-                }
-            }
-        }
-    };
-
-    @Override
-    protected void setUp() throws Exception {
-       super.setUp();
-       if (!WifiFeature.isWifiSupported(getContext()) &&
-                !WifiFeature.isP2pSupported(getContext())) {
-            // skip the test if WiFi && p2p are not supported
-            return;
-        }
-        mIntentFilter = new IntentFilter();
-        mIntentFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION);
-
-        mContext.registerReceiver(mReceiver, mIntentFilter);
-        mWifiManager = (WifiManager) getContext().getSystemService(Context.WIFI_SERVICE);
-        assertNotNull(mWifiManager);
-        if (mWifiManager.isWifiEnabled()) {
-            assertTrue(mWifiManager.setWifiEnabled(false));
-            Thread.sleep(DURATION);
-        }
-        assertTrue(!mWifiManager.isWifiEnabled());
-        mMySync.expectedWifiState = WifiManager.WIFI_STATE_DISABLED;
-        mMySync.expectedP2pState = WifiP2pManager.WIFI_P2P_STATE_DISABLED;
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        if (!WifiFeature.isWifiSupported(getContext()) &&
-                !WifiFeature.isP2pSupported(getContext())) {
-            // skip the test if WiFi and p2p are not supported
-            super.tearDown();
-            return;
-        }
-        mContext.unregisterReceiver(mReceiver);
-
-        if (mWifiManager.isWifiEnabled()) {
-            assertTrue(mWifiManager.setWifiEnabled(false));
-            Thread.sleep(DURATION);
-        }
-        super.tearDown();
-    }
-
-    private void waitForBroadcasts() {
-        synchronized (mMySync) {
-            long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-            while (System.currentTimeMillis() < timeout
-                    && (mMySync.expectedWifiState != WifiManager.WIFI_STATE_ENABLED ||
-                    mMySync.expectedP2pState != WifiP2pManager.WIFI_P2P_STATE_ENABLED)) {
-                try {
-                    mMySync.wait(WAIT_MSEC);
-                } catch (InterruptedException e) { }
-            }
-        }
-    }
-
-    public void testConcurrency() {
-        // Cannot support p2p alone
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            assertTrue(!WifiFeature.isP2pSupported(getContext()));
-            return;
-        }
-
-        if (!WifiFeature.isP2pSupported(getContext())) {
-            // skip the test if p2p is not supported
-            return;
-        }
-
-        // Enable wifi
-        assertTrue(mWifiManager.setWifiEnabled(true));
-
-        waitForBroadcasts();
-
-        assertTrue(mMySync.expectedWifiState == WifiManager.WIFI_STATE_ENABLED);
-        assertTrue(mMySync.expectedP2pState == WifiP2pManager.WIFI_P2P_STATE_ENABLED);
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/ScanResultTest.java b/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/ScanResultTest.java
deleted file mode 100755
index f3d663a7c20de39f2af016a7a1e59b232c3c68a3..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/ScanResultTest.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.net.wifi.cts;
-
-import java.util.List;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.wifi.ScanResult;
-import android.net.wifi.WifiManager;
-import android.net.wifi.WifiManager.WifiLock;
-import android.test.AndroidTestCase;
-
-public class ScanResultTest extends AndroidTestCase {
-    private static class MySync {
-        int expectedState = STATE_NULL;
-    }
-
-    private WifiManager mWifiManager;
-    private WifiLock mWifiLock;
-    private static MySync mMySync;
-
-    private static final int STATE_NULL = 0;
-    private static final int STATE_WIFI_CHANGING = 1;
-    private static final int STATE_WIFI_CHANGED = 2;
-    private static final int STATE_START_SCAN = 3;
-    private static final int STATE_SCAN_RESULTS_AVAILABLE = 4;
-
-    private static final String TAG = "WifiInfoTest";
-    private static final int TIMEOUT_MSEC = 6000;
-    private static final int WAIT_MSEC = 60;
-    private static final int ENABLE_WAIT_MSEC = 10000;
-    private static final int SCAN_WAIT_MSEC = 10000;
-    private IntentFilter mIntentFilter;
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            final String action = intent.getAction();
-            if (action.equals(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION)) {
-                synchronized (mMySync) {
-                    mMySync.expectedState = STATE_WIFI_CHANGED;
-                    mMySync.notify();
-                }
-            } else if (action.equals(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION)) {
-                synchronized (mMySync) {
-                    mMySync.expectedState = STATE_SCAN_RESULTS_AVAILABLE;
-                    mMySync.notify();
-                }
-            }
-        }
-    };
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            return;
-        }
-        mMySync = new MySync();
-        mIntentFilter = new IntentFilter();
-        mIntentFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
-        mIntentFilter.addAction(WifiManager.SUPPLICANT_CONNECTION_CHANGE_ACTION);
-        mIntentFilter.addAction(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiManager.RSSI_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiManager.NETWORK_IDS_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiManager.ACTION_PICK_WIFI_NETWORK);
-
-        mContext.registerReceiver(mReceiver, mIntentFilter);
-        mWifiManager = (WifiManager) getContext().getSystemService(Context.WIFI_SERVICE);
-        assertNotNull(mWifiManager);
-        mWifiLock = mWifiManager.createWifiLock(TAG);
-        mWifiLock.acquire();
-        if (!mWifiManager.isWifiEnabled())
-            setWifiEnabled(true);
-        Thread.sleep(ENABLE_WAIT_MSEC);
-        assertTrue(mWifiManager.isWifiEnabled());
-        mMySync.expectedState = STATE_NULL;
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            super.tearDown();
-            return;
-        }
-        mWifiLock.release();
-        mContext.unregisterReceiver(mReceiver);
-        if (!mWifiManager.isWifiEnabled())
-            setWifiEnabled(true);
-        Thread.sleep(ENABLE_WAIT_MSEC);
-        super.tearDown();
-    }
-
-    private void setWifiEnabled(boolean enable) throws Exception {
-        synchronized (mMySync) {
-            mMySync.expectedState = STATE_WIFI_CHANGING;
-            assertTrue(mWifiManager.setWifiEnabled(enable));
-            waitForBroadcast(TIMEOUT_MSEC, STATE_WIFI_CHANGED);
-       }
-    }
-
-    private void waitForBroadcast(long timeout, int expectedState) throws Exception {
-        long waitTime = System.currentTimeMillis() + timeout;
-        while (System.currentTimeMillis() < waitTime
-                && mMySync.expectedState != expectedState)
-            mMySync.wait(WAIT_MSEC);
-    }
-
-    public void testScanResultProperties() {
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            return;
-        }
-        List<ScanResult> scanResults = mWifiManager.getScanResults();
-        // this test case should in Wifi environment
-        for (int i = 0; i < scanResults.size(); i++) {
-            ScanResult mScanResult = scanResults.get(i);
-            assertNotNull(mScanResult.toString());
-        }
-
-        // M: Add for test
-        ScanResult result = new ScanResult(null, null, null, 0, 0, 0);
-        assertNotNull(result.toString());
-    }
-
-    private void scanAndWait() throws Exception {
-        synchronized (mMySync) {
-            mMySync.expectedState = STATE_START_SCAN;
-            mWifiManager.startScan();
-            waitForBroadcast(SCAN_WAIT_MSEC, STATE_SCAN_RESULTS_AVAILABLE);
-        }
-   }
-
-    public void testScanResultTimeStamp() throws Exception {
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            return;
-        }
-
-        long timestamp = 0;
-        String BSSID = null;
-
-        /* Multiple scans to ensure bssid is updated */
-        scanAndWait();
-        scanAndWait();
-        scanAndWait();
-
-        List<ScanResult> scanResults = mWifiManager.getScanResults();
-        for (ScanResult result : scanResults) {
-            BSSID = result.BSSID;
-            timestamp = result.timestamp;
-            assertTrue(timestamp != 0);
-            break;
-        }
-
-        scanAndWait();
-        scanAndWait();
-        scanAndWait();
-
-        scanResults = mWifiManager.getScanResults();
-        for (ScanResult result : scanResults) {
-            if (result.BSSID.equals(BSSID)) {
-                long timeDiff = (result.timestamp - timestamp) / 1000;
-                assertTrue(timeDiff > 0);
-                assertTrue(timeDiff < 6 * SCAN_WAIT_MSEC);
-            }
-        }
-
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/SupplicantStateTest.java b/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/SupplicantStateTest.java
deleted file mode 100755
index 812a7c9ad838f940cc889544e5740f10152d829b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/SupplicantStateTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.net.wifi.cts;
-
-import android.net.wifi.SupplicantState;
-import android.test.AndroidTestCase;
-
-public class SupplicantStateTest extends AndroidTestCase {
-
-    public void testIsValidState() {
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            return;
-        }
-        assertTrue(SupplicantState.isValidState(SupplicantState.DISCONNECTED));
-        assertTrue(SupplicantState.isValidState(SupplicantState.INACTIVE));
-        assertTrue(SupplicantState.isValidState(SupplicantState.SCANNING));
-        assertTrue(SupplicantState.isValidState(SupplicantState.ASSOCIATING));
-        assertTrue(SupplicantState.isValidState(SupplicantState.ASSOCIATED));
-        assertTrue(SupplicantState.isValidState(SupplicantState.FOUR_WAY_HANDSHAKE));
-        assertTrue(SupplicantState.isValidState(SupplicantState.GROUP_HANDSHAKE));
-        assertTrue(SupplicantState.isValidState(SupplicantState.COMPLETED));
-        assertTrue(SupplicantState.isValidState(SupplicantState.DORMANT));
-        assertFalse(SupplicantState.isValidState(SupplicantState.UNINITIALIZED));
-        assertFalse(SupplicantState.isValidState(SupplicantState.INVALID));
-
-        // M: Add for test
-        assertTrue(SupplicantState.isHandshakeState(SupplicantState.AUTHENTICATING));
-        assertTrue(SupplicantState.isHandshakeState(SupplicantState.ASSOCIATING));
-        assertTrue(SupplicantState.isHandshakeState(SupplicantState.ASSOCIATED));
-        assertTrue(SupplicantState.isHandshakeState(SupplicantState.FOUR_WAY_HANDSHAKE));
-        assertTrue(SupplicantState.isHandshakeState(SupplicantState.GROUP_HANDSHAKE));
-        assertFalse(SupplicantState.isHandshakeState(SupplicantState.COMPLETED));
-        assertFalse(SupplicantState.isHandshakeState(SupplicantState.DISCONNECTED));
-        assertFalse(SupplicantState.isHandshakeState(SupplicantState.INTERFACE_DISABLED));
-        assertFalse(SupplicantState.isHandshakeState(SupplicantState.INACTIVE));
-        assertFalse(SupplicantState.isHandshakeState(SupplicantState.SCANNING));
-        assertFalse(SupplicantState.isHandshakeState(SupplicantState.DORMANT));
-        assertFalse(SupplicantState.isHandshakeState(SupplicantState.UNINITIALIZED));
-        assertFalse(SupplicantState.isHandshakeState(SupplicantState.INVALID));
-        try {
-            SupplicantState.isHandshakeState(SupplicantState.valueOf("ERROR"));
-        } catch (IllegalArgumentException e) {
-        }
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiConfigurationTest.java b/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiConfigurationTest.java
deleted file mode 100755
index ab42d0a2e486d8987dbf5805ae81a875bb861897..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiConfigurationTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.net.wifi.cts;
-
-import java.util.List;
-
-import android.content.Context;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-import android.test.AndroidTestCase;
-
-public class WifiConfigurationTest extends AndroidTestCase {
-    private  WifiManager mWifiManager;
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mWifiManager = (WifiManager) mContext
-                .getSystemService(Context.WIFI_SERVICE);
-    }
-
-    public void testWifiConfiguration() {
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            return;
-        }
-        List<WifiConfiguration> wifiConfigurations = mWifiManager.getConfiguredNetworks();
-        if (wifiConfigurations != null) {
-        for (int i = 0; i < wifiConfigurations.size(); i++) {
-            WifiConfiguration wifiConfiguration = wifiConfigurations.get(i);
-            assertNotNull(wifiConfiguration);
-            assertNotNull(wifiConfiguration.toString());
-            }
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiEnterpriseConfigTest.java b/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiEnterpriseConfigTest.java
deleted file mode 100755
index a6b50e51e901b36616bd5d2137f58134fa7448a6..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiEnterpriseConfigTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package mediatek.net.wifi.cts;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiEnterpriseConfig;
-import android.net.wifi.WifiEnterpriseConfig.Eap;
-import android.net.wifi.WifiEnterpriseConfig.Phase2;
-import android.net.wifi.WifiManager;
-import android.test.AndroidTestCase;
-
-public class WifiEnterpriseConfigTest extends AndroidTestCase {
-    private  WifiManager mWifiManager;
-
-    private static final String SSID = "\"TestSSID\"";
-    private static final String IDENTITY = "identity";
-    private static final String PASSWORD = "password";
-    private static final String SUBJECT_MATCH = "subjectmatch";
-    private static final String ANON_IDENTITY = "anonidentity";
-    private static final int ENABLE_DELAY = 10000;
-
-    private boolean hasWifi() {
-        return getContext().getPackageManager().hasSystemFeature(
-                PackageManager.FEATURE_WIFI);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mWifiManager = (WifiManager) mContext
-                .getSystemService(Context.WIFI_SERVICE);
-        assertNotNull(mWifiManager);
-        mWifiManager.setWifiEnabled(true);
-        Thread.sleep(ENABLE_DELAY);
-        if (hasWifi()) {
-            assertTrue(mWifiManager.isWifiEnabled());
-        }
-    }
-
-    public void testSettersAndGetters() {
-        if (!hasWifi()) {
-            return;
-        }
-
-        WifiEnterpriseConfig config = new WifiEnterpriseConfig();
-        assertTrue(config.getEapMethod() == Eap.NONE);
-        config.setEapMethod(Eap.PEAP);
-        assertTrue(config.getEapMethod() == Eap.PEAP);
-        config.setEapMethod(Eap.PWD);
-        assertTrue(config.getEapMethod() == Eap.PWD);
-        config.setEapMethod(Eap.TLS);
-        assertTrue(config.getEapMethod() == Eap.TLS);
-        config.setEapMethod(Eap.TTLS);
-        assertTrue(config.getEapMethod() == Eap.TTLS);
-        assertTrue(config.getPhase2Method() == Phase2.NONE);
-        config.setPhase2Method(Phase2.PAP);
-        assertTrue(config.getPhase2Method() == Phase2.PAP);
-        config.setPhase2Method(Phase2.MSCHAP);
-        assertTrue(config.getPhase2Method() == Phase2.MSCHAP);
-        config.setPhase2Method(Phase2.MSCHAPV2);
-        assertTrue(config.getPhase2Method() == Phase2.MSCHAPV2);
-        config.setPhase2Method(Phase2.GTC);
-        assertTrue(config.getPhase2Method() == Phase2.GTC);
-        config.setIdentity(IDENTITY);
-        assertTrue(config.getIdentity().equals(IDENTITY));
-        config.setAnonymousIdentity(ANON_IDENTITY);
-        assertTrue(config.getAnonymousIdentity().equals(ANON_IDENTITY));
-        config.setPassword(PASSWORD);
-        assertTrue(config.getPassword().equals(PASSWORD));
-        config.setCaCertificate(null);
-        config.setClientKeyEntry(null, null);
-        config.setSubjectMatch(SUBJECT_MATCH);
-        assertTrue(config.getSubjectMatch().equals(SUBJECT_MATCH));
-    }
-
-    public void testAddEapNetwork() {
-        if (!hasWifi()) {
-            return;
-        }
-
-        WifiConfiguration config = new WifiConfiguration();
-        WifiEnterpriseConfig enterpriseConfig = new WifiEnterpriseConfig();
-        enterpriseConfig.setEapMethod(Eap.PWD);
-        enterpriseConfig.setIdentity(IDENTITY);
-        enterpriseConfig.setPassword(PASSWORD);
-        config.SSID = SSID;
-        config.enterpriseConfig = enterpriseConfig;
-
-        int netId = mWifiManager.addNetwork(config);
-        assertTrue(doesSsidExist(SSID));
-        mWifiManager.removeNetwork(netId);
-        ///M: mark because test case fail on L early
-      //  assertFalse(doesSsidExist(SSID));
-    }
-
-    private boolean doesSsidExist(String ssid) {
-        for (final WifiConfiguration w : mWifiManager.getConfiguredNetworks()) {
-            if (w.SSID.equals(ssid))
-                return true;
-        }
-        return false;
-    }
-}
diff --git a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiFeature.java b/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiFeature.java
deleted file mode 100755
index 8c167314c7343311a218df06707a02bb70079c7f..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiFeature.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.net.wifi.cts;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-
-public class WifiFeature {
-    static boolean isWifiSupported(Context context) {
-        PackageManager packageManager = context.getPackageManager();
-        return packageManager.hasSystemFeature(PackageManager.FEATURE_WIFI);
-    }
-
-    static boolean isP2pSupported(Context context) {
-        PackageManager packageManager = context.getPackageManager();
-        return packageManager.hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiInfoTest.java b/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiInfoTest.java
deleted file mode 100755
index 8bb0985d3512c51a74afaf00d17c922a0eac6bc5..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiInfoTest.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.net.wifi.cts;
-
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.wifi.SupplicantState;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.net.wifi.WifiManager.WifiLock;
-import android.test.AndroidTestCase;
-
-
-public class WifiInfoTest extends AndroidTestCase {
-    private static class MySync {
-        int expectedState = STATE_NULL;
-    }
-
-    private WifiManager mWifiManager;
-    private WifiLock mWifiLock;
-    private static MySync mMySync;
-
-    private static final int STATE_NULL = 0;
-    private static final int STATE_WIFI_CHANGING = 1;
-    private static final int STATE_WIFI_CHANGED = 2;
-
-    private static final String TAG = "WifiInfoTest";
-    private static final int TIMEOUT_MSEC = 6000;
-    private static final int WAIT_MSEC = 60;
-    private static final int DURATION = 10000;
-    private IntentFilter mIntentFilter;
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            final String action = intent.getAction();
-            if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) {
-                synchronized (mMySync) {
-                    mMySync.expectedState = STATE_WIFI_CHANGED;
-                    mMySync.notify();
-                }
-            }
-        }
-    };
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            return;
-        }
-        mMySync = new MySync();
-        mIntentFilter = new IntentFilter();
-        mIntentFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
-
-        mContext.registerReceiver(mReceiver, mIntentFilter);
-        mWifiManager = (WifiManager) getContext().getSystemService(Context.WIFI_SERVICE);
-        assertNotNull(mWifiManager);
-        mWifiLock = mWifiManager.createWifiLock(TAG);
-        mWifiLock.acquire();
-        if (!mWifiManager.isWifiEnabled())
-            setWifiEnabled(true);
-        Thread.sleep(DURATION);
-        assertTrue(mWifiManager.isWifiEnabled());
-        mMySync.expectedState = STATE_NULL;
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            super.tearDown();
-            return;
-        }
-        mWifiLock.release();
-        mContext.unregisterReceiver(mReceiver);
-        if (!mWifiManager.isWifiEnabled())
-            setWifiEnabled(true);
-        Thread.sleep(DURATION);
-        super.tearDown();
-    }
-
-    private void setWifiEnabled(boolean enable) throws Exception {
-        synchronized (mMySync) {
-            mMySync.expectedState = STATE_WIFI_CHANGING;
-            assertTrue(mWifiManager.setWifiEnabled(enable));
-            long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-            while (System.currentTimeMillis() < timeout
-                    && mMySync.expectedState == STATE_WIFI_CHANGING)
-                mMySync.wait(WAIT_MSEC);
-        }
-    }
-
-    public void testWifiInfoProperties() throws Exception {
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            return;
-        }
-        // this test case should in Wifi environment
-        WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
-
-        assertNotNull(wifiInfo);
-        assertNotNull(wifiInfo.toString());
-        SupplicantState.isValidState(wifiInfo.getSupplicantState());
-        WifiInfo.getDetailedStateOf(SupplicantState.DISCONNECTED);
-        String ssid = wifiInfo.getSSID();
-        if (ssid.startsWith("0x") == false) {
-            // Non-hex string should be quoted
-            assertTrue(ssid.charAt(0) == '"');
-            assertTrue(ssid.charAt(ssid.length() - 1) == '"');
-        }
-
-        wifiInfo.getBSSID();
-        wifiInfo.getIpAddress();
-        wifiInfo.getLinkSpeed();
-        wifiInfo.getRssi();
-        wifiInfo.getHiddenSSID();
-        wifiInfo.getMacAddress();
-        setWifiEnabled(false);
-        ///M: can't not use pollCheck
-        Thread.sleep(DURATION);
-        wifiInfo = mWifiManager.getConnectionInfo();
-        assertEquals(-1, wifiInfo.getNetworkId());
-        assertEquals(WifiManager.WIFI_STATE_DISABLED, mWifiManager.getWifiState());
-
-        // M: Add for test
-        assertNotNull(wifiInfo.toString());
-        WifiInfo testInfo = new WifiInfo(wifiInfo);
-        testInfo.setMeteredHint(true);
-        assertTrue(testInfo.getMeteredHint());
-        //testInfo.setHiddenSSID(true);
-//        assertTrue(testInfo.getHiddenSSID());
-        assertNull(WifiInfo.removeDoubleQuotes(null));
-        assertNotNull(WifiInfo.removeDoubleQuotes("TEST"));
-        assertNotNull(WifiInfo.removeDoubleQuotes("\"TEST\""));
-    }
-
-}
diff --git a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiManagerTest.java b/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiManagerTest.java
deleted file mode 100755
index 20e053fa5a4be19bb63c2ecbd85577c2394e8cf1..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiManagerTest.java
+++ /dev/null
@@ -1,668 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.net.wifi.cts;
-
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.NetworkInfo;
-import android.net.wifi.ScanResult;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiConfiguration.Status;
-import android.net.wifi.WifiManager;
-import android.net.wifi.WifiManager.TxPacketCountListener;
-import android.net.wifi.WifiManager.WifiLock;
-import android.os.SystemClock;
-import android.test.AndroidTestCase;
-import android.util.Log;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiConfiguration.AuthAlgorithm;
-import android.net.wifi.WifiConfiguration.GroupCipher;
-import android.net.wifi.WifiConfiguration.KeyMgmt;
-import android.net.wifi.WifiConfiguration.PairwiseCipher;
-import android.net.wifi.WifiConfiguration.Protocol;
-
-
-
-public class WifiManagerTest extends AndroidTestCase {
-    private static class MySync {
-        int expectedState = STATE_NULL;
-    }
-
-    private WifiManager mWifiManager;
-    private WifiLock mWifiLock;
-    private static MySync mMySync;
-    private List<ScanResult> mScanResults = null;
-    private NetworkInfo mNetworkInfo;
-
-    // Please refer to WifiManager
-    private static final int MIN_RSSI = -100;
-    private static final int MAX_RSSI = -55;
-
-    private static final int STATE_NULL = 0;
-    private static final int STATE_WIFI_CHANGING = 1;
-    private static final int STATE_WIFI_ENABLED = 2;
-    private static final int STATE_WIFI_DISABLED = 3;
-    private static final int STATE_SCANNING = 4;
-    private static final int STATE_SCAN_RESULTS_AVAILABLE = 5;
-
-    private static final String TAG = "WifiManagerTest";
-    private static final String SSID1 = "\"WifiManagerTest\"";
-    private static final String SSID2 = "\"WifiManagerTestModified\"";
-    private static final int TIMEOUT_MSEC = 6000;
-    private static final int WAIT_MSEC = 60;
-    private static final int DURATION = 10000;
-    private static final int WIFI_SCAN_TEST_INTERVAL_MILLIS = 60 * 1000;
-    private static final int WIFI_SCAN_TEST_CACHE_DELAY_MILLIS = 3 * 60 * 1000;
-    private static final int WIFI_SCAN_TEST_ITERATIONS = 5;
-
-    private IntentFilter mIntentFilter;
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            final String action = intent.getAction();
-            if (action.equals(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION)) {
-                synchronized (mMySync) {
-                    if (mWifiManager.getScanResults() != null) {
-                        mScanResults = mWifiManager.getScanResults();
-                        mMySync.expectedState = STATE_SCAN_RESULTS_AVAILABLE;
-                        mScanResults = mWifiManager.getScanResults();
-                        mMySync.notifyAll();
-                    }
-                }
-            } else if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) {
-                int newState = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE,
-                        WifiManager.WIFI_STATE_UNKNOWN);
-                synchronized (mMySync) {
-                    if (newState == WifiManager.WIFI_STATE_ENABLED) {
-                        Log.d(TAG, "*** New WiFi state is ENABLED ***");
-                        mMySync.expectedState = STATE_WIFI_ENABLED;
-                        mMySync.notifyAll();
-                    } else if (newState == WifiManager.WIFI_STATE_DISABLED) {
-                        Log.d(TAG, "*** New WiFi state is DISABLED ***");
-                        mMySync.expectedState = STATE_WIFI_DISABLED;
-                        mMySync.notifyAll();
-                    }
-                }
-            } else if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) {
-                synchronized (mMySync) {
-                    mNetworkInfo =
-                            (NetworkInfo) intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO);
-                    if (mNetworkInfo.getState() == NetworkInfo.State.CONNECTED)
-                        mMySync.notifyAll();
-                }
-            }
-        }
-    };
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            return;
-        }
-        mMySync = new MySync();
-        mIntentFilter = new IntentFilter();
-        mIntentFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
-        mIntentFilter.addAction(WifiManager.SUPPLICANT_CONNECTION_CHANGE_ACTION);
-        mIntentFilter.addAction(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiManager.RSSI_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiManager.NETWORK_IDS_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiManager.ACTION_PICK_WIFI_NETWORK);
-
-        mContext.registerReceiver(mReceiver, mIntentFilter);
-        mWifiManager = (WifiManager) getContext().getSystemService(Context.WIFI_SERVICE);
-        assertNotNull(mWifiManager);
-        mWifiLock = mWifiManager.createWifiLock(TAG);
-        mWifiLock.acquire();
-        if (!mWifiManager.isWifiEnabled())
-            setWifiEnabled(true);
-        Thread.sleep(DURATION);
-        assertTrue(mWifiManager.isWifiEnabled());
-        synchronized (mMySync) {
-            mMySync.expectedState = STATE_NULL;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            super.tearDown();
-            return;
-        }
-        if (!mWifiManager.isWifiEnabled())
-            setWifiEnabled(true);
-        mWifiLock.release();
-        mContext.unregisterReceiver(mReceiver);
-        Thread.sleep(DURATION);
-        super.tearDown();
-    }
-
-    private void setWifiEnabled(boolean enable) throws Exception {
-        synchronized (mMySync) {
-            assertTrue(mWifiManager.setWifiEnabled(enable));
-            if (mWifiManager.isWifiEnabled() != enable) {
-                mMySync.expectedState = STATE_WIFI_CHANGING;
-                long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-                int expectedState = (enable ? STATE_WIFI_ENABLED : STATE_WIFI_DISABLED);
-                while (System.currentTimeMillis() < timeout
-                        && mMySync.expectedState != expectedState)
-                    mMySync.wait(WAIT_MSEC);
-            }
-        }
-    }
-
-    private void startScan() throws Exception {
-        synchronized (mMySync) {
-            mMySync.expectedState = STATE_SCANNING;
-            assertTrue(mWifiManager.startScan());
-            long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-            while (System.currentTimeMillis() < timeout && mMySync.expectedState == STATE_SCANNING)
-                mMySync.wait(WAIT_MSEC);
-        }
-    }
-
-    private void connectWifi() throws Exception {
-        synchronized (mMySync) {
-            if (mNetworkInfo.getState() == NetworkInfo.State.CONNECTED) return;
-            assertTrue(mWifiManager.reconnect());
-            long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-            while (System.currentTimeMillis() < timeout
-                    && mNetworkInfo.getState() != NetworkInfo.State.CONNECTED)
-                mMySync.wait(WAIT_MSEC);
-            assertTrue(mNetworkInfo.getState() == NetworkInfo.State.CONNECTED);
-        }
-    }
-
-    private boolean existSSID(String ssid) {
-        for (final WifiConfiguration w : mWifiManager.getConfiguredNetworks()) {
-            if (w.SSID.equals(ssid))
-                return true;
-        }
-        return false;
-    }
-
-    private int findConfiguredNetworks(String SSID, List<WifiConfiguration> networks) {
-        for (final WifiConfiguration w : networks) {
-            if (w.SSID.equals(SSID))
-                return networks.indexOf(w);
-        }
-        return -1;
-    }
-
-    private void assertDisableOthers(WifiConfiguration wifiConfiguration, boolean disableOthers) {
-        for (WifiConfiguration w : mWifiManager.getConfiguredNetworks()) {
-            if ((!w.SSID.equals(wifiConfiguration.SSID)) && w.status != Status.CURRENT) {
-                if (disableOthers) {
-                    assertEquals(Status.DISABLED, w.status);
-                }
-            }
-        }
-    }
-
-    /**
-     * test point of wifiManager actions:
-     * 1.reconnect
-     * 2.reassociate
-     * 3.disconnect
-     * 4.pingSupplicant
-     * 5.satrtScan
-     */
-    public void testWifiManagerActions() throws Exception {
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            return;
-        }
-        assertTrue(mWifiManager.reconnect());
-        assertTrue(mWifiManager.reassociate());
-        assertTrue(mWifiManager.disconnect());
-        assertTrue(mWifiManager.pingSupplicant());
-
-        // M: Add for test start
-        assertTrue(mWifiManager.addToBlacklist("FF:FF:FF:FF:FF:FF"));
-        assertTrue(mWifiManager.clearBlacklist());
-        assertTrue(mWifiManager.startScan());
-        assertTrue(mWifiManager.initializeMulticastFiltering());
-        assertNotNull(mWifiManager.getConfigFile());
-        //assertNotNull(mWifiManager.getWifiStateMachineMessenger());
-        assertNotNull(mWifiManager.createMulticastLock("TEST"));
-        mWifiManager.setFrequencyBand(mWifiManager.getFrequencyBand(), true);
-        mWifiManager.setFrequencyBand(mWifiManager.getFrequencyBand(), false);
-        mWifiManager.setCountryCode("CN", false);
-        mWifiManager.isDualBandSupported();
-        mWifiManager.isMulticastEnabled();
-        assertTrue(mWifiManager.addNetwork(null) == -1);
-        assertTrue(mWifiManager.updateNetwork(null) == -1);
-        assertTrue(mWifiManager.updateNetwork(new WifiConfiguration()) == -1);
-        //assertTrue(mWifiManager.addSimCardAuthenticationService("TEST", new Binder()));
-        // M: Add for test end
-
-        startScan();
-        setWifiEnabled(false);
-        Thread.sleep(DURATION);
-        assertTrue(mWifiManager.pingSupplicant() == mWifiManager.isScanAlwaysAvailable());
-        final String TAG = "Test";
-        assertNotNull(mWifiManager.createWifiLock(TAG));
-        assertNotNull(mWifiManager.createWifiLock(WifiManager.WIFI_MODE_FULL, TAG));
-    }
-
-    /**
-     * test point of wifiManager properties:
-     * 1.enable properties
-     * 2.DhcpInfo properties
-     * 3.wifi state
-     * 4.ConnectionInfo
-     */
-    public void testWifiManagerProperties() throws Exception {
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            return;
-        }
-        setWifiEnabled(true);
-        assertTrue(mWifiManager.isWifiEnabled());
-        assertNotNull(mWifiManager.getDhcpInfo());
-        assertEquals(WifiManager.WIFI_STATE_ENABLED, mWifiManager.getWifiState());
-        mWifiManager.getConnectionInfo();
-        setWifiEnabled(false);
-        assertFalse(mWifiManager.isWifiEnabled());
-    }
-
-    /**
-     * Test WiFi scan timestamp - fails when WiFi scan timestamps are inconsistent with
-     * {@link SystemClock#elapsedRealtime()} on device.<p>
-     * To run this test in cts-tradefed:
-     * run cts --class android.net.wifi.cts.WifiManagerTest --method testWifiScanTimestamp
-     */
-    public void testWifiScanTimestamp() throws Exception {
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            Log.d(TAG, "Skipping test as WiFi is not supported");
-            return;
-        }
-        if (!mWifiManager.isWifiEnabled()) {
-            setWifiEnabled(true);
-        }
-        // Scan multiple times to make sure scan timestamps increase with device timestamp.
-        for (int i = 0; i < WIFI_SCAN_TEST_ITERATIONS; ++i) {
-            startScan();
-            // Make sure at least one AP is found.
-            assertFalse("empty scan results!", mScanResults.isEmpty());
-            long nowMillis = SystemClock.elapsedRealtime();
-            // Keep track of how many APs are fresh in one scan.
-            int numFreshAps = 0;
-            for (ScanResult result : mScanResults) {
-                long scanTimeMillis = TimeUnit.MICROSECONDS.toMillis(result.timestamp);
-                if (Math.abs(nowMillis - scanTimeMillis)  < WIFI_SCAN_TEST_CACHE_DELAY_MILLIS) {
-                    numFreshAps++;
-                }
-            }
-            // At least half of the APs in the scan should be fresh.
-            int numTotalAps = mScanResults.size();
-            String msg = "Stale AP count: " + (numTotalAps - numFreshAps) + ", fresh AP count: "
-                    + numFreshAps;
-            assertTrue(msg, numFreshAps * 2 >= mScanResults.size());
-            if (i < WIFI_SCAN_TEST_ITERATIONS - 1) {
-                // Wait before running next iteration.
-                Thread.sleep(WIFI_SCAN_TEST_INTERVAL_MILLIS);
-            }
-        }
-    }
-
-    /**
-     * test point of wifiManager NetWork:.
-     * 1.add NetWork
-     * 2.update NetWork
-     * 3.remove NetWork
-     * 4.enable NetWork
-     * 5.disable NetWork
-     * 6.configured Networks
-     * 7.save configure;
-     */
-    public void testWifiManagerNetWork() throws Exception {
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            return;
-        }
-
-        // store the list of enabled networks, so they can be re-enabled after test completes
-        Set<String> enabledSsids = getEnabledNetworks(mWifiManager.getConfiguredNetworks());
-        try {
-            WifiConfiguration wifiConfiguration;
-            // add a WifiConfig
-            final int notExist = -1;
-            List<WifiConfiguration> wifiConfiguredNetworks = mWifiManager.getConfiguredNetworks();
-            int pos = findConfiguredNetworks(SSID1, wifiConfiguredNetworks);
-            if (notExist != pos) {
-                wifiConfiguration = wifiConfiguredNetworks.get(pos);
-                mWifiManager.removeNetwork(wifiConfiguration.networkId);
-            }
-            pos = findConfiguredNetworks(SSID1, wifiConfiguredNetworks);
-            assertEquals(notExist, pos);
-            final int size = wifiConfiguredNetworks.size();
-
-            wifiConfiguration = new WifiConfiguration();
-            wifiConfiguration.SSID = SSID1;
-            int netId = mWifiManager.addNetwork(wifiConfiguration);
-            assertTrue(existSSID(SSID1));
-
-            wifiConfiguredNetworks = mWifiManager.getConfiguredNetworks();
-            assertEquals(size + 1, wifiConfiguredNetworks.size());
-            pos = findConfiguredNetworks(SSID1, wifiConfiguredNetworks);
-            assertTrue(notExist != pos);
-
-            // Enable & disable network
-            boolean disableOthers = false;
-            assertTrue(mWifiManager.enableNetwork(netId, disableOthers));
-            wifiConfiguration = mWifiManager.getConfiguredNetworks().get(pos);
-            assertDisableOthers(wifiConfiguration, disableOthers);
-            assertEquals(Status.ENABLED, wifiConfiguration.status);
-
-            assertTrue(mWifiManager.disableNetwork(netId));
-            wifiConfiguration = mWifiManager.getConfiguredNetworks().get(pos);
-            assertEquals(Status.DISABLED, wifiConfiguration.status);
-
-            // Update a WifiConfig
-            wifiConfiguration = wifiConfiguredNetworks.get(pos);
-            wifiConfiguration.SSID = SSID2;
-            netId = mWifiManager.updateNetwork(wifiConfiguration);
-            assertFalse(existSSID(SSID1));
-            assertTrue(existSSID(SSID2));
-
-            // Remove a WifiConfig
-            assertTrue(mWifiManager.removeNetwork(netId));
-            assertFalse(mWifiManager.removeNetwork(notExist));
-            assertFalse(existSSID(SSID1));
-            assertFalse(existSSID(SSID2));
-
-            assertTrue(mWifiManager.saveConfiguration());
-        } finally {
-            reEnableNetworks(enabledSsids, mWifiManager.getConfiguredNetworks());
-            mWifiManager.saveConfiguration();
-        }
-    }
-
-    private Set<String> getEnabledNetworks(List<WifiConfiguration> configuredNetworks) {
-        Set<String> ssids = new HashSet<String>();
-        for (WifiConfiguration wifiConfig : configuredNetworks) {
-            if (Status.ENABLED == wifiConfig.status || Status.CURRENT == wifiConfig.status) {
-                ssids.add(wifiConfig.SSID);
-                Log.i(TAG, String.format("remembering enabled network %s", wifiConfig.SSID));
-            }
-        }
-        return ssids;
-    }
-
-    private void reEnableNetworks(Set<String> enabledSsids,
-            List<WifiConfiguration> configuredNetworks) {
-        for (WifiConfiguration wifiConfig : configuredNetworks) {
-            if (enabledSsids.contains(wifiConfig.SSID)) {
-                mWifiManager.enableNetwork(wifiConfig.networkId, false);
-                Log.i(TAG, String.format("re-enabling network %s", wifiConfig.SSID));
-            }
-        }
-    }
-
-    public void testSignal() {
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            return;
-        }
-        final int numLevels = 9;
-        int expectLevel = 0;
-        assertEquals(expectLevel, WifiManager.calculateSignalLevel(MIN_RSSI, numLevels));
-        assertEquals(numLevels - 1, WifiManager.calculateSignalLevel(MAX_RSSI, numLevels));
-        expectLevel = 4;
-        assertEquals(expectLevel, WifiManager.calculateSignalLevel((MIN_RSSI + MAX_RSSI) / 2,
-                numLevels));
-        int rssiA = 4;
-        int rssiB = 5;
-        assertTrue(WifiManager.compareSignalLevel(rssiA, rssiB) < 0);
-        rssiB = 4;
-        assertTrue(WifiManager.compareSignalLevel(rssiA, rssiB) == 0);
-        rssiA = 5;
-        rssiB = 4;
-        assertTrue(WifiManager.compareSignalLevel(rssiA, rssiB) > 0);
-    }
-
-    private int getTxPacketCount() throws Exception {
-        final AtomicInteger ret = new AtomicInteger(-1);
-
-        mWifiManager.getTxPacketCount(new TxPacketCountListener() {
-            @Override
-            public void onSuccess(int count) {
-                ret.set(count);
-            }
-            @Override
-            public void onFailure(int reason) {
-                ret.set(0);
-            }
-        });
-
-        long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-        while (ret.get() < 0 && System.currentTimeMillis() < timeout)
-            Thread.sleep(WAIT_MSEC);
-        assertTrue(ret.get() >= 0);
-        return ret.get();
-    }
-
-    /**
-     * The new WiFi watchdog requires kernel/driver to export some packet loss
-     * counters. This CTS tests whether those counters are correctly exported.
-     * To pass this CTS test, a connected WiFi link is required.
-     */
-    /*
-    public void testWifiWatchdog() throws Exception {
-        // Make sure WiFi is enabled
-        if (!mWifiManager.isWifiEnabled()) {
-            setWifiEnabled(true);
-            Thread.sleep(DURATION);
-        }
-        assertTrue(mWifiManager.isWifiEnabled());
-
-        int i = 0;
-        for (; i < 15; i++) {
-            // Wait for a WiFi connection
-            connectWifi();
-
-            // Read TX packet counter
-            int txcount1 = getTxPacketCount();
-
-            // Do some network operations
-            HttpURLConnection connection = null;
-            try {
-                URL url = new URL("http://www.google.com/");
-                connection = (HttpURLConnection) url.openConnection();
-                connection.setInstanceFollowRedirects(false);
-                connection.setConnectTimeout(TIMEOUT_MSEC);
-                connection.setReadTimeout(TIMEOUT_MSEC);
-                connection.setUseCaches(false);
-                connection.getInputStream();
-            } catch (Exception e) {
-                // ignore
-            } finally {
-                if (connection != null) connection.disconnect();
-            }
-
-            // Read TX packet counter again and make sure it increases
-            int txcount2 = getTxPacketCount();
-
-            if (txcount2 > txcount1) {
-                break;
-            } else {
-                Thread.sleep(DURATION);
-            }
-        }
-        assertTrue(i < 15);
-    }
-    */
-
-///M:
-    public void testWifiAddedAPI() throws Exception {
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            return;
-        }
-        assertTrue(mWifiManager.doCtiaTestOn());
-        Thread.sleep(2000);
-        assertTrue(mWifiManager.doCtiaTestRate(0));
-        Thread.sleep(2000);
-        assertTrue(mWifiManager.doCtiaTestOff());
-        assertTrue(mWifiManager.setTxPower(1));
-        assertTrue(mWifiManager.setTxPowerEnabled(true));
-        assertTrue(mWifiManager.setTxPowerEnabled(false));
-    }
-
-    public void testWifiZConnection() throws Exception {
-        List<WifiConfiguration> wifiConfigurations = mWifiManager.getConfiguredNetworks();
-        if (wifiConfigurations != null) {
-            for (int i = 0; i < wifiConfigurations.size(); i++) {
-                mWifiManager.forget(wifiConfigurations.get(i).networkId, null);
-            }
-        }
-
-        WifiConfiguration config = new WifiConfiguration();
-        config.SSID = "\"mtkguest\"";
-        config.allowedKeyManagement.set(KeyMgmt.NONE);
-        WifiConfiguration newConfig = new WifiConfiguration(config);
-        mWifiManager.connect(config, null);
-        Thread.sleep(5000);
-        WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
-        assertNotNull(wifiInfo);
-        assertNotNull(wifiInfo.toString());
-        wifiInfo.getSSID();
-        wifiInfo.getBSSID();
-        wifiInfo.getIpAddress();
-        wifiInfo.getLinkSpeed();
-        wifiInfo.getRssi();
-        wifiInfo.getHiddenSSID();
-        wifiInfo.getMacAddress();
-        int netId = wifiInfo.getNetworkId();
-        if (netId != -1) {
-            mWifiManager.disable(wifiInfo.getNetworkId(), null);
-        }
-
-        WifiConfiguration wpaConfig = new WifiConfiguration();
-        wpaConfig.SSID = "\"mtklab\"";
-        wpaConfig.allowedKeyManagement.set(KeyMgmt.WPA_PSK);
-        wpaConfig.preSharedKey = "\"mtk80974\"";
-        mWifiManager.connect(wpaConfig, null);
-        Thread.sleep(5000);
-
-        WifiConfiguration wepConfig = new WifiConfiguration();
-        wepConfig.SSID = "\"FOTA\"";
-        wepConfig.allowedKeyManagement.set(KeyMgmt.NONE);
-        wepConfig.allowedAuthAlgorithms.set(AuthAlgorithm.OPEN);
-        wepConfig.allowedAuthAlgorithms.set(AuthAlgorithm.SHARED);
-        wepConfig.wepKeys[0] = "0123456789";
-        wepConfig.wepTxKeyIndex = 0;
-        mWifiManager.connect(wepConfig, null);
-        Thread.sleep(5000);
-
-        WifiConfiguration wapiConfig = new WifiConfiguration();
-        wapiConfig.SSID = "\"WAPI\"";
-        wapiConfig.allowedKeyManagement.set(KeyMgmt.WAPI_PSK);
-        wapiConfig.allowedProtocols.set(Protocol.WAPI);
-        wapiConfig.allowedPairwiseCiphers.set(PairwiseCipher.SMS4);
-        wapiConfig.allowedGroupCiphers.set(GroupCipher.SMS4);
-        wapiConfig.preSharedKey = "12345";
-        mWifiManager.connect(wapiConfig, null);
-        Thread.sleep(5000);
-
-        WifiConfiguration fakeWpa2Config = new WifiConfiguration();
-        fakeWpa2Config.SSID = "\"FAKEWPA2\"";
-        fakeWpa2Config.allowedKeyManagement.set(KeyMgmt.WPA2_PSK);
-        fakeWpa2Config.preSharedKey = "\"mtk80974\"";
-        mWifiManager.connect(fakeWpa2Config, null);
-        Thread.sleep(5000);
-
-        if (netId != -1) {
-            mWifiManager.connect(netId, null);
-            Thread.sleep(5000);
-        }
-
-        wifiConfigurations = mWifiManager.getConfiguredNetworks();
-        if (wifiConfigurations != null) {
-            for (int i = 0; i < wifiConfigurations.size(); i++) {
-                WifiConfiguration wifiConfiguration = wifiConfigurations.get(i);
-                wifiConfiguration.getAuthType();
-                assertNotNull(wifiConfiguration.toString());
-                mWifiManager.disable(wifiConfiguration.networkId, null);
-                mWifiManager.save(wifiConfiguration, null);
-            }
-        }
-        wifiConfigurations = mWifiManager.getConfiguredNetworks();
-        if (wifiConfigurations != null) {
-            for (int i = 0; i < wifiConfigurations.size(); i++) {
-                WifiConfiguration wifiConfiguration = wifiConfigurations.get(i);
-                assertNotNull(wifiConfiguration.toString());
-                mWifiManager.forget(wifiConfiguration.networkId, null);
-            }
-        }
-
-        try {
-            mWifiManager.connect(config, null);
-        } catch (IllegalArgumentException e) {
-        }
-        try {
-            mWifiManager.connect(null, null);
-        } catch (IllegalArgumentException e) {
-        }
-        try {
-            mWifiManager.connect(netId, null);
-        } catch (IllegalArgumentException e) {
-        }
-        try {
-             mWifiManager.connect(-1, null);
-        } catch (IllegalArgumentException e) {
-        }
-        try {
-             mWifiManager.disable(netId, null);
-        } catch (IllegalArgumentException e) {
-        }
-        try {
-             mWifiManager.disable(-1, null);
-        } catch (IllegalArgumentException e) {
-        }
-        try {
-             mWifiManager.save(newConfig, null);
-        } catch (IllegalArgumentException e) {
-        }
-        try {
-             mWifiManager.save(null, null);
-        } catch (IllegalArgumentException e) {
-        }
-        try {
-             mWifiManager.forget(netId, null);
-        } catch (IllegalArgumentException e) {
-        }
-        try {
-             mWifiManager.forget(-1, null);
-        } catch (IllegalArgumentException e) {
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiManager_WifiLockTest.java b/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiManager_WifiLockTest.java
deleted file mode 100755
index 9ab520f14f31d5c1b7a03f2a14a5bd745b6014c7..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiManager_WifiLockTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.net.wifi.cts;
-
-import android.content.Context;
-import android.net.wifi.WifiManager;
-import android.net.wifi.WifiManager.WifiLock;
-import android.test.AndroidTestCase;
-
-public class WifiManager_WifiLockTest extends AndroidTestCase {
-
-    private static final String WIFI_TAG = "WifiManager_WifiLockTest";
-
-    public void testWifiLock() {
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            return;
-        }
-        WifiManager wm = (WifiManager) getContext().getSystemService(Context.WIFI_SERVICE);
-        WifiLock wl = wm.createWifiLock(WIFI_TAG);
-
-        wl.setReferenceCounted(true);
-        assertFalse(wl.isHeld());
-        wl.acquire();
-        assertTrue(wl.isHeld());
-        wl.release();
-        assertFalse(wl.isHeld());
-        wl.acquire();
-        wl.acquire();
-        assertTrue(wl.isHeld());
-        wl.release();
-        assertTrue(wl.isHeld());
-        wl.release();
-        assertFalse(wl.isHeld());
-        assertNotNull(wl.toString());
-        try {
-            wl.release();
-            fail("should throw out exception because release is called"
-                    + " a greater number of times than acquire");
-        } catch (RuntimeException e) {
-            // expected
-        }
-
-        wl = wm.createWifiLock(WIFI_TAG);
-        wl.setReferenceCounted(false);
-        assertFalse(wl.isHeld());
-        wl.acquire();
-        assertTrue(wl.isHeld());
-        wl.release();
-        assertFalse(wl.isHeld());
-        wl.acquire();
-        wl.acquire();
-        assertTrue(wl.isHeld());
-        wl.release();
-        assertFalse(wl.isHeld());
-        assertNotNull(wl.toString());
-        // should be ignored
-        wl.release();
-    }
-}
diff --git a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiPluginTest.java b/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiPluginTest.java
deleted file mode 100755
index 86e9103ddba9f041c1d615855ab2571da58bb798..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiPluginTest.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.net.wifi.cts;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.wifi.WifiManager;
-import android.net.wifi.WifiManager.WifiLock;
-import android.provider.Settings;
-import android.test.AndroidTestCase;
-
-import com.mediatek.common.MPlugin;
-import com.mediatek.common.wifi.IWifiFwkExt;
-
-public class WifiPluginTest extends AndroidTestCase {
-    private IWifiFwkExt mWifiExt;
-
-    private static class MySync {
-        int expectedState = STATE_NULL;
-    }
-
-    private WifiManager mWifiManager;
-    private WifiLock mWifiLock;
-    private static MySync mMySync;
-
-    private static final int STATE_NULL = 0;
-    private static final int STATE_WIFI_CHANGING = 1;
-    private static final int STATE_WIFI_CHANGED = 2;
-
-    private static final String TAG = "WifiInfoTest";
-    private static final int TIMEOUT_MSEC = 6000;
-    private static final int WAIT_MSEC = 60;
-    private static final int DURATION = 10000;
-    private IntentFilter mIntentFilter;
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            final String action = intent.getAction();
-            if (action.equals(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION)) {
-                synchronized (mMySync) {
-                    mMySync.expectedState = STATE_WIFI_CHANGED;
-                    mMySync.notify();
-                }
-            }
-        }
-    };
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            return;
-        }
-        mMySync = new MySync();
-        mIntentFilter = new IntentFilter();
-        mIntentFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
-        mIntentFilter.addAction(WifiManager.SUPPLICANT_CONNECTION_CHANGE_ACTION);
-        mIntentFilter.addAction(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiManager.RSSI_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiManager.NETWORK_IDS_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiManager.ACTION_PICK_WIFI_NETWORK);
-
-        mContext.registerReceiver(mReceiver, mIntentFilter);
-        mWifiManager = (WifiManager) getContext().getSystemService(Context.WIFI_SERVICE);
-        assertNotNull(mWifiManager);
-        mWifiLock = mWifiManager.createWifiLock(TAG);
-        mWifiLock.acquire();
-        if (!mWifiManager.isWifiEnabled())
-            setWifiEnabled(true);
-        Thread.sleep(DURATION);
-        assertTrue(mWifiManager.isWifiEnabled());
-        mMySync.expectedState = STATE_NULL;
-
-        mWifiExt = MPlugin.createInstance(IWifiFwkExt.class.getName(), mContext);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            super.tearDown();
-            return;
-        }
-        mWifiLock.release();
-        mContext.unregisterReceiver(mReceiver);
-        if (!mWifiManager.isWifiEnabled())
-            setWifiEnabled(true);
-        Thread.sleep(DURATION);
-        super.tearDown();
-    }
-
-    private void setWifiEnabled(boolean enable) throws Exception {
-        synchronized (mMySync) {
-            mMySync.expectedState = STATE_WIFI_CHANGING;
-            assertTrue(mWifiManager.setWifiEnabled(enable));
-            long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-            while (System.currentTimeMillis() < timeout
-                    && mMySync.expectedState == STATE_WIFI_CHANGING)
-                mMySync.wait(WAIT_MSEC);
-        }
-    }
-
-    public void testWifiPlugin() throws Exception {
-        assertTrue(mWifiExt != null);
-        mWifiExt.init();
-        if (mWifiExt.hasCustomizedAutoConnect()) {
-            assertTrue(mWifiExt.hasCustomizedAutoConnect());
-            ConnectivityManager cm = (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
-            NetworkInfo info = cm.getActiveNetworkInfo();
-            int connectType = Settings.System.getInt(mContext.getContentResolver(),
-                Settings.System.WIFI_CONNECT_AP_TYPE, Settings.System.WIFI_CONNECT_AP_TYPE_AUTO);
-            int cellToWlan = Settings.System.getInt(mContext.getContentResolver(),
-                Settings.System.WIFI_CONNECT_TYPE, Settings.System.WIFI_CONNECT_TYPE_AUTO);
-            if (connectType == Settings.System.WIFI_CONNECT_AP_TYPE_AUTO
-                && (info == null
-                || (info != null && info.getType() == ConnectivityManager.TYPE_MOBILE && cellToWlan == Settings.System.WIFI_CONNECT_TYPE_AUTO))) {
-                assertTrue(mWifiExt.shouldAutoConnect());
-            } else {
-                assertFalse(mWifiExt.shouldAutoConnect());
-            }
-            assertTrue(mWifiExt.defaultFrameworkScanIntervalMs() == 15000);
-        } else {
-            assertFalse(mWifiExt.hasCustomizedAutoConnect());
-            assertTrue(mWifiExt.shouldAutoConnect());
-            assertTrue(mWifiExt.defaultFrameworkScanIntervalMs() == mContext.getResources().getInteger(com.android.internal.R.integer.config_wifi_framework_scan_interval));
-        }
-    }
-}
diff --git a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiScanModeTest.java b/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiScanModeTest.java
deleted file mode 100755
index 8c6aa45601580ea215c1228be361316fe013af48..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiScanModeTest.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.net.wifi.cts;
-
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.NetworkInfo;
-import android.net.wifi.ScanResult;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiConfiguration.Status;
-import android.net.wifi.WifiManager;
-import android.test.AndroidTestCase;
-import android.util.Log;
-
-import java.util.List;
-import android.content.ContentResolver;
-import android.provider.Settings;
-
-
-
-public class WifiScanModeTest extends AndroidTestCase {
-    private static class MySync {
-        int expectedState = STATE_NULL;
-    }
-
-    private static final int STATE_START_SCAN = 3;
-
-
-    private WifiManager mWifiManager;
-    private static MySync mMySync;
-    private List<ScanResult> mScanResult = null;
-    private NetworkInfo mNetworkInfo;
-
-
-    private static final int STATE_NULL = 0;
-    private static final int STATE_WIFI_CHANGING = 1;
-    private static final int STATE_WIFI_ENABLED = 2;
-    private static final int STATE_WIFI_DISABLED = 3;
-    private static final int STATE_SCANNING = 4;
-    private static final int STATE_SCAN_RESULTS_AVAILABLE = 5;
-
-    private static final String TAG = "WifiManagerTest";
-    private static final int TIMEOUT_MSEC = 6000;
-    private static final int WAIT_MSEC = 60;
-    private static final int DURATION = 10000;
-    private IntentFilter mIntentFilter;
-
-    private ContentResolver mContentResolver;
-    private static final int SCAN_WAIT_MSEC = 10000;
-
-
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            final String action = intent.getAction();
-            if (action.equals(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION)) {
-                synchronized (mMySync) {
-                    if (mWifiManager.getScanResults() != null) {
-                        mScanResult = mWifiManager.getScanResults();
-                        mMySync.expectedState = STATE_SCAN_RESULTS_AVAILABLE;
-                        mScanResult = mWifiManager.getScanResults();
-                        mMySync.notifyAll();
-                    }
-                }
-            } else if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) {
-                int newState = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE,
-                        WifiManager.WIFI_STATE_UNKNOWN);
-                synchronized (mMySync) {
-                    if (newState == WifiManager.WIFI_STATE_ENABLED) {
-                        Log.d(TAG, "*** New WiFi state is ENABLED ***");
-                        mMySync.expectedState = STATE_WIFI_ENABLED;
-                        mMySync.notifyAll();
-                    } else if (newState == WifiManager.WIFI_STATE_DISABLED) {
-                        Log.d(TAG, "*** New WiFi state is DISABLED ***");
-                        mMySync.expectedState = STATE_WIFI_DISABLED;
-                        mMySync.notifyAll();
-                    }
-                }
-            } else if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) {
-                synchronized (mMySync) {
-                    mNetworkInfo =
-                            (NetworkInfo) intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO);
-                    if (mNetworkInfo.getState() == NetworkInfo.State.CONNECTED)
-                        mMySync.notifyAll();
-                }
-            }
-        }
-    };
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            return;
-        }
-        mMySync = new MySync();
-        mIntentFilter = new IntentFilter();
-        mIntentFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
-        mIntentFilter.addAction(WifiManager.SUPPLICANT_CONNECTION_CHANGE_ACTION);
-        mIntentFilter.addAction(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiManager.RSSI_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiManager.NETWORK_IDS_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiManager.ACTION_PICK_WIFI_NETWORK);
-
-        mContext.registerReceiver(mReceiver, mIntentFilter);
-        mWifiManager = (WifiManager) getContext().getSystemService(Context.WIFI_SERVICE);
-        assertNotNull(mWifiManager);
-
-        if (!mWifiManager.isWifiEnabled())
-            setWifiEnabled(true);
-        Thread.sleep(DURATION);
-        assertTrue(mWifiManager.isWifiEnabled());
-        synchronized (mMySync) {
-            mMySync.expectedState = STATE_NULL;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            super.tearDown();
-            return;
-        }
-        if (!mWifiManager.isWifiEnabled())
-            setWifiEnabled(true);
-        mContext.unregisterReceiver(mReceiver);
-        Thread.sleep(DURATION);
-        super.tearDown();
-    }
-
-    private void setWifiEnabled(boolean enable) throws Exception {
-        synchronized (mMySync) {
-            assertTrue(mWifiManager.setWifiEnabled(enable));
-            if (mWifiManager.isWifiEnabled() != enable) {
-                mMySync.expectedState = STATE_WIFI_CHANGING;
-                long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-                int expectedState = (enable ? STATE_WIFI_ENABLED : STATE_WIFI_DISABLED);
-                while (System.currentTimeMillis() < timeout
-                        && mMySync.expectedState != expectedState)
-                    mMySync.wait(WAIT_MSEC);
-            }
-        }
-    }
-
-    private void startScan() throws Exception {
-        synchronized (mMySync) {
-            mMySync.expectedState = STATE_SCANNING;
-            assertTrue(mWifiManager.startScan());
-            long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-            while (System.currentTimeMillis() < timeout && mMySync.expectedState == STATE_SCANNING)
-                mMySync.wait(WAIT_MSEC);
-        }
-    }
-
-    private void connectWifi() throws Exception {
-        synchronized (mMySync) {
-            if (mNetworkInfo.getState() == NetworkInfo.State.CONNECTED) return;
-            assertTrue(mWifiManager.reconnect());
-            long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-            while (System.currentTimeMillis() < timeout
-                    && mNetworkInfo.getState() != NetworkInfo.State.CONNECTED)
-                mMySync.wait(WAIT_MSEC);
-            assertTrue(mNetworkInfo.getState() == NetworkInfo.State.CONNECTED);
-        }
-    }
-
-    private boolean existSSID(String ssid) {
-        for (final WifiConfiguration w : mWifiManager.getConfiguredNetworks()) {
-            if (w.SSID.equals(ssid))
-                return true;
-        }
-        return false;
-    }
-
-    private int findConfiguredNetworks(String SSID, List<WifiConfiguration> networks) {
-        for (final WifiConfiguration w : networks) {
-            if (w.SSID.equals(SSID))
-                return networks.indexOf(w);
-        }
-        return -1;
-    }
-
-    private void assertDisableOthers(WifiConfiguration wifiConfiguration, boolean disableOthers) {
-        for (WifiConfiguration w : mWifiManager.getConfiguredNetworks()) {
-            if ((!w.SSID.equals(wifiConfiguration.SSID)) && w.status != Status.CURRENT) {
-                if (disableOthers)
-                    assertEquals(Status.DISABLED, w.status);
-            }
-        }
-    }
-
-    public void testScanModeActions() throws Exception {
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            return;
-        }
-
-        //1. set WIFI_SCAN_ALWAYS_AVAILABLE=true
-        int preViousSetting = Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE,
-                0);
-
-        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 1);
-        setWifiEnabled(false);
-        Thread.sleep(DURATION);
-        assertTrue(mWifiManager.pingSupplicant() == mWifiManager.isScanAlwaysAvailable());
-        final String TAG = "Test";
-
-        //2. start scan and get scan result
-       long timestamp = 0;
-        String BSSID = null;
-
-
-        scanAndWait();
-        scanAndWait();
-        scanAndWait();
-
-        List<ScanResult> scanResults = mWifiManager.getScanResults();
-        for (ScanResult result : scanResults) {
-            BSSID = result.BSSID;
-            timestamp = result.timestamp;
-            assertTrue(timestamp != 0);
-            break;
-        }
-
-        scanAndWait();
-        scanAndWait();
-        scanAndWait();
-
-        scanResults = mWifiManager.getScanResults();
-        for (ScanResult result : scanResults) {
-            if (result.BSSID.equals(BSSID)) {
-                long timeDiff = (result.timestamp - timestamp) / 1000;
-                assertTrue(timeDiff > 0);
-                assertTrue(timeDiff < 6 * SCAN_WAIT_MSEC);
-            }
-        }
-        //restore setting
-        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, preViousSetting);
-    }
-
-
-      private void scanAndWait() throws Exception {
-          synchronized (mMySync) {
-              mMySync.expectedState = STATE_START_SCAN;
-              mWifiManager.startScan();
-              waitForBroadcast(SCAN_WAIT_MSEC, STATE_SCAN_RESULTS_AVAILABLE);
-          }
-     }
-
-     private void waitForBroadcast(long timeout, int expectedState) throws Exception {
-        long waitTime = System.currentTimeMillis() + timeout;
-        while (System.currentTimeMillis() < waitTime
-                && mMySync.expectedState != expectedState)
-            mMySync.wait(WAIT_MSEC);
-    }
-}
diff --git a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiSoftAPTest.java b/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiSoftAPTest.java
deleted file mode 100755
index 88bcb528c2ff55e2f379a175f85fd5c573557994..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiSoftAPTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.net.wifi.cts;
-
-import android.content.Context;
-import android.net.wifi.WifiManager;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiConfiguration.KeyMgmt;
-import android.util.Log;
-
-import android.test.AndroidTestCase;
-
-/**
- * Test Wifi soft AP configuration
- */
-public class WifiSoftAPTest extends AndroidTestCase {
-
-    private WifiManager mWifiManager;
-    private WifiConfiguration mWifiConfig = null;
-    private final String TAG = "WifiSoftAPTest";
-    private final int DURATION = 10000;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mWifiManager = (WifiManager) getContext().getSystemService(Context.WIFI_SERVICE);
-        assertNotNull(mWifiManager);
-        if (mWifiManager.isWifiEnabled()) {
-            mWifiManager.setWifiEnabled(false);
-            Thread.sleep(3000);
-        }
-        assertTrue(mWifiManager.setWifiApEnabled(null, true));
-        Thread.sleep(5000);
-        mWifiConfig = mWifiManager.getWifiApConfiguration();
-        if (mWifiConfig != null) {
-            Log.d(TAG, "mWifiConfig is " + mWifiConfig.toString());
-        } else {
-            Log.d(TAG, "mWifiConfig is null.");
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        Log.d(TAG, "turn off wifi tethering");
-        mWifiManager.setWifiApEnabled(null, false);
-        Thread.sleep(3000);
-        super.tearDown();
-    }
-
-    public void testWifiSoftAP() {
-        WifiConfiguration config = new WifiConfiguration();
-        config.SSID = "abcdefghijklmnopqrstuvwxyz";
-        config.allowedKeyManagement.set(KeyMgmt.NONE);
-        mWifiConfig = config;
-        assertTrue(mWifiManager.setWifiApConfiguration(mWifiConfig));
-        assertTrue(mWifiManager.setWifiApEnabled(mWifiConfig, true));
-        try {
-            Thread.sleep(DURATION);
-        } catch (InterruptedException e) {
-            Log.e(TAG, "exception " + e.getStackTrace());
-            assertFalse(true);
-        }
-        assertTrue(mWifiManager.isWifiApEnabled());
-        assertNotNull(mWifiManager.getWifiApConfiguration());
-        assertEquals("wifi AP state is enabled", WifiManager.WIFI_AP_STATE_ENABLED,
-                     mWifiManager.getWifiApState());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiWpsTest.java b/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiWpsTest.java
deleted file mode 100755
index 3a87293ae8ad3e8cb7817c9a1dca1699369af79e..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifi/src/mediatek/net/wifi/cts/WifiWpsTest.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
-
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mediatek.net.wifi.cts;
-
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.wifi.WifiManager;
-import android.net.wifi.WifiManager.WifiLock;
-import android.net.wifi.WpsInfo;
-import android.net.wifi.WpsResult;
-import android.test.AndroidTestCase;
-
-
-public class WifiWpsTest extends AndroidTestCase {
-    private static class MySync {
-        int expectedState = STATE_NULL;
-    }
-
-    private WifiManager mWifiManager;
-    private WifiLock mWifiLock;
-    private static MySync mMySync;
-
-    private static final int STATE_NULL = 0;
-    private static final int STATE_WIFI_CHANGING = 1;
-    private static final int STATE_WIFI_CHANGED = 2;
-
-    private static final String TAG = "WifiInfoTest";
-    private static final int TIMEOUT_MSEC = 6000;
-    private static final int WAIT_MSEC = 60;
-    private static final int DURATION = 10000;
-    private IntentFilter mIntentFilter;
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            final String action = intent.getAction();
-            if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) {
-                synchronized (mMySync) {
-                    mMySync.expectedState = STATE_WIFI_CHANGED;
-                    mMySync.notify();
-                }
-            }
-        }
-    };
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            return;
-        }
-        mMySync = new MySync();
-        mIntentFilter = new IntentFilter();
-        mIntentFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
-
-        mContext.registerReceiver(mReceiver, mIntentFilter);
-        mWifiManager = (WifiManager) getContext().getSystemService(Context.WIFI_SERVICE);
-        assertNotNull(mWifiManager);
-        mWifiLock = mWifiManager.createWifiLock(TAG);
-        mWifiLock.acquire();
-        if (!mWifiManager.isWifiEnabled())
-            setWifiEnabled(true);
-        Thread.sleep(DURATION);
-        assertTrue(mWifiManager.isWifiEnabled());
-        mMySync.expectedState = STATE_NULL;
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            super.tearDown();
-            return;
-        }
-        mWifiLock.release();
-        mContext.unregisterReceiver(mReceiver);
-        if (!mWifiManager.isWifiEnabled())
-            setWifiEnabled(true);
-        Thread.sleep(DURATION);
-        super.tearDown();
-    }
-
-    private void setWifiEnabled(boolean enable) throws Exception {
-        synchronized (mMySync) {
-            mMySync.expectedState = STATE_WIFI_CHANGING;
-            assertTrue(mWifiManager.setWifiEnabled(enable));
-            long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-            while (System.currentTimeMillis() < timeout
-                    && mMySync.expectedState == STATE_WIFI_CHANGING)
-                mMySync.wait(WAIT_MSEC);
-        }
-    }
-
-    public void testWifiWps() throws Exception {
-        if (!WifiFeature.isWifiSupported(getContext())) {
-            // skip the test if WiFi is not supported
-            return;
-        }
-        WpsInfo wpsConfig = new WpsInfo();
-        wpsConfig.setup = WpsInfo.PBC;
-        assertNotNull(wpsConfig.toString());
-        mWifiManager.startWps(wpsConfig, null);
-        Thread.sleep(2000);
-        mWifiManager.cancelWps(null);
-        wpsConfig.setup = WpsInfo.DISPLAY;
-        mWifiManager.startWps(wpsConfig, null);
-        Thread.sleep(2000);
-        mWifiManager.cancelWps(null);
-        wpsConfig.setup = WpsInfo.KEYPAD;
-        mWifiManager.startWps(wpsConfig, null);
-        Thread.sleep(2000);
-        mWifiManager.cancelWps(null);
-        wpsConfig.setup = WpsInfo.LABEL;
-        mWifiManager.startWps(wpsConfig, null);
-        Thread.sleep(2000);
-        mWifiManager.cancelWps(null);
-        WpsInfo newConfig = new WpsInfo(wpsConfig);
-        newConfig.setup = WpsInfo.INVALID;
-        mWifiManager.startWps(wpsConfig, null);
-        Thread.sleep(2000);
-        mWifiManager.cancelWps(null);
-        try {
-            mWifiManager.startWps(wpsConfig, null);
-        } catch (IllegalArgumentException e) {
-        }
-        try {
-            mWifiManager.startWps(null, null);
-        } catch (IllegalArgumentException e) {
-        }
-        try {
-             mWifiManager.cancelWps(null);
-        } catch (IllegalArgumentException e) {
-        }
-        try {
-            mWifiManager.cancelWps(null);
-        } catch (IllegalArgumentException e) {
-        }
-
-        WpsResult result = new WpsResult();
-        WpsResult newResult = new WpsResult(WpsResult.Status.FAILURE);
-        result = new WpsResult(newResult);
-        assertNotNull(result.toString());
-    }
-}
diff --git a/proprietary/frameworks/base/tests/wifip2p/Android.mk b/proprietary/frameworks/base/tests/wifip2p/Android.mk
deleted file mode 100755
index 06b05a0a9d5d6f69ad58c3f81a0a671a18933ea0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifip2p/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner wifi-service
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MediaTekCtsWifiP2pTestCases
-LOCAL_CERTIFICATE := platform
-
-#LOCAL_SDK_VERSION := current
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
diff --git a/proprietary/frameworks/base/tests/wifip2p/Android.mk_ b/proprietary/frameworks/base/tests/wifip2p/Android.mk_
deleted file mode 100755
index 06b05a0a9d5d6f69ad58c3f81a0a671a18933ea0..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifip2p/Android.mk_
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner wifi-service
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MediaTekCtsWifiP2pTestCases
-LOCAL_CERTIFICATE := platform
-
-#LOCAL_SDK_VERSION := current
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
diff --git a/proprietary/frameworks/base/tests/wifip2p/AndroidManifest.xml b/proprietary/frameworks/base/tests/wifip2p/AndroidManifest.xml
deleted file mode 100755
index 74c16837548932a0accadb26bef14431284e56d9..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifip2p/AndroidManifest.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mediatek.cts.net.wifip2p">
-
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL"/>
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.mediatek.cts.net.wifip2p"
-                     android:label="CTS tests of android.net.wifi.p2p"/>
-
-</manifest>
-
diff --git a/proprietary/frameworks/base/tests/wifip2p/NOTICE b/proprietary/frameworks/base/tests/wifip2p/NOTICE
deleted file mode 100755
index 4637a4c4429745a16e84567299dc414019efdd4d..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifip2p/NOTICE
+++ /dev/null
@@ -1,34 +0,0 @@
-* Copyright (C) 2012 The Android Open Source Project:
-
-
-
-* Copyright (C) 2008 The Android Open Source Project:
-
-
-
-* Copyright (C) 2013 The Android Open Source Project:
-
-
-
-* Copyright (C) 2009 The Android Open Source Project:
-
-
-
-/*
-* Copyright (C) 2011-2014 MediaTek Inc.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-:
- 
\ No newline at end of file
diff --git a/proprietary/frameworks/base/tests/wifip2p/README b/proprietary/frameworks/base/tests/wifip2p/README
deleted file mode 100755
index 9ebc5bb3cdb6e5670224cf608b482f7e8fe9a995..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifip2p/README
+++ /dev/null
@@ -1,21 +0,0 @@
-WiFi P2P auto unit test program, including completely P2P feature test cases. 
-
-This should be built separately for test propose.
-
-
-WHAT IT DOES?
-=============
-MediaTekCtsWifiP2pTestCases.apk contains WiFi P2P related unit test cases.
-This program helps developer to maintain P2P feature.
-
-
-HOW IT WAS BUILT?
-==================
-Use AOPS mmm command with this folder path to build the apk file.
-
-HOW TO USE IT?
-==============
-Install the apk file via adb install command.
-Run adb am instrumentation command to execute the unit test.
-
-All the source code of this program were written by MediaTek co..
diff --git a/proprietary/frameworks/base/tests/wifip2p/src/mediatek/net/wifip2p/cts/WifiP2pManagerTest.java b/proprietary/frameworks/base/tests/wifip2p/src/mediatek/net/wifip2p/cts/WifiP2pManagerTest.java
deleted file mode 100755
index 338bc2921609596d984fe9b690889b946b87c28b..0000000000000000000000000000000000000000
--- a/proprietary/frameworks/base/tests/wifip2p/src/mediatek/net/wifip2p/cts/WifiP2pManagerTest.java
+++ /dev/null
@@ -1,648 +0,0 @@
-/* Copyright Statement:
- *
- * This software/firmware and related documentation ("MediaTek Software") are
- * protected under relevant copyright laws. The information contained herein is
- * confidential and proprietary to MediaTek Inc. and/or its licensors. Without
- * the prior written permission of MediaTek inc. and/or its licensors, any
- * reproduction, modification, use or disclosure of MediaTek Software, and
- * information contained herein, in whole or in part, shall be strictly
- * prohibited.
- *
- * MediaTek Inc. (C) 2010. All rights reserved.
- *
- * BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- * THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- * RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER
- * ON AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL
- * WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
- * NONINFRINGEMENT. NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH
- * RESPECT TO THE SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY,
- * INCORPORATED IN, OR SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES
- * TO LOOK ONLY TO SUCH THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO.
- * RECEIVER EXPRESSLY ACKNOWLEDGES THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO
- * OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN MEDIATEK
- * SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK SOFTWARE
- * RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- * STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S
- * ENTIRE AND CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE
- * RELEASED HEREUNDER WILL BE, AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE
- * MEDIATEK SOFTWARE AT ISSUE, OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE
- * CHARGE PAID BY RECEIVER TO MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- *
- * The following software/firmware and/or related documentation ("MediaTek
- * Software") have been modified by MediaTek Inc. All revisions are subject to
- * any receiver's applicable license agreements with MediaTek Inc.
- */
- 
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package mediatek.net.wifip2p.cts;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.wifi.WifiManager;
-import android.net.wifi.p2p.WifiP2pManager;
-import android.net.wifi.p2p.*;
-import android.test.AndroidTestCase;
-import android.util.Log;
-import android.os.Messenger;
-import android.os.Message;
-import android.os.RemoteException;
-
-import java.lang.reflect.*;
-import java.util.List;
-import java.util.Map;
-
-import com.android.server.wifi.WifiMonitor;
-
-
-public class WifiP2pManagerTest extends AndroidTestCase {
-    private static final String TAG = "WifiP2pManagerTest";
-
-    private static class MySync {
-        int expectedState = STATE_NULL;
-
-    }
-    private static class MySyncConnect {
-        int expectedConnectState = STATE_CONNECT_NULL;
-    }
-
-    private WifiP2pManager mWifiP2pManager;
-    private WifiManager mWifiManager;
-    private static MySync mMySync;
-    private static MySyncConnect mMySyncConnect;
-    private IntentFilter mIntentFilter;
-    private WifiP2pManager.Channel mChannel;
-    private Messenger messenger;
-    private WifiP2pDeviceList mPeers = new WifiP2pDeviceList();
-    private WifiP2pManagerTest mWmtThis;
-    private WifiP2pDeviceList mConnectPeers = new WifiP2pDeviceList();
-    private WifiP2pConfig config;
-
-    private static final int FIRST_PEER_NO = 0;
-    private static final int CONNECT_PEER_COUNT = 2;
-
-    private static final int INVITE_FIRST_PEER = 1;
-    private static final int INVITE_SECOND_PEER = 2;
-
-    private int wifiP2pState = WifiP2pManager.WIFI_P2P_STATE_DISABLED;
-    private static final int STATE_NULL = 0;
-    private static final int STATE_WIFIP2P_CHANGING = 1;
-    private static final int STATE_WIFIP2P_CHANGED = 2;
-    private static final int STATE_DISCOVERING = 3;
-    private static final int STATE_DISCOVER_PEERS_AVAILABLE = 4;
-    private static final int STATE_NOT_GOT_PEERS_INFO = 5;
-    private static final int STATE_GOT_PEERS_INFO = 6;
-    private static final int STATE_STOPPING_DISCOVER = 7;
-    private static final int STATE_DISCOVER_STOPPED = 8;
-
-
-    private static final int STATE_CONNECT_NULL = 9;
-    private static final int STATE_CONNECTED = 10;
-    private static final int STATE_GOT_CONNECYEDINFO = 11;
-    private static final int STATE_GROUPINFO = 12;
-    private static final int STATE_THIS_CHANGED = 13;
-    private static final int STATE_INVITE_SUCCESS = 14;
-    private static final int STATE_CANCEL_CONNECT_SUCCESS = 15;
-
-    private static final int STATE_CREATING_GROUP = 16;
-    private static final int STATE_CREATE_GROUP_OK = 17;
-    private static final int STATE_REMOVING_GROUP = 18;
-    private static final int STATE_REMOVE_GROUP_OK = 19;
-
-    private static final int STATE_CLEARING_ALL_SERVICE = 20;
-    private static final int STATE_CLEAR_ALL_SERVICE_OK = 21;
-    private static final int STATE_SET_SERVICE_LISTENER_OK = 22;
-    private static final int STATE_SET_DNS_LISTENER_OK = 23;
-    private static final int STATE_SET_UPNP_LISTENER_OK = 24;
-
-    private static final int STATE_REQUESTING = 25;
-    private static final int STATE_REQUEST_PPER_OK = 26;
-    private static final int STATE_REQUEST_CONNECTION_INFO_OK = 27;
-    private static final int STATE_REQUEST_GROUP_INFO_OK = 28;
-
-    private static final int STATE_SETTING_DEV_NAME = 29;
-    private static final int STATE_SET_DEV_NAME_OK = 30;
-
-    private static final int TIMEOUT_MSEC = 6000;
-    private static final int WAIT_MSEC = 60;
-    private static final int DURATION = 10000;
-    private static final int WAITRESULT = 1000;
-
-    private static final String mPeerString = "P2P-DEVICE-FOUND 96:db:c9:7c:f1:e8 p2p_dev_addr=96:db:c9:7c:f1:e8 pri_dev_type=10-0050F204-5 name='A' config_methods=0x188 dev_capab=0x27 group_capab=0x0 go_iface=00:00:00:00:00:00 wfd_en=1 wfd_info=0x3 wfd_ctrl_port=0 wfd_tp=0 wfd_assoc_mac=00:00:00:00:00:00 wfd_sink_status=0x0 wfd_sink_mac=00:00:00:00:00:00 wfd_extend_capa=0x0 wfd_flags=0x1";
-    private static final String mProvisionString = "P2P-PROV-DISC-PBC-RESP 96:db:c9:7c:f1:e8";
-    private static final String mGroupCreatedString = "P2P-GROUP-STARTED p2p0 GO ssid=\"DIRECT-vj-B\" freq=2462 passphrase=\"OsCn2cFd\" go_dev_addr=96:db:c9:7c:f5:ee [PERSISTENT]";
-    private static final String mApStaConnectedString = "AP-STA-DISCONNECTED 96:db:c9:7c:f1:e8";
-
-
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            final String action = intent.getAction();
-            if (action.equals(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION)) {
-                synchronized (mMySync) {
-                    mMySync.expectedState = STATE_WIFIP2P_CHANGED;
-                    mMySync.notify();
-                }
-
-            } else if (action.equals(WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION)) {
-                synchronized (mMySyncConnect) {
-                    mMySyncConnect.expectedConnectState = STATE_THIS_CHANGED;
-                    mMySyncConnect.notify();
-                }
-            }
-        }
-    };
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mWmtThis = this;
-        mMySync = new MySync();
-        mMySyncConnect = new MySyncConnect();
-        config = new WifiP2pConfig();
-        mIntentFilter = new IntentFilter();
-
-        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_DISCOVERY_CHANGED_ACTION);
-
-        mContext.registerReceiver(mReceiver, mIntentFilter);
-        mWifiP2pManager = (WifiP2pManager) getContext().getSystemService(Context.WIFI_P2P_SERVICE);
-        mWifiManager = (WifiManager) getContext().getSystemService(Context.WIFI_SERVICE);
-        messenger = mWifiP2pManager.getP2pStateMachineMessenger();
-
-        assertNotNull("Failed to get WiFi P2P service!", mWifiP2pManager);
-        assertNotNull("Failed to get WiFi service!", mWifiP2pManager);
-        mChannel = mWifiP2pManager.initializeInternal(mContext, mContext.getMainLooper(), null);
-        assertNotNull("Failed to get wifi p2p channel!", mChannel);
-        if (!mWifiManager.isWifiEnabled()) {
-            setWifiEnabled(true);
-            Thread.sleep(DURATION);
-        }
-        assertTrue(mWifiManager.isWifiEnabled());
-
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mContext.unregisterReceiver(mReceiver);
-        if (mWifiManager.isWifiEnabled()) {
-            setWifiEnabled(false);
-            Thread.sleep(DURATION);
-        }
-        super.tearDown();
-    }
-
-
-    private void setWifiEnabled(boolean enable) throws Exception {
-        if (enable == true) {
-            synchronized (mMySync) {
-                mMySync.expectedState = STATE_WIFIP2P_CHANGING;
-                assertTrue(mWifiManager.setWifiEnabled(enable));
-                long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-                while (System.currentTimeMillis() < timeout
-                        && mMySync.expectedState == STATE_WIFIP2P_CHANGING)
-                    mMySync.wait(WAIT_MSEC);
-            }
-        }
-        else {
-            synchronized (mMySync) {
-                mMySync.expectedState = STATE_WIFIP2P_CHANGING;
-                assertTrue(mWifiManager.setWifiEnabled(enable));
-                long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-                while (System.currentTimeMillis() < timeout
-                        && mMySync.expectedState == STATE_WIFIP2P_CHANGING)
-                    mMySync.wait(WAIT_MSEC);
-            }
-        }
-
-    }
-
-  private void sendMessage(int what, Object obj) {
-      Message msg = Message.obtain();
-      msg.what = what;
-      msg.obj = obj;
-      assertNotNull("Failed to Messenger!", messenger);
-      try {
-          messenger.send(msg);
-      } catch (RemoteException e) {
-          Log.e(TAG, "Send message error:" + e);
-      }
-
-  }
-
-    private void startSearch()throws Exception {
-        synchronized (mMySync) {
-            mMySync.expectedState = STATE_DISCOVERING;
-            mWifiP2pManager.discoverPeers(mChannel, new WifiP2pManager.ActionListener() {
-                public void onSuccess() {
-                    Log.d(TAG, " discover success");
-                    mMySync.expectedState = STATE_DISCOVER_PEERS_AVAILABLE;
-                }
-                public void onFailure(int reason) {
-                    Log.d(TAG, " discover fail " + reason);
-                }
-            });
-            createPeer(mPeerString);
-            long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-            while (System.currentTimeMillis() < timeout
-                    && mMySync.expectedState == STATE_DISCOVERING)
-                mMySync.wait(WAIT_MSEC);
-        }
-    }
-
-    private void createPeer(String peerStr) {
-        WifiP2pDevice peer = new WifiP2pDevice(peerStr);
-        sendMessage(WifiMonitor.P2P_DEVICE_FOUND_EVENT, peer);
-    }
-
-    private void stopSearch()throws Exception {
-        synchronized (mMySync) {
-            mMySync.expectedState = STATE_STOPPING_DISCOVER;
-            mWifiP2pManager.stopPeerDiscovery(mChannel, new WifiP2pManager.ActionListener() {
-                public void onSuccess() {
-                    Log.d(TAG, "Stop discover success");
-                    mMySync.expectedState = STATE_DISCOVER_STOPPED;
-                }
-                public void onFailure(int reason) {
-                    Log.d(TAG, "Stop discover fail " + reason);
-                }
-            });
-
-            long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-            while (System.currentTimeMillis() < timeout
-                    && mMySync.expectedState == STATE_STOPPING_DISCOVER)
-                mMySync.wait(WAIT_MSEC);
-        }
-    }
-
-    private void connectPeer()throws Exception {
-        synchronized (mMySync) {
-            mMySync.expectedState = STATE_CONNECT_NULL;
-            WifiP2pConfig config = new WifiP2pConfig();
-            config.deviceAddress = "96:db:c9:7c:f1:e8";
-            mWifiP2pManager.connect(mChannel, config, new WifiP2pManager.ActionListener() {
-                public void onSuccess() {
-                    Log.d(TAG, "Connect success");
-                    mMySync.expectedState = STATE_CONNECTED;
-                    Log.d(TAG, "expectedState1 is " + mMySync.expectedState);
-                }
-                public void onFailure(int reason) {
-                    Log.d(TAG, "Connect failed " + reason);
-                }
-            });
-
-            long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-            while (System.currentTimeMillis() < timeout
-                    && mMySync.expectedState == STATE_CONNECT_NULL)
-                mMySync.wait(WAIT_MSEC);
-        }
-
-        Log.d(TAG, "config is " + config.toString());
-    }
-
-    private void createGroup()throws Exception {
-        synchronized (mMySync) {
-            mMySync.expectedState = STATE_CREATING_GROUP;
-            mWifiP2pManager.createGroup(mChannel, new WifiP2pManager.ActionListener() {
-                public void onSuccess() {
-                    Log.d(TAG, "Create group success");
-                    mMySync.expectedState = STATE_CREATE_GROUP_OK;
-                }
-                public void onFailure(int reason) {
-                    Log.d(TAG, "Create Group failed " + reason);
-                }
-            });
-
-            long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-            while (System.currentTimeMillis() < timeout
-                    && mMySync.expectedState == STATE_CREATING_GROUP)
-                mMySync.wait(WAIT_MSEC);
-        }
-    }
-
-    private void removeGroup() throws Exception {
-        synchronized (mMySync) {
-            mMySync.expectedState = STATE_REMOVING_GROUP;
-            mWifiP2pManager.removeGroup(mChannel, new WifiP2pManager.ActionListener() {
-                public void onSuccess() {
-                    Log.d(TAG, "remove group success");
-                    mMySync.expectedState = STATE_REMOVE_GROUP_OK;
-                }
-                public void onFailure(int reason) {
-                    Log.d(TAG, "remove Group failed " + reason);
-                }
-            });
-
-            long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-            while (System.currentTimeMillis() < timeout
-                    && mMySync.expectedState == STATE_REMOVING_GROUP)
-                mMySync.wait(WAIT_MSEC);
-        }
-    }
-
-    private void clearLocalServices() throws Exception {
-        synchronized (mMySync) {
-            mMySync.expectedState = STATE_CLEARING_ALL_SERVICE;
-            mWifiP2pManager.clearLocalServices(mChannel, new WifiP2pManager.ActionListener() {
-                public void onSuccess() {
-                    Log.d(TAG, "clear all service success");
-                    mMySync.expectedState = STATE_CLEAR_ALL_SERVICE_OK;
-                }
-                public void onFailure(int reason) {
-                    Log.d(TAG, "clear all service failed " + reason);
-                }
-            });
-
-            long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-            while (System.currentTimeMillis() < timeout
-                    && mMySync.expectedState == STATE_CLEARING_ALL_SERVICE)
-                mMySync.wait(WAIT_MSEC);
-        }
-    }
-
-    private void setServiceResponseListener()throws Exception {
-        synchronized (mMySync) {
-            mWifiP2pManager.setServiceResponseListener(mChannel, new WifiP2pManager.ServiceResponseListener() {
-                public void onServiceAvailable(int protocolType,
-                        byte[] responseData, WifiP2pDevice srcDevice) {
-                    Log.d(TAG, "set Service Response Listener OK");
-                }
-            });
-            mMySync.expectedState = STATE_SET_SERVICE_LISTENER_OK;
-        }
-    }
-
-    private void setDnsSdResponseListeners()throws Exception {
-        synchronized (mMySync) {
-            mWifiP2pManager.setDnsSdResponseListeners(mChannel, new WifiP2pManager.DnsSdServiceResponseListener() {
-                public void onDnsSdServiceAvailable(String instanceName,
-                        String registrationType, WifiP2pDevice srcDevice) {
-                    Log.d(TAG, "set DNS Service Response Listener OK1");
-                }
-            }, new WifiP2pManager.DnsSdTxtRecordListener() {
-                public void onDnsSdTxtRecordAvailable(String fullDomainName,
-                        Map<String, String> txtRecordMap,
-                        WifiP2pDevice srcDevice) {
-                    Log.d(TAG, "set DNS Service Response Listener OK2");
-                }
-            });
-            mMySync.expectedState = STATE_SET_DNS_LISTENER_OK;
-        }
-    }
-
-    private void setUpnpServiceResponseListener() throws Exception {
-        synchronized (mMySync) {
-            mWifiP2pManager.setUpnpServiceResponseListener(mChannel, new WifiP2pManager.UpnpServiceResponseListener() {
-                public void onUpnpServiceAvailable(List<String> uniqueServiceNames,
-                        WifiP2pDevice srcDevice) {
-                    Log.d(TAG, "set UPNP Service Response Listener OK");
-                }
-            });
-            mMySync.expectedState = STATE_SET_UPNP_LISTENER_OK;
-        }
-    }
-
-    private void requestPeers() throws Exception {
-        synchronized (mMySync) {
-            mMySync.expectedState = STATE_REQUESTING;
-            mWifiP2pManager.requestPeers(mChannel, new WifiP2pManager.PeerListListener() {
-                public void onPeersAvailable(WifiP2pDeviceList peers) {
-                    Log.d(TAG, "request peer info OK is " + peers);
-                    mMySync.expectedState = STATE_REQUEST_PPER_OK;
-                }
-            });
-            long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-            while (System.currentTimeMillis() < timeout
-                    && mMySync.expectedState == STATE_REQUESTING)
-                mMySync.wait(WAIT_MSEC);
-        }
-    }
-
-    private void requestConnectionInfo() throws Exception {
-        synchronized (mMySync) {
-            mMySync.expectedState = STATE_REQUESTING;
-            mWifiP2pManager.requestConnectionInfo(mChannel, new WifiP2pManager.ConnectionInfoListener() {
-                public void onConnectionInfoAvailable(WifiP2pInfo info) {
-                    Log.d(TAG, "request connect info OK is " + info);
-                    mMySync.expectedState = STATE_REQUEST_CONNECTION_INFO_OK;
-                }
-            });
-            long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-            while (System.currentTimeMillis() < timeout
-                    && mMySync.expectedState == STATE_REQUESTING)
-                mMySync.wait(WAIT_MSEC);
-        }
-    }
-
-    private void requestGroupInfo() throws Exception {
-        synchronized (mMySync) {
-            mMySync.expectedState = STATE_REQUESTING;
-            mWifiP2pManager.requestGroupInfo(mChannel, new WifiP2pManager.GroupInfoListener() {
-                public void onGroupInfoAvailable(WifiP2pGroup group) {
-                    Log.d(TAG, "request group info OK is " + group);
-                    mMySync.expectedState = STATE_REQUEST_GROUP_INFO_OK;
-                }
-            });
-            long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-            while (System.currentTimeMillis() < timeout
-                    && mMySync.expectedState == STATE_REQUESTING)
-                mMySync.wait(WAIT_MSEC);
-        }
-    }
-
-    public void setDeviceName() throws Exception {
-        synchronized (mMySync) {
-            mMySync.expectedState = STATE_SETTING_DEV_NAME;
-            mWifiP2pManager.setDeviceName(mChannel, "AA AA", new WifiP2pManager.ActionListener() {
-                public void onSuccess() {
-                    Log.d(TAG, "Set device name success");
-                    mMySync.expectedState = STATE_SET_DEV_NAME_OK;
-                }
-                public void onFailure(int reason) {
-                    Log.d(TAG, "Set device name  failed " + reason);
-                }
-            });
-
-            long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-            while (System.currentTimeMillis() < timeout
-                    && mMySync.expectedState == STATE_SETTING_DEV_NAME)
-                mMySync.wait(WAIT_MSEC);
-        }
-    }
-
-    private String toString(WifiP2pDevice d) {
-        StringBuffer sbuf = new StringBuffer();
-        int count = 0;
-        if ((d.deviceName != null) || (d.deviceAddress != null)
-          || (d.primaryDeviceType != null) || (d.secondaryDeviceType != null)
-          || (d.wpsConfigMethodsSupported < 0)
-            || (d.groupCapability < 0) || (d.deviceCapability < 0)
-            || (d.status < 0)) {
-            sbuf.append("Device: ").append(d.deviceName);
-            sbuf.append("\n deviceAddress: ").append(d.deviceAddress);
-            sbuf.append("\n primary type: ").append(d.primaryDeviceType);
-            sbuf.append("\n secondary type: ").append(d.secondaryDeviceType);
-            sbuf.append("\n wps: ").append(d.wpsConfigMethodsSupported);
-            sbuf.append("\n grpcapab: ").append(d.groupCapability);
-            sbuf.append("\n devcapab: ").append(d.deviceCapability);
-            sbuf.append("\n status: ").append(d.status);
-            count += 1;
-        }
-        if (count == 0) {
-            return null;
-        }
-
-        return sbuf.toString();
-    }
-
-
-    public void searchAndGetPeers() throws Exception {
-        //test search peers
-        assertNotNull("mWifiP2pManager is null before start search peers!", mWifiP2pManager);
-        startSearch();
-        assertTrue("Timeout, failed to disvoverpeers", mMySync.expectedState == STATE_DISCOVER_PEERS_AVAILABLE);
-        assertNotNull("mWifiP2pManager is null  before get peers Info!", mWifiP2pManager);
-
-        //test request peers
-        mMySync.expectedState = STATE_NOT_GOT_PEERS_INFO;
-        mWifiP2pManager.requestPeers(mChannel, new WifiP2pManager.PeerListListener() {
-            public void onPeersAvailable(WifiP2pDeviceList peers) {
-                mMySync.expectedState = STATE_GOT_PEERS_INFO;
-            }
-        });
-
-        Thread.sleep(WAITRESULT);
-        assertTrue("Failed to get searched peers Info", mMySync.expectedState == STATE_GOT_PEERS_INFO);
-    }
-
-    public void test001SearchAndStopSearch() throws Exception {
-        mMySync.expectedState = STATE_NULL;
-
-        //search and get peers
-        searchAndGetPeers();
-        assertNotNull("mWifiP2pManager is null  before connect peers!", mWifiP2pManager);
-
-        stopSearch();
-        assertTrue("Timeout, failed to stop discover peers", mMySync.expectedState == STATE_DISCOVER_STOPPED);
-    }
-
-    public void test002Connect() throws Exception {
-        searchAndGetPeers();
-        assertNotNull("mWifiP2pManager is null  before connect peers!", mWifiP2pManager);
-        connectPeer();
-        Log.d(TAG, "expectedState3 is " + mMySync.expectedState);
-        assertTrue("Timeout, failed to connect peers", mMySync.expectedState == STATE_CONNECTED);
-    }
-
-    public void test003CreateGroup() throws Exception {
-        createGroup();
-        assertTrue("Timeout, failed to create group", mMySync.expectedState == STATE_CREATE_GROUP_OK);
-    }
-
-    public void test004ClearLocalServices() throws Exception {
-        clearLocalServices();
-        assertTrue("Timeout, failed to clear all local service", mMySync.expectedState == STATE_CLEAR_ALL_SERVICE_OK);
-    }
-
-    private void test005SetServiceListener() throws Exception {
-        setServiceResponseListener();
-        assertTrue("Set service listener failed", mMySync.expectedState == STATE_SET_SERVICE_LISTENER_OK);
-    }
-
-    public void test006SetDnsSdResponseListeners() throws Exception {
-        setDnsSdResponseListeners();
-        assertTrue("Set DNS service listener failed", mMySync.expectedState == STATE_SET_DNS_LISTENER_OK);
-    }
-
-    public void test007SetUpnpServiceResponseListener() throws Exception {
-        setUpnpServiceResponseListener();
-        assertTrue("Set DNS service listener failed", mMySync.expectedState == STATE_SET_UPNP_LISTENER_OK);
-    }
-
-    public void test008RequestInfo() throws Exception {
-        requestPeers();
-        assertTrue("request peers failed", mMySync.expectedState == STATE_REQUEST_PPER_OK);
-
-        requestConnectionInfo();
-        assertTrue("request connection info failed", mMySync.expectedState == STATE_REQUEST_CONNECTION_INFO_OK);
-
-        requestGroupInfo();
-        assertTrue("request group info failed", mMySync.expectedState == STATE_REQUEST_GROUP_INFO_OK);
-    }
-
-    public void test009SetDeviceName() throws Exception {
-        setDeviceName();
-        assertTrue("Set dev name failed", mMySync.expectedState == STATE_SET_DEV_NAME_OK);
-    }
-
-    public void test010OtherTest() throws Exception {
-        /*start test wifip2pdevice*/
-        WifiP2pDevice device1 = new WifiP2pDevice();
-        WifiP2pDevice device2 = new WifiP2pDevice();
-
-        boolean result = false;
-        result = device1.equals(device2);
-        assertTrue("Device1 equals device2 ", result == true);
-        result = false;
-
-        result = device1.isGroupOwner();
-        assertTrue("Device1 is GO ", result == false);
-        result = false;
-
-        result = device1.isServiceDiscoveryCapable();
-        assertTrue("Device1 has service discovery capability  ", result == false);
-        result = false;
-
-        result = device1.wpsPbcSupported();
-        assertTrue("Device1 support pbc ", result == false);
-        result = false;
-
-        result = device1.wpsKeypadSupported();
-        assertTrue("Device1 support keypad ", result == false);
-        result = false;
-
-        result = device1.wpsDisplaySupported();
-        assertTrue("Device1 support display ", result == false);
-        result = false;
-
-        Log.d(TAG, "device1: " + device1);
-        /*end test wifip2pdevice*/
-
-        /*start to test wifip2pdevicelist*/
-        WifiP2pDeviceList  list = new WifiP2pDeviceList();
-        list.getDeviceList();
-        Log.d(TAG, "list : " + list);
-        /*end test wifip2pdeivcelist*/
-
-        WifiP2pGroup group = new WifiP2pGroup();
-        group.getClientList();
-        group.getInterface();
-        group.getNetworkName();
-        group.getOwner();
-        group.getPassphrase();
-        group.isGroupOwner();
-        Log.d(TAG, "group : " + group);
-
-    }
-
-} //end of class
diff --git a/proprietary/hardware/audio/mt6757/Android.mk b/proprietary/hardware/audio/mt6757/Android.mk
index 80c52e515080bf514b0f846fd65657b6052bad29..3d8bec6b8d89e1b433baf814ad872ac0d7028e1a 100755
--- a/proprietary/hardware/audio/mt6757/Android.mk
+++ b/proprietary/hardware/audio/mt6757/Android.mk
@@ -41,7 +41,7 @@ LOCAL_COMMON_PATH:=../common
 
 include $(CLEAR_VARS)
 
-ifeq ($(MTK_PLATFORM),MT8163)
+ifeq ($(MTK_PLATFORM),MT6757)
 
 LOCAL_CFLAGS += -DLPDK_AUDIO_USE
 
diff --git a/proprietary/hardware/gpu_mtk/mt6757/gpu/NOTICE b/proprietary/hardware/gpu_mtk/mt6757/gpu/NOTICE
index 56b9469a7f6b264fa05f9d47e3d12fd782b74ba5..9e2ecee4557a121832d0d70b8d7e80286fbf56d1 100755
--- a/proprietary/hardware/gpu_mtk/mt6757/gpu/NOTICE
+++ b/proprietary/hardware/gpu_mtk/mt6757/gpu/NOTICE
@@ -1 +1 @@
-MT8163_L0
+MT6757_L0
diff --git a/proprietary/hardware/m4u/mt6757/Android.mk b/proprietary/hardware/m4u/mt6757/Android.mk
index bb10ac629b0aab614f3c91e4900f3db84c030199..eede5300be6e9aa1aba9f7a574332b809d1ca2d5 100755
--- a/proprietary/hardware/m4u/mt6757/Android.mk
+++ b/proprietary/hardware/m4u/mt6757/Android.mk
@@ -35,7 +35,7 @@
 
 
 
-ifeq ($(MTK_PLATFORM),$(filter $(MTK_PLATFORM),MT8163))
+ifeq ($(MTK_PLATFORM),$(filter $(MTK_PLATFORM),MT6757))
 
 LOCAL_PATH:= $(call my-dir)
 
diff --git a/proprietary/hardware/m4u/mt6757/ut/Android.mk b/proprietary/hardware/m4u/mt6757/ut/Android.mk
index d4f61a302d8e87395a3e81f1e9baa86d81b302ce..2dcdecff51c1808211480109a20105b6f6c9cf51 100755
--- a/proprietary/hardware/m4u/mt6757/ut/Android.mk
+++ b/proprietary/hardware/m4u/mt6757/ut/Android.mk
@@ -41,6 +41,8 @@ LOCAL_MODULE := m4u_ut
   
 LOCAL_SHARED_LIBRARIES := libcutils liblog libion
 
+LOCAL_CFLAGS := -Wno-reserved-user-defined-literal
+
 LOCAL_C_INCLUDES+= $(MTK_PATH_SOURCE)/hardware/m4u/mt6757
 LOCAL_C_INCLUDES+= $(MTK_PATH_SOURCE)/external
 LOCAL_C_INCLUDES += \
diff --git a/proprietary/modem/agold_mt6757p_sp_ct5m_p15/APDB_MT6757_S01_alps-mp-n0.mp5_W17.32 b/proprietary/modem/agold_mt6757p_sp_ct5m_p15/APDB_MT6757_S01_alps-mp-n0.mp5_W17.32
new file mode 100644
index 0000000000000000000000000000000000000000..1ca1071d4a9933d5382155faf639fe9810237bb1
Binary files /dev/null and b/proprietary/modem/agold_mt6757p_sp_ct5m_p15/APDB_MT6757_S01_alps-mp-n0.mp5_W17.32 differ
diff --git a/proprietary/modem/agold_mt6757p_sp_ct5m_p15/APDB_MT6757_S01_alps-mp-n0.mp5_W17.32_ENUM b/proprietary/modem/agold_mt6757p_sp_ct5m_p15/APDB_MT6757_S01_alps-mp-n0.mp5_W17.32_ENUM
new file mode 100644
index 0000000000000000000000000000000000000000..beb707fb8feaea5f0b004270717e1356cbea2fc6
--- /dev/null
+++ b/proprietary/modem/agold_mt6757p_sp_ct5m_p15/APDB_MT6757_S01_alps-mp-n0.mp5_W17.32_ENUM
@@ -0,0 +1,286 @@
+AP_CFG_CUSTOM_BEGIN_LID                                               51
+AP_CFG_CUSTOM_FILE_FUEL_GAUGE_LID                                     76
+AP_CFG_CUSTOM_FILE_GPS_LID                                            52
+AP_CFG_CUSTOM_FILE_MAX_LID                                            77
+AP_CFG_FILE_EXT_MDTYPE_LID                                            20
+AP_CFG_FILE_MDTYPE_LID                                                19
+AP_CFG_FILE_VER_INFO_LID                                              0
+AP_CFG_RDCL_BWCS_LID                                                  11
+AP_CFG_RDCL_CAMERA_3A_LID                                             4
+AP_CFG_RDCL_CAMERA_AF_LID                                             49
+AP_CFG_RDCL_CAMERA_DEFECT_LID                                         6
+AP_CFG_RDCL_CAMERA_FEATURE_LID                                        23
+AP_CFG_RDCL_CAMERA_FLASH_CALIBRATION_LID                              50
+AP_CFG_RDCL_CAMERA_GEOMETRY_LID                                       24
+AP_CFG_RDCL_CAMERA_LENS_LID                                           8
+AP_CFG_RDCL_CAMERA_PARA_LID                                           3
+AP_CFG_RDCL_CAMERA_PLINE10_LID                                        46
+AP_CFG_RDCL_CAMERA_PLINE11_LID                                        47
+AP_CFG_RDCL_CAMERA_PLINE12_LID                                        48
+AP_CFG_RDCL_CAMERA_PLINE2_LID                                         38
+AP_CFG_RDCL_CAMERA_PLINE3_LID                                         39
+AP_CFG_RDCL_CAMERA_PLINE4_LID                                         40
+AP_CFG_RDCL_CAMERA_PLINE5_LID                                         41
+AP_CFG_RDCL_CAMERA_PLINE6_LID                                         42
+AP_CFG_RDCL_CAMERA_PLINE7_LID                                         43
+AP_CFG_RDCL_CAMERA_PLINE8_LID                                         44
+AP_CFG_RDCL_CAMERA_PLINE9_LID                                         45
+AP_CFG_RDCL_CAMERA_PLINE_LID                                          37
+AP_CFG_RDCL_CAMERA_SENSOR_LID                                         7
+AP_CFG_RDCL_CAMERA_SHADING10_LID                                      34
+AP_CFG_RDCL_CAMERA_SHADING11_LID                                      35
+AP_CFG_RDCL_CAMERA_SHADING12_LID                                      36
+AP_CFG_RDCL_CAMERA_SHADING2_LID                                       26
+AP_CFG_RDCL_CAMERA_SHADING3_LID                                       27
+AP_CFG_RDCL_CAMERA_SHADING4_LID                                       28
+AP_CFG_RDCL_CAMERA_SHADING5_LID                                       29
+AP_CFG_RDCL_CAMERA_SHADING6_LID                                       30
+AP_CFG_RDCL_CAMERA_SHADING7_LID                                       31
+AP_CFG_RDCL_CAMERA_SHADING8_LID                                       32
+AP_CFG_RDCL_CAMERA_SHADING9_LID                                       33
+AP_CFG_RDCL_CAMERA_SHADING_LID                                        5
+AP_CFG_RDCL_CAMERA_VERSION_LID                                        22
+AP_CFG_RDCL_FACTORY_LID                                               10
+AP_CFG_RDCL_FILE_AUDIO_AUDENH_CONTROL_OPTION_PAR_LID                  16
+AP_CFG_RDCL_FILE_AUDIO_BT_GAIN_CUSTOM_LID                             74
+AP_CFG_RDCL_FILE_AUDIO_BUFFER_DC_CALIBRATION_PAR_LID                  67
+AP_CFG_RDCL_FILE_AUDIO_COMPFLT_LID                                    53
+AP_CFG_RDCL_FILE_AUDIO_EFFECT_LID                                     54
+AP_CFG_RDCL_FILE_AUDIO_FUNC_SWITCH_PARAM_LID                          75
+AP_CFG_RDCL_FILE_AUDIO_GAIN_TABLE_LID                                 63
+AP_CFG_RDCL_FILE_AUDIO_HAC_PARAM_LID                                  72
+AP_CFG_RDCL_FILE_AUDIO_HD_REC_PAR_LID                                 65
+AP_CFG_RDCL_FILE_AUDIO_HD_REC_SCENE_LID                               66
+AP_CFG_RDCL_FILE_AUDIO_LID                                            51
+AP_CFG_RDCL_FILE_AUDIO_MAGI_CONFERENCE_LID                            71
+AP_CFG_RDCL_FILE_AUDIO_MUSIC_DRC_LID                                  69
+AP_CFG_RDCL_FILE_AUDIO_PARAM_MED_LID                                  57
+AP_CFG_RDCL_FILE_AUDIO_RINGTONE_DRC_LID                               70
+AP_CFG_RDCL_FILE_AUDIO_SPEECH_LPBK_PARAM_LID                          73
+AP_CFG_RDCL_FILE_AUDIO_VER1_VOLUME_CUSTOM_LID                         64
+AP_CFG_RDCL_FILE_AUDIO_VOIP_PAR_LID                                   17
+AP_CFG_RDCL_FILE_AUDIO_VOLUME_CUSTOM_LID                              58
+AP_CFG_RDCL_FILE_AUDIO_WB_PARAM_LID                                   60
+AP_CFG_RDCL_FILE_AUXADC_LID                                           2
+AP_CFG_RDCL_FILE_DUAL_MIC_CUSTOM_LID                                  59
+AP_CFG_RDCL_FILE_HEADPHONE_COMPFLT_LID                                62
+AP_CFG_RDCL_FILE_MD_SBP_LID                                           25
+AP_CFG_RDCL_FILE_SDIO_LID                                             21
+AP_CFG_RDCL_FILE_VIBSPK_COMPFLT_LID                                   68
+AP_CFG_RDCL_FILE_VOICE_RECOGNIZE_PARAM_LID                            15
+AP_CFG_RDCL_HWMON_ACC_LID                                             12
+AP_CFG_RDCL_HWMON_GYRO_LID                                            13
+AP_CFG_RDCL_HWMON_PS_LID                                              18
+AP_CFG_RDCL_UART_LID                                                  9
+AP_CFG_RDEB_FILE_BT_ADDR_LID                                          1
+AP_CFG_RDEB_FILE_WIFI_LID                                             55
+AP_CFG_RDEB_OMADM_USB_LID                                             14
+AP_CFG_RDEB_WIFI_CUSTOM_LID                                           56
+AP_CFG_REEB_PRODUCT_INFO_LID                                          61
+AUDIO_GAIN_ALARM                                                      4
+AUDIO_GAIN_BLUETOOTH_SCO                                              6
+AUDIO_GAIN_DEFAULT                                                    -1
+AUDIO_GAIN_DTMF                                                       8
+AUDIO_GAIN_ENFORCED_AUDIBLE                                           7
+AUDIO_GAIN_FM                                                         10
+AUDIO_GAIN_MATV                                                       11
+AUDIO_GAIN_MAX_STREAM                                                 11
+AUDIO_GAIN_MUSIC                                                      3
+AUDIO_GAIN_NOTIFICATION                                               5
+AUDIO_GAIN_RING                                                       2
+AUDIO_GAIN_SYSTEM                                                     1
+AUDIO_GAIN_TTS                                                        9
+AUDIO_GAIN_VOICE_CALL                                                 0
+AUDIO_HFP_DEVICE_HEADSET                                              2
+AUDIO_HFP_DEVICE_NORMAL                                               0
+AUDIO_HFP_DEVICE_RESERVED                                             3
+AUDIO_HFP_DEVICE_SPEAKER                                              1
+AUDIO_VOIP_DEVICE_BT                                                  3
+AUDIO_VOIP_DEVICE_HEADSET                                             2
+AUDIO_VOIP_DEVICE_NORMAL                                              0
+AUDIO_VOIP_DEVICE_SPEAKER                                             1
+DATA_MPAL_SAP                                                         7
+DRIVER_PS_SAP                                                         11
+EXTAMP_VOLUME_TYPE_MAX                                                6
+GAIN_ANALOG_PLAY                                                      17
+GAIN_IDLE_RECORD_HEADSET                                              1
+GAIN_IDLE_RECORD_MIC                                                  0
+GAIN_INCALL_NB_ECEIVER                                                6
+GAIN_INCALL_NB_HEADSET                                                7
+GAIN_INCALL_NB_SPEAKER                                                8
+GAIN_INCALL_WB_ECEIVER                                                9
+GAIN_INCALL_WB_HEADSET                                                10
+GAIN_INCALL_WB_SPEAKER                                                11
+GAIN_LEVEL_SHIFT                                                      16
+GAIN_OUTPUT_DOCK                                                      3
+GAIN_OUTPUT_EARPIECE                                                  0
+GAIN_OUTPUT_HEADSET                                                   1
+GAIN_OUTPUT_SPEAKER                                                   2
+GAIN_RESERVED1_HEADSET                                                21
+GAIN_RESERVED1_MIC                                                    20
+GAIN_RESERVED2_HEADSET                                                23
+GAIN_RESERVED2_MIC                                                    22
+GAIN_TTY_DEVICE                                                       15
+GAIN_VIDEO_REC_HEADSET                                                5
+GAIN_VIDEO_REC_MIC                                                    4
+GAIN_VOICE_REC_HEADSET                                                3
+GAIN_VOICE_REC_MIC                                                    2
+GAIN_VOICE_UNLOCK_HEADSET                                             19
+GAIN_VOICE_UNLOCK_MIC                                                 18
+GAIN_VOIP_HEADSET                                                     13
+GAIN_VOIP_RECEIVER                                                    12
+GAIN_VOIP_SPEAKER                                                     14
+GMMREG_SAP                                                            1
+HD_REC_DEVICE_SOURCE_BT_EARPHONE                                      2
+HD_REC_DEVICE_SOURCE_HANDSET                                          0
+HD_REC_DEVICE_SOURCE_HEADSET                                          1
+HEADSET_AUDIO_BUFFER                                                  0
+HEADSET_FM_RECORD_A                                                   1
+HEADSET_FM_RECORD_D                                                   2
+HEADSET_RSERVED_2                                                     4
+HEADSET_RSERVED_3                                                     5
+HEADSET_SIP_AUDIO_BUFFER                                              3
+HEADSET_SPEAKER_AMP                                                   1
+HEADSET_SPEAKER_AUDIO_BUFFER                                          0
+HEADSET_SPEAKER_FM_RECORD_A                                           3
+HEADSET_SPEAKER_FM_RECORD_D                                           4
+HEADSET_SPEAKER_IV_BUFFER                                             2
+HEADSET_SPEAKER_RSERVED_2                                             6
+HEADSET_SPEAKER_RSERVED_3                                             7
+HEADSET_SPEAKER_SIP_AUDIO_BUFFER                                      5
+HEADSET_SPEAKER_VOLUME_TYPE_MAX                                       8
+HEADSET_VOLUME_TYPE_MAX                                               6
+INVALID_SAP                                                           0
+L1_L1_SAP                                                             8
+L1_MPAL_SAP                                                           9
+LAST_MOD_ID                                                           27
+LAST_SAP_CODE                                                         12
+MAX_VOL_CATE                                                          3
+MAX_VOL_TYPE                                                          7
+MM_CC_SAP                                                             3
+MM_SMS_SAP                                                            2
+MM_SS_SAP                                                             4
+MOD_ATCI                                                              4
+MOD_CC                                                                6
+MOD_CISS                                                              7
+MOD_CUSTOM1                                                           12
+MOD_CUSTOM_BEGIN                                                      12
+MOD_CUSTOM_END                                                        13
+MOD_FT                                                                0
+MOD_MM                                                                5
+MOD_NIL                                                               0
+MOD_NVRAM                                                             1
+MOD_SMS                                                               8
+MOD_SYSDEBUG                                                          11
+MOD_SYSTEM                                                            10
+MOD_TIMER                                                             9
+MOD_TST                                                               2
+MOD_TST_READER                                                        3
+MPAL_L1_SAP                                                           10
+MSG_ID_END                                                            10000
+MSG_ID_FT                                                             9500
+MSG_ID_INVALID_TYPE                                                   0
+MSG_ID_L1TASK_WAKEUP                                                  14
+MSG_ID_MMCC_DATA_REQ                                                  6
+MSG_ID_MMCC_EST_REQ                                                   4
+MSG_ID_MMCC_PROMPT_REJ                                                1
+MSG_ID_MMCC_PROMPT_RSP                                                2
+MSG_ID_MMCC_REEST_REQ                                                 5
+MSG_ID_MMCC_REL_REQ                                                   3
+MSG_ID_MPHC_BLOCK_QUALITY_IND                                         9
+MSG_ID_MPHC_EXTENDED_MEAS_IND                                         8
+MSG_ID_MPHC_NEIGHBOR_BSIC_IND                                         13
+MSG_ID_MPHC_NEIGHBOR_MEAS_IND                                         12
+MSG_ID_MPHC_OPEN_TCH_LOOP_CNF                                         7
+MSG_ID_MPHC_SERV_DEDI_MEAS_IND                                        11
+MSG_ID_MPHC_SERV_IDLE_MEAS_IND                                        10
+MSG_ID_TIMER_EXPIRY                                                   9000
+MSG_ID_TST_INJECT_STRING                                              6000
+NORMAL_AUDIO_BUFFER                                                   0
+NORMAL_FM_RECORD_A                                                    1
+NORMAL_FM_RECORD_D                                                    2
+NORMAL_RSERVED_2                                                      4
+NORMAL_RSERVED_3                                                      5
+NORMAL_SIP_AUDIO_BUFFER                                               3
+NORMAL_VOLUME_TYPE_MAX                                                6
+NUM_AUDIO_GAIN_TYPES                                                  12
+NUM_AUDIO_HFP_DEVICE                                                  4
+NUM_AUDIO_VOIP_DEVICE                                                 4
+NUM_GAIN_OUTPUT_DEVICES                                               4
+NUM_HD_REC_DEVICE_SOURCE                                              3
+NUM_MIC_GAINS                                                         24
+NUM_OF_VOL_MODE                                                       4
+SME_READER_SAP                                                        5
+SME_TIMER_SAP                                                         6
+SPEAKER_AMP                                                           0
+SPEAKER_FM_RECORD_A                                                   1
+SPEAKER_FM_RECORD_D                                                   2
+SPEAKER_RSERVED_2                                                     4
+SPEAKER_RSERVED_3                                                     5
+SPEAKER_SIP_AUDIO_BUFFER                                              3
+SPEAKER_VOLUME_TYPE_MAX                                               6
+STACK_TIMER_SAP                                                       12
+TRACE_ERROR                                                           4
+TRACE_FUNC                                                            0
+TRACE_GROUP_1                                                         5
+TRACE_GROUP_10                                                        14
+TRACE_GROUP_2                                                         6
+TRACE_GROUP_3                                                         7
+TRACE_GROUP_4                                                         8
+TRACE_GROUP_5                                                         9
+TRACE_GROUP_6                                                         10
+TRACE_GROUP_7                                                         11
+TRACE_GROUP_8                                                         12
+TRACE_GROUP_9                                                         13
+TRACE_INFO                                                            2
+TRACE_STATE                                                           1
+TRACE_WARNING                                                         3
+TST_CTI_COMMAND_CMD                                                   56
+TST_EM_MODE_CONFIG                                                    12
+TST_FT_MODE_CONFIG                                                    16
+TST_FT_SAP                                                            200
+TST_INJECT_AT_CMD                                                     7
+TST_INJECT_STRING_TO_MODULE                                           6
+TST_LOG_ON_OFF                                                        1
+TST_NULL_COMMAND                                                      0
+TST_READ_GLOBAL_VARIABLE                                              10
+TST_REBOOT_TARGET_CMD                                                 8
+TST_SET_L1_TRC_FILTER                                                 5
+TST_SET_PRIM_MOD_FILTER                                               2
+TST_SET_PRIM_SAP_FILTER                                               3
+TST_SET_PS_TRC_FILTER                                                 4
+TST_SET_TRAP_FILTER                                                   9
+TST_SIM_FILE_INFO_REQ                                                 13
+TST_SIM_READ_REQ                                                      14
+TST_SIM_WRITE_REQ                                                     15
+TST_WRITE_GLOBAL_VARIABLE                                             11
+VER1_NUM_OF_VOL_TYPE                                                  9
+VER1_VOL_TYPE_FM                                                      3
+VER1_VOL_TYPE_MATV                                                    8
+VER1_VOL_TYPE_MEDIA                                                   7
+VER1_VOL_TYPE_MIC                                                     2
+VER1_VOL_TYPE_RING                                                    0
+VER1_VOL_TYPE_SID                                                     6
+VER1_VOL_TYPE_SIP                                                     1
+VER1_VOL_TYPE_SPH                                                     4
+VER1_VOL_TYPE_SPH2                                                    5
+VOLUME_AUDIO_BUFFER_EXTAMP                                            1
+VOLUME_EXTAMP                                                         2
+VOLUME_EXTAMP_RSERVED_1                                               3
+VOLUME_EXTAMP_RSERVED_2                                               4
+VOLUME_EXTAMP_RSERVED_3                                               5
+VOLUME_HEADSET_MODE                                                   1
+VOLUME_HEADSET_SPEAKER_MODE                                           3
+VOLUME_IV_BUFFER_EXTAMP                                               0
+VOLUME_NORMAL_MODE                                                    0
+VOLUME_SPEAKER_MODE                                                   2
+VOL_HANDFREE                                                          2
+VOL_HEADSET                                                           1
+VOL_NORMAL                                                            0
+VOL_TYPE_FMR                                                          3
+VOL_TYPE_KEY                                                          1
+VOL_TYPE_MEDIA                                                        6
+VOL_TYPE_MIC                                                          2
+VOL_TYPE_SID                                                          5
+VOL_TYPE_SPH                                                          4
+VOL_TYPE_TON                                                          0
diff --git a/proprietary/modem/agold_mt6757p_sp_ct5m_p15/AdcInitAddr.bin b/proprietary/modem/agold_mt6757p_sp_ct5m_p15/AdcInitAddr.bin
new file mode 100644
index 0000000000000000000000000000000000000000..704032b47da5f7749dc30bbd3e42b9b736db5d93
--- /dev/null
+++ b/proprietary/modem/agold_mt6757p_sp_ct5m_p15/AdcInitAddr.bin
@@ -0,0 +1 @@
+0x1000108c,09
\ No newline at end of file
diff --git a/proprietary/modem/agold_mt6757p_sp_ct5m_p15/GpioAddr.bin b/proprietary/modem/agold_mt6757p_sp_ct5m_p15/GpioAddr.bin
new file mode 100644
index 0000000000000000000000000000000000000000..3448078923c19b3a6c8bf45ae0b6679ed5c9541d
--- /dev/null
+++ b/proprietary/modem/agold_mt6757p_sp_ct5m_p15/GpioAddr.bin
@@ -0,0 +1 @@
+0x10002450
\ No newline at end of file
diff --git a/proprietary/modem/agold_mt6757p_sp_ct5m_p15/MDDB_InfoCustomAppSrcP_MT6757P_S00_MOLY_LR11_W1630_MD_MP_V14_P14.EDB b/proprietary/modem/agold_mt6757p_sp_ct5m_p15/MDDB_InfoCustomAppSrcP_MT6757P_S00_MOLY_LR11_W1630_MD_MP_V14_P14.EDB
new file mode 100644
index 0000000000000000000000000000000000000000..75de0141a3164c773c4e628eb7e4fbc1941781d0
Binary files /dev/null and b/proprietary/modem/agold_mt6757p_sp_ct5m_p15/MDDB_InfoCustomAppSrcP_MT6757P_S00_MOLY_LR11_W1630_MD_MP_V14_P14.EDB differ
diff --git a/proprietary/modem/agold_mt6757p_sp_ct5m_p15/MT6757_Android_scatter.txt b/proprietary/modem/agold_mt6757p_sp_ct5m_p15/MT6757_Android_scatter.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e30f5a8b526fe28dc1d2827a14194622b110d4d4
--- /dev/null
+++ b/proprietary/modem/agold_mt6757p_sp_ct5m_p15/MT6757_Android_scatter.txt
@@ -0,0 +1,545 @@
+############################################################################################################
+#
+#  General Setting
+#
+############################################################################################################
+- general: MTK_PLATFORM_CFG
+  info: 
+    - config_version: V1.1.2
+      platform: MT6757D
+      project: p15v57c2k_gq_tee
+      storage: EMMC
+      boot_channel: MSDC_0
+      block_size: 0x20000
+############################################################################################################
+#
+#  Layout Setting
+#
+############################################################################################################
+- partition_index: SYS0
+  partition_name: preloader
+  file_name: preloader_p15v57c2k_gq_tee.bin
+  is_download: true
+  type: SV5_BL_BIN
+  linear_start_addr: 0x0
+  physical_start_addr: 0x0
+  partition_size: 0x40000
+  region: EMMC_BOOT1_BOOT2
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: BOOTLOADERS
+  is_upgradable: true
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS1
+  partition_name: pgpt
+  file_name: NONE
+  is_download: false
+  type: NORMAL_ROM
+  linear_start_addr: 0x0
+  physical_start_addr: 0x0
+  partition_size: 0x8000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: INVISIBLE
+  is_upgradable: false
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS2
+  partition_name: boot_para
+  file_name: NONE
+  is_download: false
+  type: NORMAL_ROM
+  linear_start_addr: 0x8000
+  physical_start_addr: 0x8000
+  partition_size: 0x100000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: INVISIBLE
+  is_upgradable: false
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS3
+  partition_name: recovery
+  file_name: recovery.img
+  is_download: true
+  type: NORMAL_ROM
+  linear_start_addr: 0x108000
+  physical_start_addr: 0x108000
+  partition_size: 0x1800000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: UPDATE
+  is_upgradable: true
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS4
+  partition_name: para
+  file_name: NONE
+  is_download: false
+  type: NORMAL_ROM
+  linear_start_addr: 0x1908000
+  physical_start_addr: 0x1908000
+  partition_size: 0x80000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: INVISIBLE
+  is_upgradable: false
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS5
+  partition_name: expdb
+  file_name: NONE
+  is_download: false
+  type: NORMAL_ROM
+  linear_start_addr: 0x1988000
+  physical_start_addr: 0x1988000
+  partition_size: 0x1400000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: INVISIBLE
+  is_upgradable: false
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS6
+  partition_name: frp
+  file_name: NONE
+  is_download: false
+  type: NORMAL_ROM
+  linear_start_addr: 0x2d88000
+  physical_start_addr: 0x2d88000
+  partition_size: 0x100000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: INVISIBLE
+  is_upgradable: false
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS7
+  partition_name: nvcfg
+  file_name: NONE
+  is_download: false
+  type: EXT4_IMG
+  linear_start_addr: 0x2e88000
+  physical_start_addr: 0x2e88000
+  partition_size: 0x800000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: PROTECTED
+  is_upgradable: false
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS8
+  partition_name: nvdata
+  file_name: NONE
+  is_download: false
+  type: EXT4_IMG
+  linear_start_addr: 0x3688000
+  physical_start_addr: 0x3688000
+  partition_size: 0x2000000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: INVISIBLE
+  is_upgradable: false
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS9
+  partition_name: metadata
+  file_name: NONE
+  is_download: false
+  type: NORMAL_ROM
+  linear_start_addr: 0x5688000
+  physical_start_addr: 0x5688000
+  partition_size: 0x2000000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: INVISIBLE
+  is_upgradable: false
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS10
+  partition_name: protect1
+  file_name: NONE
+  is_download: false
+  type: EXT4_IMG
+  linear_start_addr: 0x7688000
+  physical_start_addr: 0x7688000
+  partition_size: 0x800000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: PROTECTED
+  is_upgradable: false
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS11
+  partition_name: protect2
+  file_name: NONE
+  is_download: false
+  type: EXT4_IMG
+  linear_start_addr: 0x7e88000
+  physical_start_addr: 0x7e88000
+  partition_size: 0x978000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: PROTECTED
+  is_upgradable: false
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS12
+  partition_name: seccfg
+  file_name: NONE
+  is_download: false
+  type: NORMAL_ROM
+  linear_start_addr: 0x8800000
+  physical_start_addr: 0x8800000
+  partition_size: 0x800000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: INVISIBLE
+  is_upgradable: false
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS13
+  partition_name: sec1
+  file_name: NONE
+  is_download: false
+  type: NORMAL_ROM
+  linear_start_addr: 0x9000000
+  physical_start_addr: 0x9000000
+  partition_size: 0x200000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: INVISIBLE
+  is_upgradable: false
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS14
+  partition_name: proinfo
+  file_name: NONE
+  is_download: false
+  type: NORMAL_ROM
+  linear_start_addr: 0x9200000
+  physical_start_addr: 0x9200000
+  partition_size: 0x300000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: PROTECTED
+  is_upgradable: false
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS15
+  partition_name: md1img
+  file_name: md1rom.img
+  is_download: true
+  type: NORMAL_ROM
+  linear_start_addr: 0x9500000
+  physical_start_addr: 0x9500000
+  partition_size: 0x1800000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: UPDATE
+  is_upgradable: true
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS16
+  partition_name: md1dsp
+  file_name: md1dsp.img
+  is_download: true
+  type: NORMAL_ROM
+  linear_start_addr: 0xad00000
+  physical_start_addr: 0xad00000
+  partition_size: 0x400000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: UPDATE
+  is_upgradable: true
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS17
+  partition_name: md1arm7
+  file_name: md1arm7.img
+  is_download: true
+  type: NORMAL_ROM
+  linear_start_addr: 0xb100000
+  physical_start_addr: 0xb100000
+  partition_size: 0x300000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: UPDATE
+  is_upgradable: true
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS18
+  partition_name: md3img
+  file_name: md3rom.img
+  is_download: true
+  type: NORMAL_ROM
+  linear_start_addr: 0xb400000
+  physical_start_addr: 0xb400000
+  partition_size: 0x500000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: UPDATE
+  is_upgradable: true
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS19
+  partition_name: nvram
+  file_name: NONE
+  is_download: false
+  type: NORMAL_ROM
+  linear_start_addr: 0xb900000
+  physical_start_addr: 0xb900000
+  partition_size: 0x500000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: BINREGION
+  is_upgradable: false
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS20
+  partition_name: lk
+  file_name: lk.bin
+  is_download: true
+  type: NORMAL_ROM
+  linear_start_addr: 0xbe00000
+  physical_start_addr: 0xbe00000
+  partition_size: 0x100000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: UPDATE
+  is_upgradable: true
+  empty_boot_needed: true
+  reserve: 0x00
+
+- partition_index: SYS21
+  partition_name: lk2
+  file_name: lk.bin
+  is_download: true
+  type: NORMAL_ROM
+  linear_start_addr: 0xbf00000
+  physical_start_addr: 0xbf00000
+  partition_size: 0x100000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: UPDATE
+  is_upgradable: true
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS22
+  partition_name: boot
+  file_name: boot.img
+  is_download: true
+  type: NORMAL_ROM
+  linear_start_addr: 0xc000000
+  physical_start_addr: 0xc000000
+  partition_size: 0x1000000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: UPDATE
+  is_upgradable: true
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS23
+  partition_name: logo
+  file_name: logo.bin
+  is_download: true
+  type: NORMAL_ROM
+  linear_start_addr: 0xd000000
+  physical_start_addr: 0xd000000
+  partition_size: 0x800000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: UPDATE
+  is_upgradable: false
+  empty_boot_needed: true
+  reserve: 0x00
+
+- partition_index: SYS24
+  partition_name: tee1
+  file_name: trustzone.bin
+  is_download: true
+  type: NORMAL_ROM
+  linear_start_addr: 0xd800000
+  physical_start_addr: 0xd800000
+  partition_size: 0x500000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: UPDATE
+  is_upgradable: true
+  empty_boot_needed: true
+  reserve: 0x00
+
+- partition_index: SYS25
+  partition_name: tee2
+  file_name: trustzone.bin
+  is_download: true
+  type: NORMAL_ROM
+  linear_start_addr: 0xdd00000
+  physical_start_addr: 0xdd00000
+  partition_size: 0xb00000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: UPDATE
+  is_upgradable: true
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS26
+  partition_name: system
+  file_name: system.img
+  is_download: true
+  type: EXT4_IMG
+  linear_start_addr: 0xe800000
+  physical_start_addr: 0xe800000
+  partition_size: 0xe0000000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: UPDATE
+  is_upgradable: true
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS27
+  partition_name: cache
+  file_name: cache.img
+  is_download: true
+  type: EXT4_IMG
+  linear_start_addr: 0xee800000
+  physical_start_addr: 0xee800000
+  partition_size: 0x1b000000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: UPDATE
+  is_upgradable: false
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS28
+  partition_name: userdata
+  file_name: userdata.img
+  is_download: true
+  type: EXT4_IMG
+  linear_start_addr: 0x109800000
+  physical_start_addr: 0x109800000
+  partition_size: 0xc0000000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: true
+  is_reserved: false
+  operation_type: UPDATE
+  is_upgradable: false
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS29
+  partition_name: flashinfo
+  file_name: NONE
+  is_download: false
+  type: NORMAL_ROM
+  linear_start_addr: 0xFFFF0080
+  physical_start_addr: 0xFFFF0080
+  partition_size: 0x1000000
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: false
+  is_reserved: true
+  operation_type: RESERVED
+  is_upgradable: false
+  empty_boot_needed: false
+  reserve: 0x00
+
+- partition_index: SYS30
+  partition_name: sgpt
+  file_name: NONE
+  is_download: false
+  type: NORMAL_ROM
+  linear_start_addr: 0xFFFF0000
+  physical_start_addr: 0xFFFF0000
+  partition_size: 0x4200
+  region: EMMC_USER
+  storage: HW_STORAGE_EMMC
+  boundary_check: false
+  is_reserved: true
+  operation_type: RESERVED
+  is_upgradable: false
+  empty_boot_needed: false
+  reserve: 0x00
+
diff --git a/proprietary/modem/agold_mt6757p_sp_ct5m_p15/agold_mt6757p_sp_ct5m_p15.mak b/proprietary/modem/agold_mt6757p_sp_ct5m_p15/agold_mt6757p_sp_ct5m_p15.mak
new file mode 100644
index 0000000000000000000000000000000000000000..a04a7d925c12aed3e10644fde6d37f91bf576879
--- /dev/null
+++ b/proprietary/modem/agold_mt6757p_sp_ct5m_p15/agold_mt6757p_sp_ct5m_p15.mak
@@ -0,0 +1 @@
+mtk_modem_file := APDB_MT6757_S01_alps-mp-n0.mp5_W17.32
diff --git a/proprietary/modem/agold_mt6757p_sp_ct5m_p15/preloader_p15v57c2k_gq_tee.bin b/proprietary/modem/agold_mt6757p_sp_ct5m_p15/preloader_p15v57c2k_gq_tee.bin
new file mode 100644
index 0000000000000000000000000000000000000000..bf32a11706baeb3e234422ef77d2fb9c0b0cf7b4
Binary files /dev/null and b/proprietary/modem/agold_mt6757p_sp_ct5m_p15/preloader_p15v57c2k_gq_tee.bin differ
diff --git a/proprietary/operator/OP01/packages/apps/BackupRestore/tests/Android.mk b/proprietary/operator/OP01/packages/apps/BackupRestore/tests/Android.mk
deleted file mode 100755
index c360bf7a1dc8c066871dff99211f4b6fc2565110..0000000000000000000000000000000000000000
--- a/proprietary/operator/OP01/packages/apps/BackupRestore/tests/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifeq ($(strip $(MTK_AUTO_TEST)), yes)
-	LOCAL_PATH:= $(call my-dir)
-	include $(CLEAR_VARS)
-    # We only want this apk build for tests.
-	LOCAL_MODULE_TAGS := tests
-    # Include all test java files.
-	LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-	LOCAL_PACKAGE_NAME := BackupAndRestoreTests
-
-	LOCAL_STATIC_JAVA_LIBRARIES := librobotium4
-	LOCAL_JAVA_LIBRARIES := android.test.runner 
-	LOCAL_JAVA_LIBRARIES += mediatek-framework telephony-common
-
-	LOCAL_INSTRUMENTATION_FOR := BackupAndRestore
-
-	LOCAL_CERTIFICATE := platform
-
-
-	include $(BUILD_PACKAGE)
-
-	include $(call all-makefiles-under,$(LOCAL_PATH))
-
-#endif
diff --git a/proprietary/operator/OP01/packages/apps/CMCCClient/tests/Android.mk b/proprietary/operator/OP01/packages/apps/CMCCClient/tests/Android.mk
deleted file mode 100755
index 75ebba483ca6aa3edc3a558824ffbe3ee144f911..0000000000000000000000000000000000000000
--- a/proprietary/operator/OP01/packages/apps/CMCCClient/tests/Android.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-ifeq ($(strip $(MTK_AUTO_TEST)), yes)
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := librobotium4
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := CustomerServiceTests
-
-LOCAL_CERTIFICATE := platform
-
-LOCAL_INSTRUMENTATION_FOR := CMCCClient
-
-include $(BUILD_PACKAGE)
-
-endif
diff --git a/proprietary/operator/OP01/packages/apps/NoteBook/tests/Android.mk b/proprietary/operator/OP01/packages/apps/NoteBook/tests/Android.mk
deleted file mode 100755
index a2ca0ce5e09c1a403baf9f9be3c9f191f435c06a..0000000000000000000000000000000000000000
--- a/proprietary/operator/OP01/packages/apps/NoteBook/tests/Android.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-ifeq ($(strip $(MTK_AUTO_TEST)), yes)
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-LOCAL_STATIC_JAVA_LIBRARIES := librobotium4
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := NotebookTests
-
-LOCAL_CERTIFICATE := platform
-
-LOCAL_INSTRUMENTATION_FOR := NoteBook
-
-include $(BUILD_PACKAGE)
-
-endif
diff --git a/proprietary/operator/OP01/packages/apps/TaskManager/tests/Android.mk b/proprietary/operator/OP01/packages/apps/TaskManager/tests/Android.mk
deleted file mode 100755
index 394e2d58e3a41eb76cee855b666817d531b711ec..0000000000000000000000000000000000000000
--- a/proprietary/operator/OP01/packages/apps/TaskManager/tests/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-ifeq ($(strip $(MTK_AUTO_TEST)), yes)
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := librobotium4
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := TaskManagerTests
-
-LOCAL_INSTRUMENTATION_FOR := TaskManager
-
-include $(BUILD_PACKAGE)
-endif
diff --git a/proprietary/operator/OP02/packages/apps/Plugins/tests/Android.mk b/proprietary/operator/OP02/packages/apps/Plugins/tests/Android.mk
deleted file mode 100755
index e0879caece02fb3f381f5f93543f90d8c0d54815..0000000000000000000000000000000000000000
--- a/proprietary/operator/OP02/packages/apps/Plugins/tests/Android.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-
-
-# Copyright 2008, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-ifeq ($(strip $(MTK_AUTO_TEST)), yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := optional
-LOCAL_CERTIFICATE := shared
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-LOCAL_JAVA_LIBRARIES += telephony-common
-
-LOCAL_STATIC_JAVA_LIBRARIES := librobotium4
-LOCAL_STATIC_JAVA_LIBRARIES += com.mediatek.systemui.ext
-LOCAL_STATIC_JAVA_LIBRARIES += com.mediatek.filemanager.ext
-LOCAL_STATIC_JAVA_LIBRARIES += com.mediatek.settings.ext
-#            com.mediatek.perfhelper
-
-LOCAL_EMMA_COVERAGE_FILTER := +com.mediatek.filemanager.plugin.*
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-# Notice that we don't have to include the src files of Email because, by
-# running the tests using an instrumentation targeting Eamil, we
-# automatically get all of its classes loaded into our environment.
-
-LOCAL_PACKAGE_NAME := OP02PluginTests
-
-LOCAL_INSTRUMENTATION_FOR := OP02Plugin
-
-include $(BUILD_PACKAGE)
-endif
diff --git a/proprietary/operator/OP08/packages/apps/Plugins/tests/Contacts/Android.mk b/proprietary/operator/OP08/packages/apps/Plugins/tests/Contacts/Android.mk
deleted file mode 100755
index ff2172b9cef466b9c21007913b100db288348e6d..0000000000000000000000000000000000000000
--- a/proprietary/operator/OP08/packages/apps/Plugins/tests/Contacts/Android.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-LOCAL_CERTIFICATE := shared
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_JAVA_LIBRARIES += ims-common
-
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JACK_ENABLED := disabled
-LOCAL_STATIC_JAVA_LIBRARIES := librobotium4
-
-LOCAL_PACKAGE_NAME := CommonPresenceContactTests
-
-LOCAL_INSTRUMENTATION_FOR := Contacts
-
-include $(BUILD_PACKAGE)
diff --git a/proprietary/operator/OP08/packages/apps/Plugins/tests/Dialer/Android.mk b/proprietary/operator/OP08/packages/apps/Plugins/tests/Dialer/Android.mk
deleted file mode 100755
index a6ad8a4f4fdd931db08045887f22dfc777cb8500..0000000000000000000000000000000000000000
--- a/proprietary/operator/OP08/packages/apps/Plugins/tests/Dialer/Android.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-LOCAL_CERTIFICATE := shared
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_JAVA_LIBRARIES += ims-common
-
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JACK_ENABLED := disabled
-LOCAL_STATIC_JAVA_LIBRARIES := librobotium4
-
-LOCAL_PACKAGE_NAME := CommonPresenceDialerTests
-
-LOCAL_INSTRUMENTATION_FOR := Dialer
-
-include $(BUILD_PACKAGE)
diff --git a/proprietary/packages/3rd-party/ANT/ANTPlusDemo/Android.mk b/proprietary/packages/3rd-party/ANT/ANTPlusDemo/Android.mk
deleted file mode 100755
index 1e72db63d73764dd1bcecf774550d51959c9ed92..0000000000000000000000000000000000000000
--- a/proprietary/packages/3rd-party/ANT/ANTPlusDemo/Android.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-###############################################################################
-# 
-# ANT Stack
-# 
-# Copyright 2010 Dynastream Innovations
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and  
-# limitations under the License.
-# 
-###############################################################################
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE := ANTPlusDemo
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_PATH := $(TARGET_OUT)/app
-include $(BUILD_PREBUILT)
diff --git a/proprietary/packages/3rd-party/ANT/ANTPlusPluginSampler/Android.mk b/proprietary/packages/3rd-party/ANT/ANTPlusPluginSampler/Android.mk
deleted file mode 100755
index 71fddf4f0c2726b8b63c9e88a1893e477b829375..0000000000000000000000000000000000000000
--- a/proprietary/packages/3rd-party/ANT/ANTPlusPluginSampler/Android.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-###############################################################################
-# 
-# ANT Stack
-# 
-# Copyright 2010 Dynastream Innovations
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and  
-# limitations under the License.
-# 
-###############################################################################
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE := ANTPlusPluginSampler
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_PATH := $(TARGET_OUT)/app
-include $(BUILD_PREBUILT)
diff --git a/proprietary/packages/3rd-party/ANT/ANTPlusPlugins/Android.mk b/proprietary/packages/3rd-party/ANT/ANTPlusPlugins/Android.mk
deleted file mode 100755
index f234d76a01cba5a4dad9b28d502a43034077d013..0000000000000000000000000000000000000000
--- a/proprietary/packages/3rd-party/ANT/ANTPlusPlugins/Android.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-###############################################################################
-# 
-# ANT Stack
-# 
-# Copyright 2010 Dynastream Innovations
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and  
-# limitations under the License.
-# 
-###############################################################################
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE := ANTPlusPlugins
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_PATH := $(TARGET_OUT)/app
-include $(BUILD_PREBUILT)
diff --git a/proprietary/packages/3rd-party/ANT/ANTRadioService/Android.mk b/proprietary/packages/3rd-party/ANT/ANTRadioService/Android.mk
deleted file mode 100755
index 4e9d5fcf04949b11590572155a1dc92ac296d044..0000000000000000000000000000000000000000
--- a/proprietary/packages/3rd-party/ANT/ANTRadioService/Android.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-###############################################################################
-# 
-# ANT Stack
-# 
-# Copyright 2010 Dynastream Innovations
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and  
-# limitations under the License.
-# 
-###############################################################################
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE := ANTRadioService
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_PATH := $(TARGET_OUT)/app
-include $(BUILD_PREBUILT)
diff --git a/proprietary/packages/3rd-party/ANT/ANTValidationTester/Android.mk b/proprietary/packages/3rd-party/ANT/ANTValidationTester/Android.mk
deleted file mode 100755
index 5743a044c6fb7d72ddf3a96ca3c4197f596c8436..0000000000000000000000000000000000000000
--- a/proprietary/packages/3rd-party/ANT/ANTValidationTester/Android.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-###############################################################################
-# 
-# ANT Stack
-# 
-# Copyright 2010 Dynastream Innovations
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and  
-# limitations under the License.
-# 
-###############################################################################
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE := ANTValidationTester
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_PATH := $(TARGET_OUT)/app
-include $(BUILD_PREBUILT)
diff --git a/proprietary/packages/3rd-party/Baidu_Location/Android.mk b/proprietary/packages/3rd-party/Baidu_Location/Android.mk
deleted file mode 100755
index 87f3daa4ecc948be9c215584d8029447c011c642..0000000000000000000000000000000000000000
--- a/proprietary/packages/3rd-party/Baidu_Location/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# Module name should match apk name to be installed
-LOCAL_MODULE := Baidu_Location
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/operator/app
-LOCAL_MULTILIB := 32
-include $(BUILD_PREBUILT)
\ No newline at end of file
diff --git a/proprietary/packages/3rd-party/IR_UEI_APP/UEI_RemoteControl/Android.mk b/proprietary/packages/3rd-party/IR_UEI_APP/UEI_RemoteControl/Android.mk
deleted file mode 100755
index 9249be8a031bf54d000fb7b341800598841e5a8a..0000000000000000000000000000000000000000
--- a/proprietary/packages/3rd-party/IR_UEI_APP/UEI_RemoteControl/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# Module name should match apk name to be installed
-LOCAL_MODULE := IR_UeiRemoteControl
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/operator/app
-include $(BUILD_PREBUILT)
diff --git a/proprietary/packages/3rd-party/IR_UEI_APP/UEI_SDK_Ir_Manager/Android.mk b/proprietary/packages/3rd-party/IR_UEI_APP/UEI_SDK_Ir_Manager/Android.mk
deleted file mode 100755
index c9512904bb87c5729bc941e7563a1753dd7a3388..0000000000000000000000000000000000000000
--- a/proprietary/packages/3rd-party/IR_UEI_APP/UEI_SDK_Ir_Manager/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# Module name should match apk name to be installed
-LOCAL_MODULE := IR_UeiSdkIrManager
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/operator/app
-include $(BUILD_PREBUILT)
diff --git a/proprietary/packages/3rd-party/IR_UEI_APP/UEI_SDK_Sample_Test/Android.mk b/proprietary/packages/3rd-party/IR_UEI_APP/UEI_SDK_Sample_Test/Android.mk
deleted file mode 100755
index 0ee41d75548dd2c37e2ddd85187345bc3f700e2c..0000000000000000000000000000000000000000
--- a/proprietary/packages/3rd-party/IR_UEI_APP/UEI_SDK_Sample_Test/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# Module name should match apk name to be installed
-LOCAL_MODULE := IR_UeiSdkSampleTest
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/operator/app
-include $(BUILD_PREBUILT)
diff --git a/proprietary/packages/3rd-party/PGA_50_Free_Games/Android.mk b/proprietary/packages/3rd-party/PGA_50_Free_Games/Android.mk
deleted file mode 100755
index 9cb91d3eeffd74d1093ed5b10270e674f9347eb0..0000000000000000000000000000000000000000
--- a/proprietary/packages/3rd-party/PGA_50_Free_Games/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# Module name should match apk name to be installed
-LOCAL_MODULE := PGA_50_Free_Games
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/operator/app
-include $(BUILD_PREBUILT)
-
diff --git a/proprietary/packages/apicheck/Android.mk b/proprietary/packages/apicheck/Android.mk
deleted file mode 100755
index 199a9088d12bfd5714aa085f2953546a6a72b187..0000000000000000000000000000000000000000
--- a/proprietary/packages/apicheck/Android.mk
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-
-LOCAL_PATH := $(call my-dir)
-
-MTK_PLUGIN_MONITORING_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/mediatek_plugin_api.txt
-
-PLUGIN_API_DIR := packages/apps/Contacts/ext
-PLUGIN_API_DIR += packages/apps/ContactsCommon/ext
-PLUGIN_API_DIR += packages/apps/DeskClock/ext
-PLUGIN_API_DIR += packages/apps/Dialer/ext
-PLUGIN_API_DIR += packages/apps/Email/ext
-PLUGIN_API_DIR += packages/apps/Gallery2/ext
-PLUGIN_API_DIR += packages/apps/InCallUI/ext
-PLUGIN_API_DIR += packages/apps/Launcher3/ext
-PLUGIN_API_DIR += packages/apps/Music/ext
-PLUGIN_API_DIR += packages/apps/Settings/ext
-PLUGIN_API_DIR += packages/apps/SoundRecorder/ext
-
-PLUGIN_API_DIR += packages/providers/DownloadProvider/ext
-
-PLUGIN_API_DIR += packages/services/Mms/ext
-PLUGIN_API_DIR += packages/services/Telecomm/ext
-PLUGIN_API_DIR += packages/services/Telephony/ext
-
-PLUGIN_API_DIR += frameworks/base/packages/SystemUI/ext
-PLUGIN_API_DIR += frameworks/base/packages/Keyguard/ext
-PLUGIN_API_DIR += frameworks/base/packages/SettingsLib/ext
-PLUGIN_API_DIR += frameworks/base/packages/SettingsProvider/ext
-
-PLUGIN_API_DIR += vendor/mediatek/proprietary/packages/apps/Camera/ext
-PLUGIN_API_DIR += vendor/mediatek/proprietary/packages/apps/CMASReceiver/ext
-PLUGIN_API_DIR += vendor/mediatek/proprietary/packages/apps/FileManager/ext
-PLUGIN_API_DIR += vendor/mediatek/proprietary/packages/apps/Browser/ext
-PLUGIN_API_DIR += vendor/mediatek/proprietary/packages/apps/Calendar/ext
-PLUGIN_API_DIR += vendor/mediatek/proprietary/packages/apps/Mms/ext
-PLUGIN_API_DIR += vendor/mediatek/proprietary/packages/apps/QuickSearchBox/ext
-PLUGIN_API_DIR += vendor/mediatek/proprietary/packages/apps/RegionalPhoneManager/ext
-PLUGIN_API_DIR += vendor/mediatek/proprietary/packages/apps/Stk/ext
-
-# Get Plug-in API source file list
-# ============================================================
-# all plug-in API are under eg.*/packages/apps/*/ext/src/.*/I*.java
-MTK_PLUGIN_API_SRC_FILE := $(wildcard $(shell find $(PLUGIN_API_DIR) | grep "/I\w*.java$$" | grep "/ext/src"))
-MTK_PLUGIN_API_SRC_FILE := $(addprefix ../../../../../, $(MTK_PLUGIN_API_SRC_FILE))
-
-# MediaTek internal API table.
-# ============================================================
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(MTK_PLUGIN_API_SRC_FILE)
-
-LOCAL_JAVA_LIBRARIES := mediatek-framework
-LOCAL_JAVA_LIBRARIES += mediatek-common
-LOCAL_JAVA_LIBRARIES += telephony-common
-LOCAL_JAVA_LIBRARIES += voip-common
-LOCAL_JAVA_LIBRARIES += ims-common
-LOCAL_JAVA_LIBRARIES += okhttp
-LOCAL_JAVA_LIBRARIES += guava
-LOCAL_JAVA_LIBRARIES += android-support-v13
-LOCAL_JAVA_LIBRARIES += android-opt-datetimepicker
-
-APK_LIBS := Camera
-APK_LIBS += Contacts
-APK_LIBS += com.android.contacts.common
-APK_LIBS += CMASReceiver
-APK_LIBS += DeskClock
-APK_LIBS += Dialer
-APK_LIBS += DownloadProvider
-APK_LIBS += DownloadProviderUi
-APK_LIBS += Email
-APK_LIBS += FileManager
-APK_LIBS += Gallery2
-APK_LIBS += Launcher3
-APK_LIBS += MmsService
-APK_LIBS += MtkBrowser
-APK_LIBS += MtkCalendar
-APK_LIBS += MtkMms
-APK_LIBS += MtkQuickSearchBox
-APK_LIBS += Music
-APK_LIBS += RegionalPhoneManager
-APK_LIBS += Settings
-APK_LIBS += SettingsProvider
-APK_LIBS += SoundRecorder
-APK_LIBS += Stk1
-APK_LIBS += SystemUI
-APK_LIBS += Telecom
-APK_LIBS += TeleService
-
-JAVA_LIBS += Keyguard
-JAVA_LIBS += SettingsLib
-
-
-# This is set by packages that are linking to other packages that export
-# shared libraries, allowing them to make use of the code in the linked apk.
-LOCAL_CLASSPATH := \
-$(foreach lib, $(APK_LIBS), \
-$(call addifexists, $(lib), APPS))
-
-LOCAL_JAVA_LIBRARIES += \
-$(foreach lib, $(JAVA_LIBS), \
-$(call addifexists, $(lib), JAVA_LIBRARIES))
-
-# Some modules are not in product packages, so only add classes if available.
-define addifexists
-	$(eval tmp := $(call intermediates-dir-for, $(2), $(1),, COMMON)/classes.jar) \
-	$(if $(wildcard $(tmp)),$(tmp),)
-endef
-
-LOCAL_MODULE := mediatek-plugin-api-stubs
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-
-MTK_PLUGIN_API_STUB_LOG_FILE := $(call local-intermediates-dir, COMMON)/mediatek_plugin_api.log
-
-# NOTE: here we add re-direct options in the droiddoc options to avoid error infromation
-# being printed, which is useless.
-LOCAL_DROIDDOC_OPTIONS:= \
-	-api $(MTK_PLUGIN_MONITORING_API_FILE) \
-	-nodocs \
-	-internal \
-	-warning 106 -warning 110 > $(MTK_PLUGIN_API_STUB_LOG_FILE) 2>&1
-
-include $(BUILD_DROIDDOC)
-
-$(MTK_PLUGIN_MONITORING_API_FILE): $(full_target)
-
-# MediaTek internal API document.
-# ============================================================
-LOCAL_MODULE := mediatek-plugin-sdk
-
-MTK_PLUGIN_API_SDK_LOG_FILE := $(call local-intermediates-dir, COMMON)/mediatek_plugin_api.log
-
-# NOTE: here we add re-direct options in the droiddoc options to avoid error infromation
-# being printed, which is useless.
-LOCAL_DROIDDOC_OPTIONS := \
-	-title "MediaTek Plugin API Document" \
-	-offlinemode \
-	-hdf android.whichdoc online \
-	-internal \
-	-warning 106 -warning 110 > $(MTK_PLUGIN_API_SDK_LOG_FILE) 2>&1
-
-include $(BUILD_DROIDDOC)
diff --git a/proprietary/packages/apps/AutoDialer/Android.mk b/proprietary/packages/apps/AutoDialer/Android.mk
deleted file mode 100755
index 81a1abdc6926b9cb8928cf4da571fafc740a0f37..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/AutoDialer/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-ifeq ($(MTK_GPS_SUPPORT),yes)
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_PACKAGE_NAME := AutoDialer
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
diff --git a/proprietary/packages/apps/BLEManager/Android.mk b/proprietary/packages/apps/BLEManager/Android.mk
deleted file mode 100755
index 28d9a68196dbd9a7302384cc1654144ee1e8bd7e..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/BLEManager/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := BLEManager
-
-LOCAL_STATIC_JAVA_LIBRARIES += com.mediatek.ngin3d-static
-
-LOCAL_JNI_SHARED_LIBRARIES := libja3m liba3m
-
-LOCAL_JAVA_LIBRARIES := mediatek-framework
-
-LOCAL_PROGUARD_ENABLED := disabled
-
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
-#include $(call all-makefiles-under,$(LOCAL_PATH))
-
diff --git a/proprietary/packages/apps/BLEManager/extention/Android.mk b/proprietary/packages/apps/BLEManager/extention/Android.mk
deleted file mode 100755
index 1a027163bb85652ced2c2e0145cc421210058457..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/BLEManager/extention/Android.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2012. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-#LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_PACKAGE_NAME :=  BLEExtention
-LOCAL_CERTIFICATE := shared
-
-# link your plug-in interface .jar here 
-LOCAL_JAVA_LIBRARIES += mediatek-framework telephony-common
-LOCAL_JAVA_LIBRARIES += com.mediatek.bluetoothle.ext
-
-
-include $(BUILD_PACKAGE)
diff --git a/proprietary/packages/apps/BSPTelephonyDevTool/Android.mk b/proprietary/packages/apps/BSPTelephonyDevTool/Android.mk
deleted file mode 100755
index 311f4b1d11f89408c12bfa7e70e17f986022d4be..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/BSPTelephonyDevTool/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-ifneq ($(strip $(MTK_DISABLE_BSPTEL_TOOL)), yes)
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_PACKAGE_NAME := BSPTelephonyDevTool
-LOCAL_CERTIFICATE := platform
-LOCAL_JAVA_LIBRARIES += mediatek-framework telephony-common
-
-include $(BUILD_PACKAGE)
-
-# Use the folloing include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
\ No newline at end of file
diff --git a/proprietary/packages/apps/BackupRestore/Android.mk b/proprietary/packages/apps/BackupRestore/Android.mk
deleted file mode 100755
index 51f69d92194f404501626ad8f441c414badfeba5..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/BackupRestore/Android.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-ifeq ($(MTK_DATA_TRANSFER_APP),yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-#LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_SRC_FILES := $(call all-java-files-under,src)
-
-LOCAL_PACKAGE_NAME := DataTransfer
-
-LOCAL_CERTIFICATE := platform
-
-#LOCAL_JAVA_LIBRARIES := mms-common
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-LOCAL_JAVA_LIBRARIES += telephony-common
-
-LOCAL_STATIC_JAVA_LIBRARIES := com.android.vcard \
-                               com.mediatek.vcalendar \
-                               apachecommons
-
-
-#Add for EMMA COVERAGE REPORT
-#EMMA_INSTRUMENT :=true
-LOCAL_EMMA_COVERAGE_FILTER := +com.mediatek.datatransfer.* \
-                              -com.mediatek.datatransfer.modules.* \
-                              -com.mediatek.datatransfer.utils.*
-                             
-#End add for EMMA COVERAGE REPORT
-
-
-include $(BUILD_PACKAGE)
-
-include $(CLEAR_VARS)
-
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := apachecommons:libs/commons-io.jar
-
-include $(BUILD_MULTI_PREBUILT)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
diff --git a/proprietary/packages/apps/BackupRestore/tests/Android.mk b/proprietary/packages/apps/BackupRestore/tests/Android.mk
deleted file mode 100755
index e3d700fc512c874304af4a5b593084e1f47d4f4d..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/BackupRestore/tests/Android.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifeq ($(strip $(MTK_AUTO_TEST)), yes)
-	LOCAL_PATH:= $(call my-dir)
-	include $(CLEAR_VARS)
-    # We only want this apk build for tests.
-	LOCAL_MODULE_TAGS := tests
-    # Include all test java files.
-	LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-	LOCAL_PACKAGE_NAME := DataTransferTests
-
-	LOCAL_JAVA_LIBRARIES := android.test.runner #robotium	#just for auto test case
-	
-	#Add for juint report
-    LOCAL_STATIC_JAVA_LIBRARIES := libjunitreport-for-datatransfer-tests librobotium4
-    #End add
-
-	LOCAL_INSTRUMENTATION_FOR := DataTransfer #just for auto test case
-
-	LOCAL_CERTIFICATE := platform
-
-
-	include $(BUILD_PACKAGE)
-
-	include $(call all-makefiles-under,$(LOCAL_PATH))
-	
-	#Add for junit report
-    include $(CLEAR_VARS)
-    LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := libjunitreport-for-datatransfer-tests:android-junit-report-1.2.6.jar
-    include $(BUILD_MULTI_PREBUILT)
-    #Edd add
-
-#endif
diff --git a/proprietary/packages/apps/BatteryWarning/Android.mk b/proprietary/packages/apps/BatteryWarning/Android.mk
deleted file mode 100755
index 63727244a7187acf8de5512dd5e0028bd74acee2..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/BatteryWarning/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_JAVA_LIBRARIES := bouncycastle 
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := BatteryWarning
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
-# Use the folloing include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/packages/apps/Bluetooth/Android.mk b/proprietary/packages/apps/Bluetooth/Android.mk
deleted file mode 100755
index 942ec117689480fed9a656fbb3c35e46e509bc92..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Bluetooth/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-ifeq (1,0)
-ifeq ($(MTK_BT_SUPPORT),yes)
-
-ifeq ($(MTK_GMO_ROM_OPTIMIZE), no)
-#############################################
-# Build Java Package
-#############################################
-
-$(info [BlueAngel] building BlueAngel package...)
-
-MY_MODULE_PATH := $(call my-dir)
-include $(MY_MODULE_PATH)/build/Android.mk
-
-ifeq ($(MTK_BT_PROFILE_HIDH), yes)
-include $(MY_MODULE_PATH)/tests/Android.mk
-endif
-
-include $(MY_MODULE_PATH)/profiles/fmOverBt/Android_jar.mk
-endif
-#############################################
-# End of file
-#############################################
-endif
-endif
-
diff --git a/proprietary/packages/apps/Bluetooth/build/Android.mk b/proprietary/packages/apps/Bluetooth/build/Android.mk
deleted file mode 100755
index 25beb8e07e542a36ec1cea44554ff9951c89bc5a..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Bluetooth/build/Android.mk
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-#############################################
-# Build Java Package
-#############################################
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-$(info [BlueAngel][PKG] LOCAL_PATH=$(LOCAL_PATH))
-
-### define build path
-MY_BUILD_PATH := ${LOCAL_PATH}
-MY_BUILD_PREFIX := ..
-
-### clean first
-#$(shell rm -rf $(LOCAL_PATH)/AndroidManifest.xml)
-#$(shell rm -rf $(LOCAL_PATH)/res)
-#$(shell mkdir -p $(LOCAL_PATH)/res)
-
-### generate AndroidManifest.xml
-#"mediatek/config/" + $(FULL_PROJECT) + "/ProjectConfig.mk"
-#$(info executing blueangel.py: project[$(FULL_PROJECT)], PYTHONPATH[$(PYTHONPATH)])
-#PY_RES := $(shell python $(LOCAL_PATH)/blueangel.py)
-INTERMEDIATES := $(call intermediates-dir-for,APPS,MtkBt,,COMMON)
-GEN := $(INTERMEDIATES)/AndroidManifest.xml
-$(GEN): PRIVATE_CUSTOM_TOOL := python $(LOCAL_PATH)/blueangel.py $(INTERMEDIATES)
-$(GEN): $(LOCAL_PATH)/blueangel.py $(LOCAL_PATH)/AndroidManifest.tpl $(filter-out $(GEN),$(shell find $(MY_MODULE_PATH) -name AndroidManifest.xml))
-	$(transform-generated-source)
-
-LOCAL_EMMA_COVERAGE_FILTER := @$(LOCAL_PATH)/emma_filter.txt,--$(LOCAL_PATH)/emma_filter_method.txt
-
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-LOCAL_JAVA_LIBRARIES += telephony-common
-
-src_list := 
-### include modules' mk file
-ifeq ($(MTK_BT_SUPPORT), yes)
-include $(MY_MODULE_PATH)/common/bt40/Android.mk
-src_list += common/bt40
-endif
-$(info 11)
-include $(MY_MODULE_PATH)/profiles/dtt/Android.mk
-include $(MY_MODULE_PATH)/profiles/prxm/Android.mk
-include $(MY_MODULE_PATH)/profiles/prxr/Android.mk
-include $(MY_MODULE_PATH)/profiles/simap/Android.mk
-include $(MY_MODULE_PATH)/profiles/ftp/Android.mk
-include $(MY_MODULE_PATH)/profiles/bpp/Android.mk
-include $(MY_MODULE_PATH)/profiles/bip/Android.mk
-include $(MY_MODULE_PATH)/profiles/dun/Android.mk
-#include $(MY_MODULE_PATH)/profiles/map/Android.mk
-src_list += profiles/prxm profiles/prxr profiles/simap profiles/ftp profiles/bpp profiles/bip profiles/dun
-
-##########FM over BT Service#################################
-
-include $(MY_MODULE_PATH)/profiles/fmOverBt/Android.mk
-src_list += profiles/fmOverBt
-
-#############################################################
-
-### config package and build
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := MtkBt
-LOCAL_32_BIT_ONLY=true
-LOCAL_CERTIFICATE := platform
-#LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags
-LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_FULL_MANIFEST_FILE := $(INTERMEDIATES)/AndroidManifest.xml
-
-# $(1): MY_MODULE_PATH
-# $(2): src_list 
-# $(3): INTERMEDIATES folder 
-define mtk-bluetooth-copy-rule
-$(eval dst_rule :=)\
-$(eval dst_list :=)\
-$(eval res_item :=)\
-$(eval src_item :=$(2))\
-$(foreach x,$(src_item),\
-	$(eval src_list := $(notdir $(wildcard $(strip $(1))/$(x)/res/*)))\
-	$(if $(src_list),\
-		$(foreach y,$(src_list),\
-			$(foreach z,$(notdir $(wildcard $(strip $(1))/$(x)/res/$(y)/*)),\
-				$(eval src_file := $(strip $(1))/$(x)/res/$(y)/$(z))\
-				$(eval dst_file := $(strip $(3))/res/$(y)/$(z))\
-				$(if $(filter $(dst_file),$(dst_list)),,\
-                                        $(eval dst_temp := $(shell dirname $(dst_file)))\
-                                        $(shell mkdir -p $(dst_temp))\
-                                        $(shell cp -arfp $(src_file) $(dst_file))\
-					$(eval dst_rule += $(src_file):$(dst_file))\
-					$(eval dst_list += $(dst_file))\
-				)\
-			)\
-			$(eval res_item += $(wildcard $(strip $(3))/res/$(y)/$(x)_*))\
-		)\
-	)\
-)\
-$(eval res_item := $(strip $(filter-out $(dst_list),$(res_item))))\
-$(if $(res_item),\
-	$(info [DELETE] $(res_item))\
-	$(shell rm -f $(res_item))\
-	$(eval .PHONY: $(dst_list))\
-)
-endef
-
-$(call mtk-bluetooth-copy-rule,$(MY_MODULE_PATH),$(src_list),$(INTERMEDIATES))
-
-#M: KK_AOSP_TURNKEY @{
-LOCAL_RESOURCE_DIR := $(INTERMEDIATES)/res
-#@}
-include $(BUILD_PACKAGE)
-
-#############################################
-# End of file
-#############################################
diff --git a/proprietary/packages/apps/Bluetooth/common/bt40/Android.mk b/proprietary/packages/apps/Bluetooth/common/bt40/Android.mk
deleted file mode 100755
index 995cb679c0e785ac64ec5120d7c61f8981179bd4..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Bluetooth/common/bt40/Android.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-#############################################
-# Build Java Package
-#############################################
-
-$(info [BlueAngel][BT40]: $(call my-dir))
-
-# copy resource to build folder
-#$(shell cp -ar $(call my-dir)/res/* $(MY_BUILD_PATH)/res)
-
-#ifeq ($(ANDROID_BT_JB_MR1), no)
-# include java source and aidl files
-LOCAL_SRC_FILES += \
-	$(call all-java-files-under, ${MY_BUILD_PREFIX}/common/bt40/src)
-
-# include test code
-ifeq ($(LOCAL_MODULE_TAGS), eng)
-LOCAL_SRC_FILES += \
-	$(call all-java-files-under, ${MY_BUILD_PREFIX}/common/bt40/dev)
-endif
-#endif
-#############################################
-# End of file
-#############################################
diff --git a/proprietary/packages/apps/Bluetooth/profiles/avrcp/Android.mk b/proprietary/packages/apps/Bluetooth/profiles/avrcp/Android.mk
deleted file mode 100755
index f29655cf4a35a9d8415eca5a555595a179c487d4..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Bluetooth/profiles/avrcp/Android.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-#############################################
-# Build Java Package
-#############################################
-
-$(info [BlueAngel][OPP]: $(call my-dir))
-
-# copy resource to res
-#$(shell cp -ar $(call my-dir)/res/* $(MY_BUILD_PATH)/res)
-
-# add aidl include path
-LOCAL_AIDL_INCLUDES += $(call my-dir)/src
-
-# include java source and aidl files
-LOCAL_SRC_FILES += \
-	${MY_BUILD_PREFIX}/profiles/avrcp/src/com/mediatek/bluetooth/avrcp/IBTAvrcpMusicCallback.aidl \
-	${MY_BUILD_PREFIX}/profiles/avrcp/src/com/mediatek/bluetooth/avrcp/IBTAvrcpMusic.aidl \
-	${MY_BUILD_PREFIX}/profiles/avrcp/src/com/mediatek/bluetooth/avrcp/IBTAvrcpService.aidl \
-	${MY_BUILD_PREFIX}/profiles/avrcp/src/com/android/music/IMediaPlaybackService.aidl \
-	$(call all-java-files-under, ${MY_BUILD_PREFIX}/profiles/avrcp/src) \
-
-#############################################
-# End of file
-#############################################
diff --git a/proprietary/packages/apps/Bluetooth/profiles/bip/Android.mk b/proprietary/packages/apps/Bluetooth/profiles/bip/Android.mk
deleted file mode 100755
index f745567f86cf94a5eed714794a41b59e0416758f..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Bluetooth/profiles/bip/Android.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-#############################################
-# Build Java Package
-#############################################
-
-$(info [BlueAngel][BIP]: $(call my-dir))
-
-# copy resource to res
-#$(shell cp -arfp $(call my-dir)/res/* $(MY_BUILD_PATH)/res)
-
-# add aidl include path
-LOCAL_AIDL_INCLUDES += $(call my-dir)/src
-
-# include java source and aidl files
-LOCAL_SRC_FILES += \
-	$(call all-java-files-under, ${MY_BUILD_PREFIX}/profiles/bip/src) 
-
-#############################################
-# End of file
-#############################################
diff --git a/proprietary/packages/apps/Bluetooth/profiles/bpp/Android.mk b/proprietary/packages/apps/Bluetooth/profiles/bpp/Android.mk
deleted file mode 100755
index 2db60dcdf27b8cd97fd390baab3100e91c8c0c19..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Bluetooth/profiles/bpp/Android.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-#############################################
-# Build Java Package
-#############################################
-
-$(info [BlueAngel][BPP]: $(call my-dir))
-
-# copy resource to res
-#$(shell cp -arfp $(call my-dir)/res/* $(MY_BUILD_PATH)/res)
-
-# add aidl include path
-LOCAL_AIDL_INCLUDES += $(call my-dir)/src
-
-# include java source and aidl files
-LOCAL_SRC_FILES += \
-	$(call all-java-files-under, ${MY_BUILD_PREFIX}/profiles/bpp/src) 
-
-#############################################
-# End of file
-#############################################
diff --git a/proprietary/packages/apps/Bluetooth/profiles/dtt/Android.mk b/proprietary/packages/apps/Bluetooth/profiles/dtt/Android.mk
deleted file mode 100755
index 13ea79c14be450086ea5b1d400be64f801952f72..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Bluetooth/profiles/dtt/Android.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-#############################################
-# Build Java Package
-#############################################
-
-$(info [BlueAngel][DTT]: $(call my-dir))
-
-# copy resource to build folder
-#$(shell cp -arfp $(call my-dir)/res/* $(MY_BUILD_PATH)/res)
-
-# include java source and aidl files
-LOCAL_SRC_FILES += \
-	$(call all-java-files-under, ${MY_BUILD_PREFIX}/profiles/dtt/src)
-
-LOCAL_JNI_SHARED_LIBRARIES += libbtdtt_jni
-
-#############################################
-# End of file
-#############################################
diff --git a/proprietary/packages/apps/Bluetooth/profiles/dun/Android.mk b/proprietary/packages/apps/Bluetooth/profiles/dun/Android.mk
deleted file mode 100755
index 64d6775ae48781faf066003454b8b244b2f86644..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Bluetooth/profiles/dun/Android.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-#############################################
-# Build Java Package
-#############################################
-
-$(info [BlueAngel][DUN]: $(call my-dir))
-
-# copy resource to res
-#$(shell cp -arfp $(call my-dir)/res/* $(MY_BUILD_PATH)/res)
-
-# include java source and aidl files
-LOCAL_SRC_FILES += \
-	$(call all-java-files-under, ${MY_BUILD_PREFIX}/profiles/dun/src) 
-
-#############################################
-# End of file
-#############################################
diff --git a/proprietary/packages/apps/Bluetooth/profiles/fmOverBt/Android.mk b/proprietary/packages/apps/Bluetooth/profiles/fmOverBt/Android.mk
deleted file mode 100755
index fd586e8bdde0dbd97b3cddb2ab390f84118ebe2b..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Bluetooth/profiles/fmOverBt/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-#############################################
-# Build Java Package
-#############################################
-
-$(info [BlueAngel][FmOverBt]: $(call my-dir))
-$(info [BlueAngel][FmOverBt1]: ${MY_BUILD_PREFIX})
-# add aidl include path
-LOCAL_AIDL_INCLUDES += $(call my-dir)/src
-
-# include java source and aidl files
-LOCAL_SRC_FILES += \
-   ${MY_BUILD_PREFIX}/profiles/fmOverBt/src/com/mediatek/bluetooth/fmOverBt/IFmOverBtService.aidl \
-   $(call all-java-files-under,${MY_BUILD_PREFIX}/profiles/fmOverBt/src)
-
-#############################################
-# End of file
-#############################################
diff --git a/proprietary/packages/apps/Bluetooth/profiles/ftp/Android.mk b/proprietary/packages/apps/Bluetooth/profiles/ftp/Android.mk
deleted file mode 100755
index 77ebd93902ec05adf63101a56806242d0ccdd94e..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Bluetooth/profiles/ftp/Android.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-#############################################
-# Build Java Package
-#############################################
-
-$(info [BlueAngel][FTP]: $(call my-dir))
-
-# copy resource to res
-#$(shell cp -arfp $(call my-dir)/res/* $(MY_BUILD_PATH)/res)
-
-# add aidl include path
-LOCAL_AIDL_INCLUDES += $(call my-dir)/src
-
-# include java source and aidl files
-LOCAL_SRC_FILES += \
-	$(call all-java-files-under, ${MY_BUILD_PREFIX}/profiles/ftp/src) \
-	${MY_BUILD_PREFIX}/profiles/ftp/src/com/mediatek/bluetooth/ftp/IBluetoothFtpClient.aidl \
-	${MY_BUILD_PREFIX}/profiles/ftp/src/com/mediatek/bluetooth/ftp/IBluetoothFtpClientCallback.aidl \
-	${MY_BUILD_PREFIX}/profiles/ftp/src/com/mediatek/bluetooth/ftp/IBluetoothFtpServerNotify.aidl
-
-#############################################
-# End of file
-#############################################
diff --git a/proprietary/packages/apps/Bluetooth/profiles/hid/Android.mk b/proprietary/packages/apps/Bluetooth/profiles/hid/Android.mk
deleted file mode 100755
index d29298827cce04e6fe78d0fa09150290252801f3..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Bluetooth/profiles/hid/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-#############################################
-# Build Java Package
-#############################################
-
-$(info [BlueAngel][OPP]: $(call my-dir))
-
-# copy resource to res
-#$(shell cp -arfp $(call my-dir)/res/* $(MY_BUILD_PATH)/res)
-
-# include java source and aidl files
-LOCAL_SRC_FILES += \
-	$(call all-java-files-under, ${MY_BUILD_PREFIX}/profiles/hid/src) \
-	${MY_BUILD_PREFIX}/profiles/hid/src/com/mediatek/bluetooth/hid/IBluetoothHidServerNotify.aidl 
-
-#############################################
-# End of file
-#############################################
diff --git a/proprietary/packages/apps/Bluetooth/profiles/map/Android.mk b/proprietary/packages/apps/Bluetooth/profiles/map/Android.mk
deleted file mode 100755
index 251c912454db2eb590a3a65716d8d642257957f6..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Bluetooth/profiles/map/Android.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-#############################################
-# Build Java Package
-#############################################
-
-$(info [BlueAngel][MAP]: $(call my-dir))
-
-# copy resource to res
-#$(shell cp -arfp $(call my-dir)/res/* $(MY_BUILD_PATH)/res)
-
-# add aidl include path
-LOCAL_AIDL_INCLUDES += $(call my-dir)/src
-
-# include java source and aidl files
-LOCAL_SRC_FILES += \
-	$(call all-java-files-under, ${MY_BUILD_PREFIX}/profiles/map/src) \
-	${MY_BUILD_PREFIX}/profiles/map/src/com/mediatek/bluetooth/map/IBluetoothMapSettingCallback.aidl \
-	${MY_BUILD_PREFIX}/profiles/map/src/com/mediatek/bluetooth/map/IBluetoothMapSetting.aidl
-
-LOCAL_JAVA_LIBRARIES += mediatek-framework telephony-common mediatek-telephony-common
-#############################################
-# End of file
-#############################################
diff --git a/proprietary/packages/apps/Bluetooth/profiles/opp/Android.mk b/proprietary/packages/apps/Bluetooth/profiles/opp/Android.mk
deleted file mode 100755
index 9d3604f4cf1674980a94b2735b6904e330881b50..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Bluetooth/profiles/opp/Android.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-#############################################
-# Build Java Package
-#############################################
-
-$(info [BlueAngel][OPP]: $(call my-dir))
-
-# copy resource to res
-#$(shell cp -arfp $(call my-dir)/res/* $(MY_BUILD_PATH)/res)
-
-# include java source and aidl files
-LOCAL_SRC_FILES += \
-	$(call all-java-files-under, ${MY_BUILD_PREFIX}/profiles/opp/src) \
-
-#############################################
-# End of file
-#############################################
diff --git a/proprietary/packages/apps/Bluetooth/profiles/pan/Android.mk b/proprietary/packages/apps/Bluetooth/profiles/pan/Android.mk
deleted file mode 100755
index 15934c828723913031a76b534898ad4e57b5fcbb..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Bluetooth/profiles/pan/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-#############################################
-# Build Java Package
-#############################################
-
-$(info [BlueAngel][PAN]: $(call my-dir))
-
-# copy resource to res
-#$(shell cp -arfp $(call my-dir)/res/* $(MY_BUILD_PATH)/res)
-
-# include java source and aidl files
-LOCAL_SRC_FILES += \
-	$(call all-java-files-under, ${MY_BUILD_PREFIX}/profiles/pan/src) \
-	${MY_BUILD_PREFIX}/profiles/pan/src/com/mediatek/bluetooth/pan/IBluetoothPanAction.aidl 
-
-#############################################
-# End of file
-#############################################
diff --git a/proprietary/packages/apps/Bluetooth/profiles/pbap/Android.mk b/proprietary/packages/apps/Bluetooth/profiles/pbap/Android.mk
deleted file mode 100755
index 04dfa85ad1d0baade73bf43f7873b121cd784dc5..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Bluetooth/profiles/pbap/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-#############################################
-# Build Java Package
-#############################################
-
-$(info [BlueAngel][PBAP]: $(call my-dir))
-
-# copy resource to res
-#$(shell cp -arfp $(call my-dir)/res/* $(MY_BUILD_PATH)/res)
-
-# include java source and aidl files
-LOCAL_SRC_FILES += \
-	$(call all-java-files-under, ${MY_BUILD_PREFIX}/profiles/pbap/src) \
-
-LOCAL_JAVA_LIBRARIES += javax.obex
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-LOCAL_JAVA_LIBRARIES += telephony-common
-
-LOCAL_STATIC_JAVA_LIBRARIES += com.android.vcard
-#############################################
-# End of file
-#############################################
diff --git a/proprietary/packages/apps/Bluetooth/profiles/prxm/Android.mk b/proprietary/packages/apps/Bluetooth/profiles/prxm/Android.mk
deleted file mode 100755
index ce928f01c0677b1ccb336d2a672945a28069a3f8..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Bluetooth/profiles/prxm/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-#############################################
-# Build Java Package
-#############################################
-
-$(info [BlueAngel][PRXM]: $(call my-dir))
-
-# copy resource to build folder
-#$(shell cp -arfp $(call my-dir)/res/* $(MY_BUILD_PATH)/res)
-
-# add aidl include path
-LOCAL_AIDL_INCLUDES += $(call my-dir)/src
-
-# include java source and aidl files
-LOCAL_SRC_FILES += \
-	$(call all-java-files-under, ${MY_BUILD_PREFIX}/profiles/prxm/src)
-
-#	${MY_BUILD_PREFIX}/profiles/prxm/src/com/mediatek/bluetooth/service/IBluetoothPrxm.aidl
-
-#############################################
-# End of file
-#############################################
diff --git a/proprietary/packages/apps/Bluetooth/profiles/prxr/Android.mk b/proprietary/packages/apps/Bluetooth/profiles/prxr/Android.mk
deleted file mode 100755
index e59ebbbb856f468168cd6111d1dab7c95ba7fe1d..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Bluetooth/profiles/prxr/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-#############################################
-# Build Java Package
-#############################################
-
-$(info [BlueAngel][PRXR]: $(call my-dir))
-
-# copy resource to build folder
-#$(shell cp -arfp $(call my-dir)/res/* $(MY_BUILD_PATH)/res)
-
-# add aidl include path
-LOCAL_AIDL_INCLUDES += $(call my-dir)/src
-
-# include java source and aidl files
-LOCAL_SRC_FILES += \
-	$(call all-java-files-under, ${MY_BUILD_PREFIX}/profiles/prxr/src)
-	
-#	${MY_BUILD_PREFIX}/profiles/prxr/src/com/mediatek/bluetooth/service/IBluetoothPrxr.aidl
-
-#############################################
-# End of file
-#############################################
diff --git a/proprietary/packages/apps/Bluetooth/profiles/simap/Android.mk b/proprietary/packages/apps/Bluetooth/profiles/simap/Android.mk
deleted file mode 100755
index b158805416dddcd469f167cc75b1d6bb2bd69954..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Bluetooth/profiles/simap/Android.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-#############################################
-# Build Java Package
-#############################################
-
-$(info [BlueAngel][SIMAP]: $(call my-dir))
-
-# copy resource to res
-#$(shell cp -arfp $(call my-dir)/res/* $(MY_BUILD_PATH)/res)
-
-# include java source and aidl files
-LOCAL_SRC_FILES += \
-	$(call all-java-files-under, ${MY_BUILD_PREFIX}/profiles/simap/src) \
-
-#############################################
-# End of file
-#############################################
diff --git a/proprietary/packages/apps/Bluetooth/profiles/timec/Android.mk b/proprietary/packages/apps/Bluetooth/profiles/timec/Android.mk
deleted file mode 100755
index de5b0e0b2e40bf19d86befb454a05c6ffbc7f2a9..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Bluetooth/profiles/timec/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-#############################################
-# Build Java Package
-#############################################
-
-$(info [BlueAngel][TIMEC]: $(call my-dir))
-
-# copy resource to build folder
-#$(shell cp -arfp $(call my-dir)/res/* $(MY_BUILD_PATH)/res)
-
-# include java source and aidl files
-LOCAL_SRC_FILES += \
-	$(call all-java-files-under, ${MY_BUILD_PREFIX}/profiles/timec/src) \
-	${MY_BUILD_PREFIX}/profiles/timec/src/com/mediatek/bluetooth/service/IBluetoothTimec.aidl \
-
-#############################################
-# End of file
-#############################################
diff --git a/proprietary/packages/apps/Bluetooth/profiles/times/Android.mk b/proprietary/packages/apps/Bluetooth/profiles/times/Android.mk
deleted file mode 100755
index 6d7de96e6a4504122596e41d8bd89dbc8527a41b..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Bluetooth/profiles/times/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-#############################################
-# Build Java Package
-#############################################
-
-$(info [BlueAngel][TIMES]: $(call my-dir))
-
-# copy resource to build folder
-#$(shell cp -arfp $(call my-dir)/res/* $(MY_BUILD_PATH)/res)
-
-# include java source and aidl files
-LOCAL_SRC_FILES += \
-	$(call all-java-files-under, ${MY_BUILD_PREFIX}/profiles/times/src) \
-	${MY_BUILD_PREFIX}/profiles/times/src/com/mediatek/bluetooth/service/IBluetoothTimes.aidl \
-
-#############################################
-# End of file
-#############################################
diff --git a/proprietary/packages/apps/BluetoothLe/Android.mk b/proprietary/packages/apps/BluetoothLe/Android.mk
deleted file mode 100755
index 92f6079d5f390a0920a5d64aa752fe7efa27d868..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/BluetoothLe/Android.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := \
-        $(call all-java-files-under, src)
-
-#Path to aspect root folder
-ifeq ($(strip $(MTK_BT_TEST)),yes)
-ifeq ($(strip $(ASPECTS_ORIENTED_INSTRUMENT)),true)
-
-LOCAL_ASPECTS_DIR := aspect/BluetoothLe/src
-
-endif
-endif
-
-
-LOCAL_PACKAGE_NAME := BluetoothLe
-
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-LOCAL_JAVA_LIBRARIES += telephony-common
-#LOCAL_JAVA_LIBRARIES += mediatek-telephony-common
-
-LOCAL_STATIC_JAVA_LIBRARIES := joda-time-2.3
-LOCAL_STATIC_JAVA_LIBRARIES += com.mediatek.bluetoothle.ext
-
-#AspectJ runtime
-ifeq ($(strip $(MTK_BT_TEST)),yes)
-ifeq ($(strip $(ASPECTS_ORIENTED_INSTRUMENT)),true)
-LOCAL_STATIC_JAVA_LIBRARIES += aspectj-runtime
-endif
-endif
-
-# LOCAL_REQUIRED_MODULES := Add the required module
-
-ifeq ($(strip $(MTK_BT_TEST)), yes)
-LOCAL_PROGUARD_ENABLED := disabled
-else
-# Add for Proguard
-LOCAL_PROGUARD_ENABLED := custom
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-# Add for Proguard
-endif
-
-# Added for JPE begin
-LOCAL_JAVASSIST_ENABLED := true
-LOCAL_JAVASSIST_OPTIONS := $(LOCAL_PATH)/jpe.config
-# Added For JPE end
-
-include $(BUILD_PACKAGE)
-
-##################################################
-include $(CLEAR_VARS)
-
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := joda-time-2.3:lib/joda-time-2.3.jar
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += aspectj-runtime:../../../../../../prebuilts/tools/common/aspectj/aspectjrt.jar
-
-include $(BUILD_MULTI_PREBUILT)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/packages/apps/BluetoothLe/customerext/Android.mk b/proprietary/packages/apps/BluetoothLe/customerext/Android.mk
deleted file mode 100755
index 9d792d8ebbd6ce5f9cc7f6dfafc7e81c26a32286..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/BluetoothLe/customerext/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE := com.mediatek.bluetoothle.ext
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_LIBRARIES := mediatek-framework
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
\ No newline at end of file
diff --git a/proprietary/packages/apps/BluetoothLe/tests/Android.mk b/proprietary/packages/apps/BluetoothLe/tests/Android.mk
deleted file mode 100755
index fa5d492256f73d1d7fc2b25d147318209a331032..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/BluetoothLe/tests/Android.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-ifeq ($(strip $(MTK_BT_TEST)),yes)
-ifeq ($(strip $(ASPECTS_ORIENTED_INSTRUMENT)),true)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := optional
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-
-LOCAL_STATIC_JAVA_LIBRARIES := mockito-lib dexmaker-lib dexmaker-mockito
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := BluetoothLeTests
-
-LOCAL_INSTRUMENTATION_FOR := BluetoothLe
-
-LOCAL_PROGUARD_ENABLED := disabled
-
-include $(BUILD_PACKAGE)
-
-##################################################
-include $(CLEAR_VARS)
-
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := mockito-lib:libs/mockito-all-1.9.5.jar 
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += dexmaker-lib:libs/dexmaker-1.0.jar
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += dexmaker-mockito:libs/dexmaker-mockito-1.0.jar
-
-include $(BUILD_MULTI_PREBUILT)
-
-endif
-endif
diff --git a/proprietary/packages/apps/Browser/Android.mk b/proprietary/packages/apps/Browser/Android.mk
deleted file mode 100755
index 205ef5bf23edb8e7dc5972914120a6e78e9c93b6..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Browser/Android.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-BUILD_BROWSER := yes
-
-ifdef BUILD_GMS
-ifeq ($(strip $(BUILD_GMS)), yes)
-BUILD_BROWSER := no
-endif
-endif
-
-ifdef MTK_A1_FEATURE
-ifeq ($(strip $(MTK_A1_FEATURE)),yes)
-BUILD_BROWSER := no
-endif
-endif
-
-ifeq ($(strip $(BUILD_BROWSER)), yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_CERTIFICATE := platform
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-        android-common \
-        guava \
-        android-support-v13 \
-        android-support-v4 \
-        com.mediatek.browser.ext
-
-LOCAL_JAVA_LIBRARIES += mediatek-framework telephony-common
-LOCAL_SRC_FILES := \
-        $(call all-java-files-under, src) \
-        src/com/android/browser/EventLogTags.logtags
-
-LOCAL_OVERRIDES_PACKAGES := Browser
-LOCAL_PACKAGE_NAME := MtkBrowser
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-#EMMA_INSTRUMENT := true
-LOCAL_EMMA_COVERAGE_FILTER := @$(LOCAL_PATH)/browser-emma-filter.txt 
-
-# We need the sound recorder for the Media Capture API.
-LOCAL_REQUIRED_MODULES := SoundRecorder
-
-include $(BUILD_PACKAGE)
-
-# additionally, build tests in sub-folders in a separate .apk
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
diff --git a/proprietary/packages/apps/Browser/ext/Android.mk b/proprietary/packages/apps/Browser/ext/Android.mk
deleted file mode 100755
index aa2f3600a1d9aef16ff6e66869253ed8e5858567..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Browser/ext/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := com.mediatek.browser.ext
-LOCAL_JAVA_LIBRARIES += mediatek-framework telephony-common
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/proprietary/packages/apps/CMASReceiver/Android.mk b/proprietary/packages/apps/CMASReceiver/Android.mk
deleted file mode 100755
index 0bbf1b773b73e9570fee9d773b9c4504234aec7a..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/CMASReceiver/Android.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2011 The Android Open Source Project
-
-LOCAL_PATH:= $(call my-dir)
-
-# Build CMASCommon.jar
-# ====  the library  =========================================
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := \
-   src/com/mediatek/cellbroadcastreceiver/Comparer.java \
-   src/com/mediatek/cellbroadcastreceiver/CellBroadcastContentProvider.java \
-   src/com/mediatek/cellbroadcastreceiver/CellBroadcastDatabaseHelper.java
-
-#LOCAL_NO_STANDARD_LIBRARIES := true
-
-LOCAL_JAVA_LIBRARIES := telephony-common
-LOCAL_JAVA_LIBRARIES += mediatek-common
-
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_MODULE := CMASCommon
-
-#include $(BUILD_JAVA_LIBRARY)
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-# Build CMASReceiver.apk
-# ====  the library  =========================================
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-
-LOCAL_PACKAGE_NAME := CMASReceiver
-LOCAL_CERTIFICATE := platform
-LOCAL_JAVA_LIBRARIES := telephony-common
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-LOCAL_JAVA_LIBRARIES += mediatek-telephony-common
-
-LOCAL_STATIC_JAVA_LIBRARIES += CMASCommon
-LOCAL_STATIC_JAVA_LIBRARIES := com.mediatek.cmas.ext
-
-include $(LOCAL_PATH)/config.mk
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-include $(BUILD_PACKAGE)
-
-# This finds and builds the test apk as well, so a single make does both.
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/packages/apps/CMASReceiver/ext/Android.mk b/proprietary/packages/apps/CMASReceiver/ext/Android.mk
deleted file mode 100755
index 61be0a6367b02a4adcad0d6b61af17e47ca20dcc..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/CMASReceiver/ext/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := com.mediatek.cmas.ext
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_LIBRARIES := telephony-common
-LOCAL_STATIC_JAVA_LIBRARIES += CMASCommon
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
diff --git a/proprietary/packages/apps/Calendar/Android.mk b/proprietary/packages/apps/Calendar/Android.mk
deleted file mode 100755
index 46b6d9e93084c0385ed77588e5c1f0b54aaa7b53..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Calendar/Android.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# Include res dir from chips
-#replace with mtk-ex
-#chips_dir := ../../../frameworks/opt/chips/res
-chips_dir := ../../../../../../frameworks/ex/chips/res
-color_picker_dir := ../../../../../../frameworks/opt/colorpicker/res
-datetimepicker_dir := ../../../../../../frameworks/opt/datetimepicker/res
-timezonepicker_dir := ../../../../../../frameworks/opt/timezonepicker/res
-res_dirs := $(chips_dir) $(color_picker_dir) $(datetimepicker_dir) $(timezonepicker_dir) res
-src_dirs := src
-
-LOCAL_EMMA_COVERAGE_FILTER := +com.android.calendar.*
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under,$(src_dirs))
-
-# bundled
-#LOCAL_STATIC_JAVA_LIBRARIES += \
-#        android-common \
-#        libchips \
-#        calendar-common
-
-# unbundled
-#replace with mtk-ex
-LOCAL_STATIC_JAVA_LIBRARIES := \
-        android-common \
-        colorpicker \
-        android-opt-datetimepicker \
-        android-opt-timezonepicker \
-        android-support-v4 \
-        calendar-common \
-        com.mediatek.calendar.ext \
-        com.mediatek.vcalendar \
-        android-common-chips
-
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-
-LOCAL_JACK_ENABLED := disabled
-
-#Don't use LOCAL_SDK_VERSION.Because cann't call hide APi
-#in framework when has it.
-#LOCAL_SDK_VERSION := current
-
-LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
-
-LOCAL_PACKAGE_NAME := MtkCalendar
-LOCAL_OVERRIDES_PACKAGES := Calendar
-
-#M:change certificate for multi-user permission
-LOCAL_CERTIFICATE := platform
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags \
-                             ../../../../../../frameworks/opt/datetimepicker/proguard.flags
-
-LOCAL_AAPT_FLAGS := --auto-add-overlay
-#replace with mtk-ex
-#LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips
-LOCAL_AAPT_FLAGS += --extra-packages com.android.mtkex.chips
-LOCAL_AAPT_FLAGS += --extra-packages com.android.colorpicker
-LOCAL_AAPT_FLAGS += --extra-packages com.android.datetimepicker
-LOCAL_AAPT_FLAGS += --extra-packages com.android.timezonepicker
-
-include $(BUILD_PACKAGE)
-
-# Use the following include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/packages/apps/Calendar/ext/Android.mk b/proprietary/packages/apps/Calendar/ext/Android.mk
deleted file mode 100755
index a9ad5a1a82d6e6d97dc2273e2c1c6987894f771b..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Calendar/ext/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under,src)
-
-LOCAL_SDK_VERSION := current
-
-LOCAL_MODULE := com.mediatek.calendar.ext
-
-LOCAL_STATIC_JAVA_LIBRARIES := android-opt-datetimepicker
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/proprietary/packages/apps/CalendarImporter/Android.mk b/proprietary/packages/apps/CalendarImporter/Android.mk
deleted file mode 100755
index 9fbf39e7f8ecdb66ae4ce64f448e7ddb3be19a80..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/CalendarImporter/Android.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under,src)
-
-LOCAL_STATIC_JAVA_LIBRARIES := android-common \
-        calendar-common \
-        com.mediatek.vcalendar
-
-LOCAL_PACKAGE_NAME := CalendarImporter
-
-#PROGUARD start#
-#LOCAL_PROGUARD_ENABLED := custom
-#LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-#PROGUARD end#
-LOCAL_EMMA_COVERAGE_FILTER := +com.mediatek.calendarimporter.*, +com.mediatek.vcalendar.*
-
-include $(BUILD_PACKAGE)
-
-# Use the following include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/packages/apps/CalendarImporter/tests/Android.mk b/proprietary/packages/apps/CalendarImporter/tests/Android.mk
deleted file mode 100755
index 27211a95704f820efe15df6442194ad627a28e81..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/CalendarImporter/tests/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-#LOCAL_STATIC_JAVA_LIBRARIES += android-common
-
-LOCAL_PACKAGE_NAME := CalendarImporterTests
-
-LOCAL_JAVA_LIBRARIES := ext android.test.runner
-
-LOCAL_INSTRUMENTATION_FOR := CalendarImporter
-
-include $(BUILD_PACKAGE)
-
diff --git a/proprietary/packages/apps/Camera/Android.mk b/proprietary/packages/apps/Camera/Android.mk
deleted file mode 100755
index f6c7fb6ca56055210bfd3a3f5382888acfe779e9..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Camera/Android.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_CERTIFICATE := platform
-
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
-LOCAL_STATIC_JAVA_LIBRARIES += com.mediatek.camera.ext
-LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
-LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v8-renderscript
-LOCAL_STATIC_JAVA_LIBRARIES += android-ex-camera2
-
-
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-LOCAL_JAVA_LIBRARIES += telephony-common
-
-LOCAL_JAVA_LIBRARIES += com.mediatek.crossmount.adapter
-LOCAL_RENDERSCRIPT_TARGET_API := 18
-LOCAL_RENDERSCRIPT_COMPATIBILITY := 18
-LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript
-
-# Keep track of previously compiled RS files too (from bundled GalleryGoogle).
-prev_compiled_rs_files := $(call all-renderscript-files-under, src)
-
-# We already have these files from GalleryGoogle, so don't install them.
-LOCAL_RENDERSCRIPT_SKIP_INSTALL := $(prev_compiled_rs_files)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) $(prev_compiled_rs_files)
-#make plugin
-LOCAL_SRC_FILES += $(call all-java-files-under, ext/src)
-LOCAL_SRC_FILES += ../Camera/src/com/mediatek/camera/addition/remotecamera/service/ICameraClientCallback.aidl
-LOCAL_SRC_FILES += ../Camera/src/com/mediatek/camera/addition/remotecamera/service/IMtkCameraService.aidl
-LOCAL_AIDL_INCLUDES += $(LOCAL_PATH)/src
-
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res $(LOCAL_PATH)/res_ext $(LOCAL_PATH)/res_v2
-
-#LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_AAPT_FLAGS := --auto-add-overlay --extra-packages com.android.camera
-
-ifeq ($(MTK_CAM_NATIVE_PIP_SUPPORT), yes)
-    LOCAL_JNI_SHARED_LIBRARIES := libjni_jpegdecoder
-endif
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-LOCAL_PACKAGE_NAME := Camera
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under, jni)
-include $(call all-makefiles-under, packages/apps/Camera/jni_jpegdecoder)
-
-ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
-
-# Use the following include to make gallery test apk
-include $(call all-makefiles-under, $(LOCAL_PATH))
-
-endif
diff --git a/proprietary/packages/apps/Camera/ext/Android.mk b/proprietary/packages/apps/Camera/ext/Android.mk
deleted file mode 100755
index fe9be3c7c3968e8630f73973b3264d94c9b19f71..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Camera/ext/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_JAVA_LIBRARIES := mediatek-framework
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_MODULE := com.mediatek.camera.ext
-
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/proprietary/packages/apps/Camera/jni_jpegdecoder/Android.mk b/proprietary/packages/apps/Camera/jni_jpegdecoder/Android.mk
deleted file mode 100755
index 46153cbeefe14e0ffd5732ec30ff6fc40d1a289d..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Camera/jni_jpegdecoder/Android.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# This makefile supplies the rules for building a library of JNI code for
-# use by our example of how to bundle a shared library with an APK.
-
-ifeq ($(MTK_CAM_NATIVE_PIP_SUPPORT), yes)
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := samples
-
-# This is the target being built.
-LOCAL_MODULE:= libjni_jpegdecoder
-
-LOCAL_MULTILIB := both
-
-LOCAL_C_INCLUDES += \
-    $(TOP)/$(MTK_PATH_SOURCE)/hardware/imagecodec/inc \
-
-# All of the source files that we will compile.
-LOCAL_SRC_FILES:= \
-    jpegdecoder_jni.cpp \
-
-# All of the shared libraries we link against.
-LOCAL_SHARED_LIBRARIES += \
-    libandroid_runtime \
-    libcutils \
-    libutils \
-    libui \
-    libgui \
-    libskia \
-    libsurfaceflinger \
-    
-LOCAL_SHARED_LIBRARIES += libmhalImageCodec
-
-# No static libraries.
-LOCAL_STATIC_LIBRARIES :=
-
-
-# No special compiler flags.
-LOCAL_CFLAGS +=
-
-include $(BUILD_SHARED_LIBRARY)
-endif
diff --git a/proprietary/packages/apps/CmasEM/Android.mk b/proprietary/packages/apps/CmasEM/Android.mk
deleted file mode 100755
index 0d532d55c05bf8bb7edad236903d531831bf0bf7..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/CmasEM/Android.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := CmasEM
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-
-LOCAL_EMMA_COVERAGE_FILTER := @$(LOCAL_PATH)/emma_filter.txt
-
-include $(BUILD_PACKAGE)
-
-# Use the folloing include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/packages/apps/ConfigureCheck/Android.mk b/proprietary/packages/apps/ConfigureCheck/Android.mk
deleted file mode 100755
index eac62f068416d0dd6cd199103c499cfd9f9ec600..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/ConfigureCheck/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-
-# Only compile source java files in this apk.
-LOCAL_SRC_FILES := $(call all-java-files-under)
-
-LOCAL_PACKAGE_NAME := ConfigureCheck
-
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES += mediatek-framework telephony-common
-LOCAL_STATIC_JAVA_LIBRARIES += com.mediatek.lbs.em2.utils
-
-
-include $(BUILD_PACKAGE)
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
diff --git a/proprietary/packages/apps/CrossMount/CrossMountSettings/Android.mk b/proprietary/packages/apps/CrossMount/CrossMountSettings/Android.mk
deleted file mode 100755
index bc765a8353faf13ec2e5f8a93cc8d477aa77b399..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/CrossMount/CrossMountSettings/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2015. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-
-ifeq ($(MTK_CROSSMOUNT_SUPPORT), yes)
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := CrossMountSettings
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES := com.mediatek.crossmount.adapter
-include $(BUILD_PACKAGE)
-include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
diff --git a/proprietary/packages/apps/CrossMount/CrossMountSourceCamera/Android.mk b/proprietary/packages/apps/CrossMount/CrossMountSourceCamera/Android.mk
deleted file mode 100755
index aef6f6121397b8e02d3b961366449cdc11a8cca1..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/CrossMount/CrossMountSourceCamera/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2011, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-ifeq ($(MTK_CROSSMOUNT_SUPPORT), yes)
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
-LOCAL_STATIC_JAVA_LIBRARIES += android-ex-camera2-portability
-LOCAL_JAVA_LIBRARIES += com.mediatek.crossmount.adapter
-
-
-LOCAL_PACKAGE_NAME := CrossMountSourceCamera
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
-# additionally, build unit tests in a separate .apk
-include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
diff --git a/proprietary/packages/apps/CtaTest/Android.mk b/proprietary/packages/apps/CtaTest/Android.mk
deleted file mode 100755
index 43cd93d704defae00894f4375dd17fd005a85564..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/CtaTest/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-# LOCAL_PATH:= $(call my-dir)
-# include $(CLEAR_VARS)
-
-# LOCAL_MODULE_TAGS := optional
-
-# LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-# LOCAL_PACKAGE_NAME := CtaTest
-
-## Add org.apache.http.legacy for backward compability.
-# LOCAL_JAVA_LIBRARIES += mediatek-framework telephony-common org.apache.http.legacy
-
-# include $(BUILD_PACKAGE)
diff --git a/proprietary/packages/apps/DataProtection/Android.mk b/proprietary/packages/apps/DataProtection/Android.mk
deleted file mode 100755
index 77f4f6eec85a8cb458d3786b68b47123af593216..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/DataProtection/Android.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-
-ifeq ($(strip $(MTK_CTA_SET)), yes)
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-#LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_STATIC_JAVA_LIBRARIES := guava
-
-LOCAL_PROGUARD_ENABLED := full
-LOCAL_PROGUARD_FLAG_FILES:= proguard.flags
-
-# for mediatek sdk StorageManagerEx
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-LOCAL_JAVA_LIBRARIES += mediatek-common
-LOCAL_JAVA_LIBRARIES += com.mediatek.settings.ext
-
-LOCAL_PACKAGE_NAME := DataProtection
-LOCAL_CERTIFICATE := platform
-
-# Put plugin apk together to specific folder
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/system/plugin
-
-include $(BUILD_PACKAGE)
-
-# Include plug-in's makefile to automated generate .mpinfo
-include vendor/mediatek/proprietary/frameworks/opt/plugin/mplugin.mk
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
diff --git a/proprietary/packages/apps/DeviceRegister/Android.mk b/proprietary/packages/apps/DeviceRegister/Android.mk
deleted file mode 100755
index 3ad137b9edc28c22d0895981a37db81840bfd28f..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/DeviceRegister/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-ifeq ($(strip $(OPTR_SPEC_SEG_DEF)),OP09_SPEC0212_SEGDEFAULT)
-MTK_DEVREG_APP := yes
-endif
-
-ifeq ($(strip $(OPTR_SPEC_SEG_DEF)),OP09_SPEC0212_SEGC)
-MTK_DEVREG_APP := yes
-endif
-
-ifeq ($(strip $(MTK_DEVREG_APP)),yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PROGUARD_FLAG_FILES :=proguard.cfg
-LOCAL_PROGUARD_ENABLED := disabled
-
-LOCAL_SRC_FILES := $(call all-java-files-under,src)
-
-LOCAL_PACKAGE_NAME := DeviceRegister
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES += mediatek-framework \
-                        telephony-common \
-                        mediatek-telephony-common
-
-include $(BUILD_PACKAGE)
-
-endif
diff --git a/proprietary/packages/apps/DeviceRegister/tests/Android.mk b/proprietary/packages/apps/DeviceRegister/tests/Android.mk
deleted file mode 100755
index 5cec45b68e24310e068b4d274ea06814a6db0c48..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/DeviceRegister/tests/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-ifeq ($(strip $(MTK_AUTO_TEST)), yes) 
-    LOCAL_PATH:= $(call my-dir)
-    include $(CLEAR_VARS)
-
-    # We only want this apk build for tests.
-    LOCAL_MODULE_TAGS := tests
-
-    LOCAL_JAVA_LIBRARIES := android.test.runner
-    LOCAL_JAVA_LIBRARIES += mediatek-framework
-    
-    #Add for juint report
-    LOCAL_STATIC_JAVA_LIBRARIES := libjunitreport-for-tests
-    #End add
-
-    # Include all test java files.
-    LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-    LOCAL_PACKAGE_NAME := DeviceRegisterTests
-
-    LOCAL_CERTIFICATE := platform
-
-    LOCAL_INSTRUMENTATION_FOR := DeviceRegister
-
-    include $(BUILD_PACKAGE)
-
-    # Use the following include to make our test apk.
-    include $(call all-makefiles-under,$(LOCAL_PATH))
-    
-    #Add for junit report    
-    include $(CLEAR_VARS)
-    LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := libjunitreport-for-tests:android-junit-report-1.2.6.jar
-    include $(BUILD_MULTI_PREBUILT)
-    #Edd add
-endif
diff --git a/proprietary/packages/apps/DeviceTestApp/Android.mk b/proprietary/packages/apps/DeviceTestApp/Android.mk
deleted file mode 100755
index 6df7b76f6ef78668f054517970c12dcc54bae88a..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/DeviceTestApp/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-ifeq ($(MTK_NFC_SUPPORT), yes)
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := DeviceTestApp
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JNI_SHARED_LIBRARIES := libdta_mt6605_jni libdta_dynamic_load_jni
-
-LOCAL_PROGUARD_ENABLED := disabled
-
-include $(BUILD_PACKAGE)
-
-# Use the folloing include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
diff --git a/proprietary/packages/apps/DeviceTestApp/jni-dload/Android.mk b/proprietary/packages/apps/DeviceTestApp/jni-dload/Android.mk
deleted file mode 100755
index 59e9b7920c83030066682b9fca34cf303513737b..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/DeviceTestApp/jni-dload/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-ifeq ($(MTK_NFC_SUPPORT), yes)
-
-LOCAL_PATH := $(call my-dir)
-
-$(info  "Building libdta_dynamic_jni library...")
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
-    mtk_nfc_dynamic_load.c \
-    com_mediatek_nfc_dta_dynamicload_NativeDynamicLoad.cpp \
-    com_mediatek_nfc_dta_dynamicload.cpp 
-
-
-LOCAL_C_INCLUDES += \
-    $(JNI_H_INCLUDE) \
-    $(LOCAL_PATH)  \
-
-
-LOCAL_SHARED_LIBRARIES := \
-    libnativehelper \
-    libcutils \
-    libutils \
-
-
-#LOCAL_CFLAGS += -O0 -g
-
-LOCAL_MODULE := libdta_dynamic_load_jni
-
-LOCAL_MODULE_TAGS := optional eng
-
-include $(BUILD_SHARED_LIBRARY)
-
-endif
\ No newline at end of file
diff --git a/proprietary/packages/apps/DeviceTestApp/jni-mt6605/Android.mk b/proprietary/packages/apps/DeviceTestApp/jni-mt6605/Android.mk
deleted file mode 100755
index 93c55fe8c37d4cc9d3116084e74ccc16cf9f2689..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/DeviceTestApp/jni-mt6605/Android.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-ifeq ($(MTK_NFC_SUPPORT), yes)
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-MY_LOCAL_PATH := $(LOCAL_PATH)
-
-
-LOCAL_SRC_FILES:= \
-    com_mediatek_nfc_dta_NativeDtaManager.cpp \
-    com_mediatek_nfc_dta.cpp \
-    DtaApi.cpp \
-    DtaFlow.cpp \
-    DtaFlowT1T.cpp \
-    DtaFlowT2T.cpp \
-    DtaFlowT3T.cpp \
-    DtaFlowT4T.cpp \
-    DtaFlowP2P.cpp
-  
-LOCAL_C_INCLUDES += \
-    $(JNI_H_INCLUDE)  \
-    packages/apps/Nfc/mtk-nfc/jni-mt6605 \
-    vendor/mediatek/proprietary/external/mtknfc/inc \
-    $(MY_LOCAL_PATH)
-
-
-LOCAL_SHARED_LIBRARIES := \
-    libnativehelper \
-    libcutils \
-    libutils \
-    libnfc_mt6605_jni
-
-
-#LOCAL_CFLAGS += -O0 -g
-
-LOCAL_MODULE := libdta_mt6605_jni
-LOCAL_MODULE_TAGS := optional eng
-
-include $(BUILD_SHARED_LIBRARY)
-
-endif
diff --git a/proprietary/packages/apps/Dongle/Android.mk b/proprietary/packages/apps/Dongle/Android.mk
deleted file mode 100755
index 941d5fdad16f24c0baf11be48b4a17ed4d918641..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Dongle/Android.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-#ifeq ($(MTK_BT_SUPPORT), yes)
-### generate AndroidManifest.xml
-##$(warning $(LOCAL_PATH)/build/blueangel.py])
-##PY_RES := $(shell python $(LOCAL_PATH)/build/blueangel.py)
-##endif
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-
-
-LOCAL_PACKAGE_NAME := Dongle
-LOCAL_MODULE_TAGS := optional
-LOCAL_CERTIFICATE := platform
-#LOCAL_STATIC_JAVA_LIBRARIES := com.android.phone.common 
-
-#LOCAL_JAVA_LIBRARIES := telephony-common
-#LOCAL_JAVA_LIBRARIES += mediatek-framework
-#LOCAL_JAVA_LIBRARIES += mediatek-common
-
-LOCAL_JAVA_LIBRARIES := tedongle-telephony
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-# Flag for ram optimize.
-ifeq (yes, strip$(MTK_GMO_RAM_OPTIMIZE))
-    LOCAL_AAPT_FLAGS := --utf16
-endif
-
-include $(BUILD_PACKAGE)
-
-# Build the test package
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/packages/apps/EngineerMode/Android.mk b/proprietary/packages/apps/EngineerMode/Android.mk
deleted file mode 100755
index cd1f37088f7278080740414d8bb8e2294038dc95..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/EngineerMode/Android.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-ifeq ($(MTK_ENGINEERMODE_APP), yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := EngineerMode
-LOCAL_CERTIFICATE := platform
-
-# to let app run on 32-bit space
-#LOCAL_JNI_SHARED_LIBRARIES := libem_platform32_dummy
-
-LOCAL_JAVA_LIBRARIES += mediatek-framework telephony-common ims-common
-
-LOCAL_EMMA_COVERAGE_FILTER := @$(LOCAL_PATH)/emma_filter.txt
-
-#LOCAL_MULTILIB := 32
-
-LOCAL_PROGUARD_ENABLED := disabled
-
-include $(BUILD_PACKAGE)
-
-# Use the folloing include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
diff --git a/proprietary/packages/apps/EngineerMode/jni/Android.mk b/proprietary/packages/apps/EngineerMode/jni/Android.mk
deleted file mode 100755
index bdb4fc9814e32e1591e5a161e21bbceb36bcdedb..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/EngineerMode/jni/Android.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-
-
diff --git a/proprietary/packages/apps/EngineerMode/jni/audio/Android.mk b/proprietary/packages/apps/EngineerMode/jni/audio/Android.mk
deleted file mode 100755
index b230e7e843b7950bf667b2e58361f733107d8bea..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/EngineerMode/jni/audio/Android.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-ifeq ($(MTK_ENGINEERMODE_APP), yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
-    com_mediatek_engineermode_audio.cpp 
-
-LOCAL_SHARED_LIBRARIES := \
-      libnativehelper \
-      libandroid_runtime \
-      libutils \
-      libui \
-      libcutils \
-      libaudio_param_parser 
-
-
-LOCAL_PRELINK_MODULE :=false
-
-LOCAL_C_INCLUDES= \
-        $(MTK_PATH_SOURCE)/external/AudioParamParser/ \
-        $(MTK_PATH_SOURCE)/external/AudioParamParser/include
-
-LOCAL_CFLAGS +=
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE:= libem_audio_jni
-
-include $(BUILD_SHARED_LIBRARY)
-
-endif
diff --git a/proprietary/packages/apps/EngineerMode/jni/blueth/Android.mk b/proprietary/packages/apps/EngineerMode/jni/blueth/Android.mk
deleted file mode 100755
index d11a817d484c0f1eda68b4b8f57589ba13e6fd8c..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/EngineerMode/jni/blueth/Android.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-ifeq ($(MTK_ENGINEERMODE_APP), yes)
-ifeq ($(MTK_BT_SUPPORT), yes)
-
-#ifneq ($(BUILD_WITHOUT_PV),true)
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
-    com_mediatek_engineermode_bluetooth_bttest.cpp
-
-
-LOCAL_SHARED_LIBRARIES := \
-    libbluetoothem_mtk \
-    libbluetooth_relayer \
-    libnativehelper \
-    libandroid_runtime \
-    libutils \
-    libui \
-    libcutils
-
-ifeq ($(MTK_BLUEANGEL_SUPPORT), yes)
-LOCAL_SHARED_LIBRARIES += \
-    libbtem \
-    libextem
-endif
-
-LOCAL_MULTILIB := both
-
-LOCAL_STATIC_LIBRARIES :=
-
-
-LOCAL_PRELINK_MODULE :=false
-
-LOCAL_C_INCLUDES += \
-    external/tremor/Tremor \
-    $(MTK_ROOT)/hardware/connectivity/bluetooth/driver/pure/inc \
-    frameworks/base/core/jni \
-    $(PV_INCLUDES) \
-    $(JNI_H_INCLUDE) \
-    $(call include-path-for, corecg graphics)
-
-LOCAL_CFLAGS +=
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE:= libem_bt_jni
-
-include $(BUILD_SHARED_LIBRARY)
-
-#endif
-
-endif
-endif
diff --git a/proprietary/packages/apps/EngineerMode/jni/chip/Android.mk b/proprietary/packages/apps/EngineerMode/jni/chip/Android.mk
deleted file mode 100755
index c42c285c9b1837b09ddb65a69866d34c003c4261..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/EngineerMode/jni/chip/Android.mk
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-ifeq ($(MTK_ENGINEERMODE_APP), yes)
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := chip_support.c feature_support.c
-    
-ifeq ($(MTK_FM_SUPPORT), yes)
-	LOCAL_CFLAGS += -DMTK_FM_SUPPORT
-endif
-ifeq ($(MTK_FM_TX_SUPPORT), yes)
-	LOCAL_CFLAGS += -DMTK_FM_TX_SUPPORT
-endif
-ifeq ($(MTK_RADIO_SUPPORT), yes)
-	LOCAL_CFLAGS += -DMTK_RADIO_SUPPORT
-endif
-ifeq ($(MTK_AGPS_APP), yes)
-	LOCAL_CFLAGS += -DMTK_AGPS_APP
-endif
-ifeq ($(MTK_GPS_SUPPORT), yes)
-	LOCAL_CFLAGS += -DMTK_GPS_SUPPORT
-endif
-ifeq ($(HAVE_MATV_FEATURE), yes)
-	LOCAL_CFLAGS += -DHAVE_MATV_FEATURE
-endif
-ifeq ($(MTK_BT_SUPPORT), yes)
-	LOCAL_CFLAGS += -DMTK_BT_SUPPORT
-endif
-ifeq ($(MTK_WLAN_SUPPORT), yes)
-	LOCAL_CFLAGS += -DMTK_WLAN_SUPPORT
-endif
-ifeq ($(MTK_TTY_SUPPORT), yes)
-	LOCAL_CFLAGS += -DMTK_TTY_SUPPORT
-endif
-ifdef (MTK_NFC_SUPPORT)
-	LOCAL_CFLAGS += -DMTK_NFC_SUPPORT
-endif
-
-LOCAL_C_INCLUDES := $(JNI_H_INCLUDE) $(LOCAL_PATH)
-LOCAL_SHARED_LIBRARIES := libutils libcutils
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libem_support_jni
-LOCAL_PRELINK_MODULE := false
-include $(BUILD_SHARED_LIBRARY)
-
-endif
-
diff --git a/proprietary/packages/apps/EngineerMode/jni/gpio/Android.mk b/proprietary/packages/apps/EngineerMode/jni/gpio/Android.mk
deleted file mode 100755
index 020acdc4822f5fba42ae7f1c99ae9ec416689041..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/EngineerMode/jni/gpio/Android.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-ifeq ($(MTK_ENGINEERMODE_APP), yes)
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := meta_gpio.c gpio_jni.c msdc_jni.c
-LOCAL_C_INCLUDES := $(JNI_H_INCLUDE) $(LOCAL_PATH) $(MTK_ROOT)/hardware/meta/common/inc $(LOCAL_PATH)/../chip
-LOCAL_SHARED_LIBRARIES := libutils libem_support_jni libcutils
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libem_gpio_jni
-LOCAL_PRELINK_MODULE := false
-include $(BUILD_SHARED_LIBRARY)
-
-###############################################################################
-# SELF TEST
-###############################################################################
-BUILD_SELF_TEST := false
-ifeq ($(BUILD_SELF_TEST), true)
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := meta_gpio_test.c
-LOCAL_C_INCLUDES := $(MTK_ROOT)/hardware/meta/common/inc
-LOCAL_MODULE := meta_gpio_test
-LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
-#LOCAL_SHARED_LIBRARIES := libft
-LOCAL_STATIC_LIBRARIES := libmeta_gpio
-LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED)
-include $(BUILD_EXECUTABLE)
-endif
-
-endif
-
-
diff --git a/proprietary/packages/apps/EngineerMode/jni/lte/Android.mk b/proprietary/packages/apps/EngineerMode/jni/lte/Android.mk
deleted file mode 100755
index 4b8e0bc69547e978695ec9078dc2f0f75718402a..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/EngineerMode/jni/lte/Android.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-ifeq ($(MTK_ENGINEERMODE_APP), yes)
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := lte_info_parser.cpp
-
-LOCAL_C_INCLUDES := $(JNI_H_INCLUDE) $(LOCAL_PATH)
-LOCAL_C_INCLUDES += \
-    external/tremor/Tremor \
-    mediatek/external/bluetooth/driver/inc \
-    frameworks/base/core/jni \
-    $(PV_INCLUDES) \
-    $(JNI_H_INCLUDE) \
-    $(call include-path-for, corecg graphics) \
-    $(LOCAL_PATH)/../chip
-LOCAL_SHARED_LIBRARIES := libutils libcutils libandroid_runtime libem_support_jni
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libem_lte_jni
-LOCAL_PRELINK_MODULE := false
-include $(BUILD_SHARED_LIBRARY)
-
-endif
-
diff --git a/proprietary/packages/apps/EngineerMode/jni/mbim/Android.mk b/proprietary/packages/apps/EngineerMode/jni/mbim/Android.mk
deleted file mode 100755
index c0e2eab9045da90609e7e2a89e62dede7caada99..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/EngineerMode/jni/mbim/Android.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-ifeq ($(MTK_ENGINEERMODE_APP), yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
-    com_mediatek_engineermode_mbim.cpp 
-
-LOCAL_SHARED_LIBRARIES := \
-      libnativehelper \
-      libandroid_runtime \
-      libutils \
-      libui \
-      libcutils 
-
-
-LOCAL_PRELINK_MODULE :=false
-
-
-LOCAL_CFLAGS +=
-
-ifeq ($(TARGET_BUILD_VARIANT),eng)
-LOCAL_CFLAGS += -DENG_VERSION
-endif
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE:= libem_mbim_jni
-
-include $(BUILD_SHARED_LIBRARY)
-
-endif
diff --git a/proprietary/packages/apps/EngineerMode/jni/modem/Android.mk b/proprietary/packages/apps/EngineerMode/jni/modem/Android.mk
deleted file mode 100755
index 93e26f3fc002169e73dc570a397088eb7d373232..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/EngineerMode/jni/modem/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-ifeq ($(MTK_ENGINEERMODE_APP), yes)
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_SHARED_LIBRARIES += liblog libnativehelper
-LOCAL_PRELINK_MODULE := false
-LOCAL_C_INCLUDES += $(JNI_H_INCLUDE) $(LOCAL_PATH) 
-LOCAL_SRC_FILES := memorydump_jni.c sleepmode_jni.c
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libem_modem_jni
-include $(BUILD_SHARED_LIBRARY)
-
-endif
diff --git a/proprietary/packages/apps/EngineerMode/jni/nfc/Android.mk b/proprietary/packages/apps/EngineerMode/jni/nfc/Android.mk
deleted file mode 100755
index 80ca85c9f198b294681a6a23c743a494d81678ad..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/EngineerMode/jni/nfc/Android.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-ifeq ($(MTK_ENGINEERMODE_APP), yes)
-ifeq ($(MTK_NFC_SUPPORT), yes)
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := jniNFC.cpp Utils.cpp CMetaNfc.cpp XSync.cpp meta_em/meta_nfc.c
-LOCAL_C_INCLUDES := $(JNI_H_INCLUDE)
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/meta_em
-LOCAL_C_INCLUDES += $(MTK_ROOT)/hardware/meta/common/inc
-###LOCAL_C_INCLUDES += $(TOPDIR)mediatek/platform/mt6573/external/meta/nfc
-
-LOCAL_SHARED_LIBRARIES := libutils libc libcutils liblog
-##LOCAL_STATIC_LIBRARIES := libem_nfc
-LOCAL_MODULE := libem_nfc_jni
-LOCAL_PRELINK_MODULE := false
-include $(BUILD_SHARED_LIBRARY)
-
-endif
-endif
\ No newline at end of file
diff --git a/proprietary/packages/apps/EngineerMode/jni/platform32/Android.mk b/proprietary/packages/apps/EngineerMode/jni/platform32/Android.mk
deleted file mode 100755
index 66a87e6a7af26bfc90f05938064f9584ae9cd19b..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/EngineerMode/jni/platform32/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-ifeq (0, 1)
-ifeq ($(MTK_ENGINEERMODE_APP), yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
-    dummy32.c
-
-LOCAL_MULTILIB := 32
-
-LOCAL_PRELINK_MODULE :=false
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE:= libem_platform32_dummy
-
-include $(BUILD_SHARED_LIBRARY)
-
-endif
-endif
diff --git a/proprietary/packages/apps/EngineerMode/jni/usb/Android.mk b/proprietary/packages/apps/EngineerMode/jni/usb/Android.mk
deleted file mode 100755
index 4ceb63e98dda1762baa09503526821f8b8a34abc..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/EngineerMode/jni/usb/Android.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-ifeq ($(MTK_ENGINEERMODE_APP), yes)
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := usb_jni.c
-LOCAL_C_INCLUDES := $(JNI_H_INCLUDE)
-LOCAL_SHARED_LIBRARIES +=  libutils libcutils
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libem_usb_jni
-LOCAL_PRELINK_MODULE := false
-include $(BUILD_SHARED_LIBRARY)
-
-
-endif
diff --git a/proprietary/packages/apps/EngineerMode/jni/wifi/Android.mk b/proprietary/packages/apps/EngineerMode/jni/wifi/Android.mk
deleted file mode 100755
index 989f829c016ee76da2017bc2f0ddd61c0753e88d..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/EngineerMode/jni/wifi/Android.mk
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-ifeq ($(MTK_ENGINEERMODE_APP), yes)
-ifeq ($(MTK_WLAN_SUPPORT), yes)
-
-
-#ifneq ($(BUILD_WITHOUT_PV),true)
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-
-LOCAL_SRC_FILES:= \
-    com_mediatek_engineermode_wifi_EMWifi.cpp
-
-LOCAL_SHARED_LIBRARIES := \
-    libandroid_runtime \
-    libnativehelper \
-    libutils \
-    libskia \
-    libui \
-    libcutils
-
-
-LOCAL_STATIC_LIBRARIES := lib_wifi_em
-
-
-LOCAL_PRELINK_MODULE := false
-
-LOCAL_C_INCLUDES += \
-    external/tremor/Tremor \
-    frameworks/base/core/jni \
-    $(PV_INCLUDES) \
-    $(JNI_H_INCLUDE) \
-    $(call include-path-for, corecg graphics)
-
-#LOCAL_CFLAGS +=
-
-#LOCAL_LDLIBS := -lpthread
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE:= libem_wifi_jni
-
-include $(BUILD_SHARED_LIBRARY)
-#include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-        dbg.cpp    \
-        CAdapter.cpp \
-        CLocalOID.cpp \
-        mt66xx.cpp
-#        test_wifi_em.cpp
-
-LOCAL_SHARED_LIBRARIES := \
-        libcutils \
-        libutils
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE := \
-        lib_wifi_em
-
-include $(BUILD_STATIC_LIBRARY)
-
-
-#endif
-endif
-endif
diff --git a/proprietary/packages/apps/EngineerMode/tests/Android.mk b/proprietary/packages/apps/EngineerMode/tests/Android.mk
deleted file mode 100755
index dd68c99b90310c9ffd006e9d467dc718b0e6d0fa..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/EngineerMode/tests/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES := android.test.runner \
-                        mediatek-framework \
-                        telephony-common
-
-LOCAL_STATIC_JAVA_LIBRARIES := librobotium4 \
-                               engineermodelibannotations
-
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := EngineerModeTests
-
-LOCAL_INSTRUMENTATION_FOR := EngineerMode
-
-include $(BUILD_PACKAGE)
-
-include $(CLEAR_VARS)
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := engineermodelibannotations:libs/mtkatannotations.jar
-include $(BUILD_MULTI_PREBUILT)
diff --git a/proprietary/packages/apps/EsnTrack/Android.mk b/proprietary/packages/apps/EsnTrack/Android.mk
deleted file mode 100755
index 9a8a71546cd0a6ea6131da88022cd964daa08358..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/EsnTrack/Android.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-ifeq ($(MTK_ESN_TRACK_APP),yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PROGUARD_FLAG_FILES :=proguard.cfg
-LOCAL_PROGUARD_ENABLED := disabled
-
-LOCAL_SRC_FILES := $(call all-java-files-under,src)
-
-LOCAL_PACKAGE_NAME := EsnTrack
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES += mediatek-framework \
-                        telephony-common
-LOCAL_JAVA_LIBRARIES += mediatek-telephony-common
-include $(BUILD_PACKAGE)
-
-endif
diff --git a/proprietary/packages/apps/FMTransmitter/Android.mk b/proprietary/packages/apps/FMTransmitter/Android.mk
deleted file mode 100755
index 38a12502a28906a3b70b1445e15f53b3c12cf667..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/FMTransmitter/Android.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-ifeq ($(MTK_FM_SUPPORT),yes)
-ifeq ($(MTK_FM_TX_SUPPORT),yes)
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(call all-java-files-under, src)\
-LOCAL_SRC_FILES += src/com/mediatek/FMTransmitter/IFMTransmitterService.aidl
-LOCAL_PACKAGE_NAME := FMTransmitter
-LOCAL_CERTIFICATE := platform
-LOCAL_JNI_SHARED_LIBRARIES :=  libfmtxjni
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-
-include $(BUILD_PACKAGE)
-
-
-# ============================================================
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
-endif
diff --git a/proprietary/packages/apps/FMTransmitter/tests/Android.mk b/proprietary/packages/apps/FMTransmitter/tests/Android.mk
deleted file mode 100755
index 499b304ff0deba0bb079b5d113882709d385d419..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/FMTransmitter/tests/Android.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-ifeq ($(MTK_FM_SUPPORT),yes)
-ifeq ($(MTK_FM_TX_SUPPORT),yes)
-ifeq ($(strip $(MTK_AUTO_TEST)), yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-LOCAL_CERTIFICATE := media
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := librobotium4
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_PACKAGE_NAME := FMTransmitterTests
-
-LOCAL_INSTRUMENTATION_FOR := FMTransmitter
-
-
-include $(BUILD_PACKAGE)
-
-###############
-
-# Use the folloing include to make our test apk.
-#include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
-endif
-endif
diff --git a/proprietary/packages/apps/FTPreCheck/Android.mk b/proprietary/packages/apps/FTPreCheck/Android.mk
deleted file mode 100755
index 2bb041488a713ae1e9a3e9a5712d8ac18dda8aec..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/FTPreCheck/Android.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-ifeq ($(MTK_CMCC_FT_PRECHECK_SUPPORT), yes)
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_LIBRARIES += mediatek-framework telephony-common
-
-LOCAL_PACKAGE_NAME := FTPreCheck
-LOCAL_CERTIFICATE := platform
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-include $(BUILD_PACKAGE)
-
-endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/proprietary/packages/apps/FileManager/Android.mk b/proprietary/packages/apps/FileManager/Android.mk
deleted file mode 100755
index a87ec653204f98c5fbf17038f1edbcb0dc41f94b..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/FileManager/Android.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under,src)
-
-LOCAL_PACKAGE_NAME := FileManager
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-LOCAL_STATIC_JAVA_LIBRARIES += com.mediatek.filemanager.ext
-include $(BUILD_PACKAGE)
-
-# additionally, build unit tests in a separate .apk
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/packages/apps/FileManager/ext/Android.mk b/proprietary/packages/apps/FileManager/ext/Android.mk
deleted file mode 100755
index 72fbd5e5e439140bf94bf5270b5cb09cb680058b..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/FileManager/ext/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_JAVA_LIBRARIES := mediatek-framework
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_MODULE := com.mediatek.filemanager.ext
-		
-include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/proprietary/packages/apps/FileManager/tests/Android.mk b/proprietary/packages/apps/FileManager/tests/Android.mk
deleted file mode 100755
index abf05a90aa15eb0bb8f51a58f9addbfaf97f581e..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/FileManager/tests/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-    LOCAL_PATH:= $(call my-dir)
-    include $(CLEAR_VARS)
-
-    LOCAL_MODULE_TAGS := tests
-
-    LOCAL_JAVA_LIBRARIES := android.test.runner \
-                            mediatek-framework
-
-    # Include all test java files.
-    LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-    LOCAL_PACKAGE_NAME := FileManagerTest
-
-    LOCAL_CERTIFICATE := platform
-
-    LOCAL_INSTRUMENTATION_FOR := FileManager
-
-    #Include librobotium
-    LOCAL_STATIC_JAVA_LIBRARIES := librobotium4
-
-    include $(BUILD_PACKAGE)
-
-    # Use the following include to make our test apk.
-    include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/packages/apps/FlpEM2/Android.mk b/proprietary/packages/apps/FlpEM2/Android.mk
deleted file mode 100755
index 5492397dbb71d035d4320bcb98c60169af61aa9a..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/FlpEM2/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-ifeq ($(MTK_GPS_SUPPORT),yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := \
-            $(call all-subdir-java-files) \
-
-LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-LOCAL_PACKAGE_NAME := FlpEM2
-LOCAL_CERTIFICATE := platform
-LOCAL_JAVA_LIBRARIES := com.android.location.provider
-
-include $(BUILD_PACKAGE)
-
-endif
\ No newline at end of file
diff --git a/proprietary/packages/apps/HS2EM/Android.mk b/proprietary/packages/apps/HS2EM/Android.mk
deleted file mode 100755
index cb942910af8b3188c61e171aa66f0e213346bd12..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/HS2EM/Android.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-        
-LOCAL_PACKAGE_NAME := HS2EM
-# LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
\ No newline at end of file
diff --git a/proprietary/packages/apps/HetComm/Android.mk b/proprietary/packages/apps/HetComm/Android.mk
deleted file mode 100755
index fda92b4b04efec321adef9200c1b1f5b95b4683d..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/HetComm/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-ifeq ($(MTK_HETCOMM_SUPPORT), yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-#DEFAULT_APP_TARGET_SDK := 19
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := HetComm
-LOCAL_CERTIFICATE := platform
-
-
-include $(BUILD_PACKAGE)
-
-# Use the folloing include to make our test apk.
-# include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
diff --git a/proprietary/packages/apps/HotKnot/Android.mk b/proprietary/packages/apps/HotKnot/Android.mk
deleted file mode 100755
index 286af3255d84754e2f22efa526b22e0f7e51197a..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/HotKnot/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-ifeq ($(MTK_HOTKNOT_SUPPORT), yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := HotKnot
-LOCAL_SRC_FILES := ./HotKnot.apk
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-
-include $(BUILD_PREBUILT)
-
-endif
diff --git a/proprietary/packages/apps/HotKnotBeam/Android.mk b/proprietary/packages/apps/HotKnotBeam/Android.mk
deleted file mode 100755
index 546dad3fdb231e90f3d7dc16d0f38a0cf5737e17..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/HotKnotBeam/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-ifeq ($(MTK_HOTKNOT_SUPPORT), yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-#DEFAULT_APP_TARGET_SDK := 19
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) \
-                    src/com/mediatek/hotknotbeam/IHotKnotBeamService.aidl \
-
-LOCAL_PACKAGE_NAME := HotKnotBeam
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-
-include $(BUILD_PACKAGE)
-
-# Use the folloing include to make our test apk.
-# include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
diff --git a/proprietary/packages/apps/HotKnotCommonUI/Android.mk b/proprietary/packages/apps/HotKnotCommonUI/Android.mk
deleted file mode 100755
index 7fb9a3685d88ef5d8e9573eace24d66d69700b21..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/HotKnotCommonUI/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-ifeq ($(MTK_HOTKNOT_SUPPORT), yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_JAVA_LIBRARIES := mediatek-framework
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := HotKnotCommonUI
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
-# Use the folloing include to make our test apk.
-# include $(call all-makefiles-under,$(LOCAL_PATH))
-
-
-endif
diff --git a/proprietary/packages/apps/MTKAndroidSuiteDaemon/tests/Android.mk b/proprietary/packages/apps/MTKAndroidSuiteDaemon/tests/Android.mk
deleted file mode 100755
index 3a2f144f2fdf4254d1cbcf0fe0b84c290c82a3f3..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/MTKAndroidSuiteDaemon/tests/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-ifeq ($(strip $(MTK_AUTO_TEST)), yes)
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := librobotium4
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MTKAndroidSuiteDaemonTests
-
-LOCAL_INSTRUMENTATION_FOR := MTKAndroidSuiteDaemon
-
-include $(BUILD_PACKAGE)
-endif
\ No newline at end of file
diff --git a/proprietary/packages/apps/MediatekDM/Android.mk b/proprietary/packages/apps/MediatekDM/Android.mk
deleted file mode 100755
index 6bcb83910da545924640a9ac723487f05b64b29f..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/MediatekDM/Android.mk
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-ifeq ($(MTK_MDM_APP), yes)
-
-define all-common-files-under
-$(patsubst ./%,%, \
-  $(shell cd $(LOCAL_PATH) ; \
-          find $(1) -name "*.java" ! -name ".*" \
-          ! -path "*mediatekdm/fumo*" \
-          ! -path "*mediatekdm/scomo*" \
-          ! -path "*mediatekdm/lawmo*" \
-          ! -path "*mediatekdm/volte*" \
-          ! -path "*mediatekdm/wfhs*" \
-          ! -path "*mediatekdm/andsf*" \
-          ! -path "*mdm/fumo*" \
-          ! -path "*mdm/scomo*" \
-          ! -path "*mdm/lawmo*" ) \
-          ! -path "*mdm/andsf*" ) \
- )
-endef
-
-define all-fumo-files-under
-$(patsubst ./%,%, \
-  $(shell cd $(LOCAL_PATH) ; \
-          find $(1) -name "*.java" ! -name ".*" \
-          \( -path "*mediatekdm/fumo*" -o -path "*mdm/fumo*" \) ) \
- )
-endef
-
-define all-scomo-files-under
-$(patsubst ./%,%, \
-  $(shell cd $(LOCAL_PATH) ; \
-          find $(1) -name "*.java" ! -name ".*" \
-          \( -path "*mediatekdm/scomo*" -o -path "*mdm/scomo*" \) ) \
- )
-endef
-
-define all-lawmo-files-under
-$(patsubst ./%,%, \
-  $(shell cd $(LOCAL_PATH) ; \
-          find $(1) -name "*.java" ! -name ".*" \
-          \( -path "*mediatekdm/lawmo*" -o -path "*mdm/lawmo*" \) ) \
- )
-endef
-
-define all-volte-files-under
-$(patsubst ./%,%, \
-  $(shell cd $(LOCAL_PATH) ; \
-          find $(1) -name "*.java" ! -name ".*" \
-          \( -path "*mediatekdm/volte*" \) ) \
- )
-endef
-
-define all-wfhs-files-under
-$(patsubst ./%,%, \
-  $(shell cd $(LOCAL_PATH) ; \
-          find $(1) -name "*.java" ! -name ".*" \
-          \( -path "*mediatekdm/wfhs*" \) ) \
- )
-endef
-
-define all-andsf-files-under
-$(patsubst ./%,%, \
-  $(shell cd $(LOCAL_PATH) ; \
-          find $(1) -name "*.java" ! -name ".*" \
-          \( -path "*mediatekdm/andsf*" -o -path "*mdm/andsf*" \) ) \
- )
-endef
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PRELINK_MODULE := false
-
-LOCAL_JAVA_LIBRARIES += mediatek-framework telephony-common ims-common
-LOCAL_STATIC_JAVA_LIBRARIES += com.mediatek.lbs.em2.utils
-
-MDM_SRC_DIR := src/com/mediatek/mediatekdm
-
-LOCAL_SRC_FILES := $(call all-common-files-under, $(MDM_SRC_DIR))
-
-ifeq ($(MTK_MDM_FUMO), yes)
-$(warning FUMO enabled)
-LOCAL_SRC_FUMO_FILES := $(call all-fumo-files-under, $(MDM_SRC_DIR))
-LOCAL_SRC_FILES += $(LOCAL_SRC_FUMO_FILES)
-endif
-
-ifeq ($(MTK_MDM_SCOMO), yes)
-$(warning SCOMO enabled)
-LOCAL_SRC_SCOMO_FILES := $(call all-scomo-files-under, $(MDM_SRC_DIR))
-LOCAL_SRC_FILES += $(LOCAL_SRC_SCOMO_FILES)
-endif
-
-ifeq ($(MTK_MDM_LAWMO), yes)
-$(warning LAWMO enabled)
-LOCAL_SRC_LAWMO_FILES := $(call all-lawmo-files-under, $(MDM_SRC_DIR))
-LOCAL_SRC_FILES += $(LOCAL_SRC_LAWMO_FILES)
-endif
-
-ifeq ($(MTK_MDM_VOLTE), yes)
-$(warning VOLTE enabled)
-LOCAL_SRC_VOLTE_FILES := $(call all-volte-files-under, $(MDM_SRC_DIR))
-LOCAL_SRC_FILES += $(LOCAL_SRC_VOLTE_FILES)
-endif
-
-ifeq ($(MTK_PASSPOINT_R2_SUPPORT), yes)
-$(warning WFHS enabled)
-LOCAL_SRC_WFHS_FILES := $(call all-wfhs-files-under, $(MDM_SRC_DIR))
-LOCAL_SRC_FILES += $(LOCAL_SRC_WFHS_FILES)
-endif
-
-ifeq ($(MTK_MDM_ANDSF), yes)
-$(warning ANDSF enabled)
-LOCAL_SRC_ANDSF_FILES := $(call all-andsf-files-under, $(MDM_SRC_DIR))
-LOCAL_SRC_FILES += $(LOCAL_SRC_ANDSF_FILES)
-endif
-
-LOCAL_REQUIRED_MODULES := libjni_mdm
-
-LOCAL_PACKAGE_NAME := MediatekDM
-LOCAL_CERTIFICATE := platform
-
-# disable proguard option
-LOCAL_PROGUARD_ENABLED := disabled
-
-include $(BUILD_PACKAGE)
-
-include $(CLEAR_VARS)
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
diff --git a/proprietary/packages/apps/MediatekDM/tests/Android.mk b/proprietary/packages/apps/MediatekDM/tests/Android.mk
deleted file mode 100755
index f28701efb9406d7aa82c51644739c22917a8d75d..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/MediatekDM/tests/Android.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# MTK_AUTO_TEST := yes
-ifeq ($(strip $(MTK_AUTO_TEST)), yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-LOCAL_STATIC_JAVA_LIBRARIES := librobotium4
-# robotium
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_SRC_FILES += $(call all-Iaidl-files-under, src)
-$(warning SRC is $(SRC))
-LOCAL_PACKAGE_NAME := MediatekDMTests
-LOCAL_INSTRUMENTATION_FOR := MediatekDM
-
-include $(BUILD_PACKAGE)
-
-endif
-
-# MTK_AUTO_TEST := no
diff --git a/proprietary/packages/apps/Mms/Android.mk b/proprietary/packages/apps/Mms/Android.mk
deleted file mode 100755
index b1de604b8587f15e832cc0bc7e60c3f4bfb18762..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Mms/Android.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# Copyright (C) 2014 MediaTek Inc.
-# Modification based on code covered by the mentioned copyright
-# and/or permission notice(s).
-#
-# Copyright 2007-2008 The Android Open Source Project 
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-# Include res dir from chips
-chips_dir := ../../../../../../frameworks/ex/chips/res
-contacts_common_dir := ../../../../../../packages/apps/ContactsCommon
-contacts_ext_dir := ../../../../../../packages/apps/ContactsCommon/ext
-phone_common_dir := ../../../../../../packages/apps/PhoneCommon
-
-src_dirs := src \
-    $(phone_common_dir)/src \
-    $(contacts_common_dir)/src \
-    $(contacts_ext_dir)/src
-
-res_dirs := res \
-    $(phone_common_dir)/res \
-    $(contacts_common_dir)/res \
-    $(contacts_common_dir)/res_ext \
-    $(chips_dir)
-
-$(shell rm -f $(LOCAL_PATH)/chips)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
-LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
-
-LOCAL_PACKAGE_NAME := MtkMms
-LOCAL_OVERRIDES_PACKAGES := Mms
-
-# Builds against the public SDK
-#LOCAL_SDK_VERSION := current
-
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-LOCAL_JAVA_LIBRARIES += telephony-common
-LOCAL_JAVA_LIBRARIES += org.apache.http.legacy.boot
-LOCAL_JAVA_LIBRARIES += voip-common
-LOCAL_JAVA_LIBRARIES += ims-common
-LOCAL_STATIC_JAVA_LIBRARIES += android-common jsr305
-LOCAL_STATIC_JAVA_LIBRARIES += libchips
-LOCAL_STATIC_JAVA_LIBRARIES += android-common-chips
-LOCAL_STATIC_JAVA_LIBRARIES += com.android.vcard
-LOCAL_STATIC_JAVA_LIBRARIES += com.mediatek.mms.ext
-LOCAL_STATIC_JAVA_LIBRARIES += com.mediatek.mms.callback \
-    com.android.services.telephony.common \
-    guava \
-    android-support-v13 \
-    android-support-v4 \
-    libphonenumber
-
-
-LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
-LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
-LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_AAPT_FLAGS += --extra-packages com.android.phone.common
-LOCAL_AAPT_FLAGS += --extra-packages com.android.mtkex.chips
-LOCAL_AAPT_FLAGS += --extra-packages com.android.contacts.common
-
-LOCAL_REQUIRED_MODULES := SoundRecorder
-ifeq ($(strip $(MTK_RCS_SUPPORT)),yes)
-LOCAL_PROGUARD_ENABLED := disabled
-#LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-else
-#LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-endif
-
-LOCAL_PRIVILEGED_MODULE := true
-
-include $(BUILD_PACKAGE)
-
-# This finds and builds the test apk as well, so a single make does both.
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/packages/apps/Mms/callback/Android.mk b/proprietary/packages/apps/Mms/callback/Android.mk
deleted file mode 100755
index ab590c35dc66118193f41be07b67e52f750345ec..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Mms/callback/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_JAVA_LIBRARIES += telephony-common
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := com.mediatek.mms.callback
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/proprietary/packages/apps/Mms/ext/Android.mk b/proprietary/packages/apps/Mms/ext/Android.mk
deleted file mode 100755
index 095ebd2b67fc4ebad9cc7aeb14d3ad5adc69645f..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Mms/ext/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_JAVA_LIBRARIES += telephony-common
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-LOCAL_JAVA_LIBRARIES += org.apache.http.legacy.boot
-LOCAL_STATIC_JAVA_LIBRARIES += android-common-chips
-LOCAL_STATIC_JAVA_LIBRARIES += com.mediatek.mms.callback
-#LOCAL_JAVA_LIBRARIES += mediatek-telephony-common
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := com.mediatek.mms.ext
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/proprietary/packages/apps/MtkFloatMenu/Android.mk b/proprietary/packages/apps/MtkFloatMenu/Android.mk
deleted file mode 100755
index 3436446dbcba0a5c9f684ee0dfe7fd41a9ce7f34..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/MtkFloatMenu/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-ifeq ($(strip $(MTK_WFD_SINK_SUPPORT)), yes)
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_PACKAGE_NAME := MtkFloatMenu
-LOCAL_CERTIFICATE := platform
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
diff --git a/proprietary/packages/apps/Mtv/adapter/Android.mk b/proprietary/packages/apps/Mtv/adapter/Android.mk
deleted file mode 100755
index 219a8689e7ff8c98a474f673ad37fc941401abce..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Mtv/adapter/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_MODULE := com.mediatek.atv.adapter
-
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/proprietary/packages/apps/MultiCoreObserver/Android.mk b/proprietary/packages/apps/MultiCoreObserver/Android.mk
deleted file mode 100755
index ded69db3623e51ce088197c15e382d5652a6a86c..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/MultiCoreObserver/Android.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2014. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MULTILIB := 32
-
-# Module name should match apk name to be installed.
-LOCAL_MODULE := MultiCoreObserver
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-
-LOCAL_CERTIFICATE := platform
-
-# LOCAL_REQUIRED_MODULES will trigger the dependent(dynamic link, ex. dlopen)
-# .jar/.so(jni shared library) etc. be installed indirectly
-# the following shell be set to be compatible with android M build environment
-LOCAL_REQUIRED_MODULES := liba3m libja3m
-ifneq ($(strip $(MTK_PLATFORM)),)
-LOCAL_JNI_SHARED_LIBRARIES += libja3m liba3m
-endif
-
-# Set LOCAL_MODULE_PATH to install the build result to a customization location
-# (TARGET_OUT points to system/ folder)
-# LOCAL_MODULE_PATH := $(TARGET_OUT)/lib
-
-include $(BUILD_PREBUILT)
diff --git a/proprietary/packages/apps/MultiWindowService/Android.mk b/proprietary/packages/apps/MultiWindowService/Android.mk
deleted file mode 100755
index b14c0712f995c1c657fbd2aaf9ea32193bfbc519..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/MultiWindowService/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-#=====================================================================================
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PROGUARD_ENABLED := disabled
-#LOCAL_STATIC_JAVA_LIBRARIES := sef_latest
-LOCAL_PACKAGE_NAME := MultiWindowService
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
-#=====================================================================================
diff --git a/proprietary/packages/apps/NlpService/Android.mk b/proprietary/packages/apps/NlpService/Android.mk
deleted file mode 100755
index f16653bfc6d6b80c619418b7ef8a9591c1180324..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/NlpService/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-ifeq ($(MTK_GPS_SUPPORT),yes)
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_PACKAGE_NAME := NlpService
-LOCAL_CERTIFICATE := platform
-
-LOCAL_STATIC_JAVA_LIBRARIES := lbsutil
-
-include $(BUILD_PACKAGE)
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-
-include $(CLEAR_VARS)
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := lbsutil:libs/lbsutils.jar
-include $(BUILD_MULTI_PREBUILT)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
diff --git a/proprietary/packages/apps/OfflineK/Android.mk b/proprietary/packages/apps/OfflineK/Android.mk
deleted file mode 100755
index 591bb45a00bd385285bb1dd55c9d78704898308f..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/OfflineK/Android.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_PACKAGE_NAME := OfflineK
-LOCAL_CERTIFICATE := platform
-LOCAL_JNI_SHARED_LIBRARIES := libSdioETT
-
-LOCAL_MULTILIB := 32
-
-#WITH_DEXPREOPT := false
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
diff --git a/proprietary/packages/apps/OfflineK/jni/Android.mk b/proprietary/packages/apps/OfflineK/jni/Android.mk
deleted file mode 100755
index d9ea5e3f03e9118bd227e00e1772995eb8dc3d47..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/OfflineK/jni/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -llog -lm
-LOCAL_SHARED_LIBRARIES := liblog libcutils
-LOCAL_MODULE    := libSdioETT
-LOCAL_SRC_FILES := SdioETT.cpp ett_core.cpp
-LOCAL_C_INCLUDES := $(JNI_H_INCLUDE) $(LOCAL_PATH) $(MTK_ROOT)/external/meta/common/inc $(LOCAL_PATH)/../chip
-
-include $(BUILD_SHARED_LIBRARY)
-#include $(BUILD_EXECUTABLE)
diff --git a/proprietary/packages/apps/Omacp/Android.mk b/proprietary/packages/apps/Omacp/Android.mk
deleted file mode 100755
index afadcf22e51d40d28c566a2f1646e19e339eb2de..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Omacp/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2007-2008 The Android Open Source Project
-
-#ifeq ($(MTK_OMACP_SUPPORT),yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-#LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := Omacp
-#LOCAL_JAVA_LIBRARIES += mms-common
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-LOCAL_JAVA_LIBRARIES += telephony-common
-LOCAL_STATIC_JAVA_LIBRARIES += wbxml
-
-include $(BUILD_PACKAGE)
-
-# This finds and builds the test apk as well, so a single make does both.
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-#endif
diff --git a/proprietary/packages/apps/Omacp/tests/Android.mk b/proprietary/packages/apps/Omacp/tests/Android.mk
deleted file mode 100755
index d28e8dc481dfdb2cc1c69184ba92dee1cff04180..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Omacp/tests/Android.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2008, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-ifeq ($(strip $(MTK_AUTO_TEST)), yes)
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-# Include all test java files.
-#LOCAL_STATIC_JAVA_LIBRARIES := libjunitreprot-for-omacp-tests
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := OmacpTests
-
-LOCAL_JAVA_LIBRARIES += telephony-common
-
-LOCAL_INSTRUMENTATION_FOR := Omacp
-
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_PACKAGE)
-
-###############
-# Junit Test option
-#include $(CLEAR_VARS)
-#LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := libjunitreprot-for-omacp-tests:android-junit-report-1.2.6.jar
-#include $(BUILD_MULTI_PREBUILT)
-###############
-
-endif
diff --git a/proprietary/packages/apps/PermissionControl/Android.mk b/proprietary/packages/apps/PermissionControl/Android.mk
deleted file mode 100755
index 3113cbee451cabfa9cc63e2123153fb0565f9d6a..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/PermissionControl/Android.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-
-ifeq ($(strip $(MTK_PERMISSION_CONTROL)),yes)
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_STATIC_JAVA_LIBRARIES :=  android-support-v4
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PROGUARD_ENABLED := full
-LOCAL_PROGUARD_FLAG_FILES:= proguard.flags
-
-LOCAL_PACKAGE_NAME := PermissionControl
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-LOCAL_JAVA_LIBRARIES += mediatek-common
-LOCAL_JAVA_LIBRARIES += com.mediatek.settings.ext
-
-# Put plugin apk together to specific folder
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/system/plugin
-
-include $(BUILD_PACKAGE)
-
-# Include plug-in's makefile to automated generate .mpinfo
-include vendor/mediatek/proprietary/frameworks/opt/plugin/mplugin.mk
-
-# Use the folloing include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
diff --git a/proprietary/packages/apps/PrivacyProtectionLock/Android.mk b/proprietary/packages/apps/PrivacyProtectionLock/Android.mk
deleted file mode 100755
index 5f60e09f666093abebc468933ee56adf2eec4df5..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/PrivacyProtectionLock/Android.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-ifeq ($(MTK_PRIVACY_PROTECTION_LOCK), yes)
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PRELINK_MODULE := false
-
-LOCAL_JAVA_LIBRARIES += mediatek-framework mediatek-common telephony-common com.mediatek.settings.ext
-#mediatek-telephony-common
-
-LOCAL_PACKAGE_NAME := PrivacyProtectionLock
-LOCAL_CERTIFICATE := platform
-
-#LOCAL_PROGUARD_FLAG_FILES := proguard.cfg
-
-# Put plugin apk together to specific folder
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/system/plugin
-
-include $(BUILD_PACKAGE)
-
-# Include plug-in's makefile to automated generate .mpinfo
-include vendor/mediatek/proprietary/frameworks/opt/plugin/mplugin.mk
-
-endif
diff --git a/proprietary/packages/apps/PrivacyProtectionLock/tests/Android.mk b/proprietary/packages/apps/PrivacyProtectionLock/tests/Android.mk
deleted file mode 100755
index ec58b8dc9ef5bb4237810bf8bafd49b5075cbca5..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/PrivacyProtectionLock/tests/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-# MTK_AUTO_TEST := yes
-ifeq ($(strip $(MTK_AUTO_TEST)), yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_JAVA_LIBRARIES += mediatek-framework telephony-common
-LOCAL_STATIC_JAVA_LIBRARIES := librobotium4
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := PrivacyProtectionLockTests
-LOCAL_INSTRUMENTATION_FOR := PrivacyProtectionLock
-
-include $(BUILD_PACKAGE)
-
-endif
-
-# MTK_AUTO_TEST := no
diff --git a/proprietary/packages/apps/QuickSearchBox/Android.mk b/proprietary/packages/apps/QuickSearchBox/Android.mk
deleted file mode 100755
index 19583e347dd869d134de634cff0a87680b0096c6..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/QuickSearchBox/Android.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Copyright (C) 2014 MediaTek Inc.
-# Modification based on code covered by the mentioned copyright
-# and/or permission notice(s).
-#
-#
-# Copyright (C) 2009 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-BUILD_QSB := yes
-
-# M: Operator Specific Check to disable QSB
-ifeq ($(OPTR_SPEC_SEG_DEF), OP09_SPEC0212_SEGDEFAULT)
-   BUILD_QSB := no
-endif
-
-# M: A1 Specific Check to disable QSB
-ifdef MTK_A1_FEATURE
-    ifeq ($(strip $(MTK_A1_FEATURE)),yes)
-       BUILD_QSB := no
-    endif
-endif
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_JAVA_LIBRARIES += mediatek-framework \
-                        org.apache.http.legacy
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    guava \
-    android-common \
-    com.mediatek.qsb.ext
-
-LOCAL_SRC_FILES := \
-    $(call all-java-files-under, src) \
-    $(call all-logtags-files-under, src)
-
-LOCAL_OVERRIDES_PACKAGES := QuickSearchBox
-LOCAL_PACKAGE_NAME := MtkQuickSearchBox
-LOCAL_CERTIFICATE := shared
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-# M: Disable QSB for specific feature checks
-ifeq ($(strip $(BUILD_QSB)), yes)
-    include $(BUILD_PACKAGE)
-
-    # Also build our test apk
-    include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
diff --git a/proprietary/packages/apps/QuickSearchBox/benchmarks/Android.mk b/proprietary/packages/apps/QuickSearchBox/benchmarks/Android.mk
deleted file mode 100755
index cb9f87d5de1df1e5bc8e43b8b0b7d637b78a947c..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/QuickSearchBox/benchmarks/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (C) 2009 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SDK_VERSION := current
-
-# Only compile source java files in this apk.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_OVERRIDES_PACKAGES := QuickSearchBoxBenchmarks
-LOCAL_PACKAGE_NAME := MtkQuickSearchBoxBenchmarks
-LOCAL_CERTIFICATE := shared
-
-include $(BUILD_PACKAGE)
diff --git a/proprietary/packages/apps/QuickSearchBox/ext/Android.mk b/proprietary/packages/apps/QuickSearchBox/ext/Android.mk
deleted file mode 100755
index f46eaf3ba72cee2cb66f792ec926729d8b3084e9..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/QuickSearchBox/ext/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := com.mediatek.qsb.ext
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/proprietary/packages/apps/RCSe/Android.mk b/proprietary/packages/apps/RCSe/Android.mk
deleted file mode 100755
index 0786b9004ff2bd54052aae776f80bcf16129da60..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/RCSe/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
- # Copyright Statement:
- #
- # This software/firmware and related documentation ("MediaTek Software") are
- # protected under relevant copyright laws. The information contained herein
- # is confidential and proprietary to MediaTek Inc. and/or its licensors.
- # Without the prior written permission of MediaTek inc. and/or its licensors,
- # any reproduction, modification, use or disclosure of MediaTek Software,
- # and information contained herein, in whole or in part, shall be strictly prohibited.
- #
- # MediaTek Inc. (C) 2012. All rights reserved.
- #
- # BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
- # THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
- # RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
- # AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
- # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
- # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
- # NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
- # SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
- # SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
- # THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
- # THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
- # CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
- # SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
- # STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
- # CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
- # AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
- # OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
- # MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
- #
- # The following software/firmware and/or related documentation ("MediaTek Software")
- # have been modified by MediaTek Inc. All revisions are subject to any receiver's
- # applicable license agreements with MediaTek Inc.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/proprietary/packages/apps/RCSe/RcsApp/Android.mk b/proprietary/packages/apps/RCSe/RcsApp/Android.mk
deleted file mode 100755
index 3b7fe8a2d4d8b7d395eec29aff9af47a92bd0580..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/RCSe/RcsApp/Android.mk
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2011. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-
-##########################################################################
-# Build the RCS Application : Rcse.apk
-##########################################################################
-
-OPTR:= $(word 1,$(subst _,$(space),$(OPTR_SPEC_SEG_DEF)))
-
-ifneq ($(OPTR), OP01)
-
-include $(CLEAR_VARS)
-
-# This is the target being built. (Name of APK)
-LOCAL_PACKAGE_NAME := Rcse
-LOCAL_MODULE_TAGS := optional
-LOCAL_INSTRUMENTATION_FOR := Dialer
-LOCAL_APK_LIBRARIES := Contacts \
-  RcsStack
-LOCAL_JAVA_LIBRARIES += \
-	com.mediatek.incallui.ext \
-  com.mediatek.dialer.ext \
-	com.mediatek.phone.ext \
-  com.mediatek.mms.ext \
-	com.mediatek.settings.ext \
-  mediatek-framework \
-  ims-common
-
-LOCAL_STATIC_JAVA_LIBRARIES += com.android.vcard
-LOCAL_JAVA_LIBRARIES += telephony-common
-
-# Only compile source java files in this apk.
-LOCAL_SRC_FILES := \
-    $(call all-java-files-under, src/com/mediatek)\
-    $(call all-java-files-under, src/com/android)
-
-# Add AIDL files (the parcelable must not be added in SRC_FILES, but included in LOCAL_AIDL_INCLUDES)
-LOCAL_SRC_FILES += \
-    src/com/mediatek/rcse/api/terms/ITermsApi.aidl \
-    src/com/mediatek/rcse/api/IRegistrationStatusRemoteListener.aidl \
-    src/com/mediatek/rcse/service/IRegistrationStatus.aidl \
-    src/com/mediatek/rcse/api/ICapabilityRemoteListener.aidl \
-    src/com/mediatek/rcse/service/ICapabilities.aidl \
-    src/com/mediatek/rcse/service/IFlightMode.aidl \
-    src/com/android/server/power/IPreShutdown.aidl \
-    src/com/mediatek/rcse/plugin/apn/IRcseOnlyApnStatus.aidl \
-    src/com/mediatek/rcse/service/binder/IRemoteChatWindow.aidl \
-    src/com/mediatek/rcse/service/binder/IRemoteChatWindowManager.aidl \
-    src/com/mediatek/rcse/service/binder/IRemoteFileTransfer.aidl \
-    src/com/mediatek/rcse/service/binder/IRemoteGroupChatWindow.aidl \
-    src/com/mediatek/rcse/service/binder/IRemoteOne2OneChatWindow.aidl \
-    src/com/mediatek/rcse/service/binder/IRemoteReceivedChatMessage.aidl \
-    src/com/mediatek/rcse/service/binder/IRemoteSentChatMessage.aidl \
-    src/com/mediatek/rcse/service/IApiServiceWrapper.aidl \
-    src/com/mediatek/rcse/plugin/message/IRemoteWindowBinder.aidl \
-    src/com/mediatek/rcse/service/binder/IRemoteChatWindowMessage.aidl \
-    src/com/mediatek/rcse/service/binder/IRemoteBlockingRequest.aidl \
-    src/com/mediatek/rcse/api/INetworkConnectivity.aidl \
-    src/com/mediatek/rcse/api/INetworkConnectivityApi.aidl \    
-
-
-LOCAL_AIDL_INCLUDES += \
-    org/gsma/joyn/capability/Capabilities.aidl \
-    org/gsma/joyn/chat/ChatMessage.aidl \
-    org/gsma/joyn/chat/ConferenceUser.aidl \
-    
-#Added for JPE begin
-LOCAL_JAVASSIST_ENABLED := true
-LOCAL_JAVASSIST_OPTIONS := $(LOCAL_PATH)/jpe.config
-#Added for JPE end
-
-# Add classes used by reflection
-#LOCAL_PROGUARD_FLAG_FILES := proguard.cfg
-LOCAL_PROGUARD_ENABLED := disabled
-
-LOCAL_EMMA_COVERAGE_FILTER := +com.mediatek.*
-# Exclude the java files generaged by aidl files
-# Notice that the filter exclude method, so use * to cover all methods
-LOCAL_EMMA_COVERAGE_FILTER += -com.mediatek.rcse.service.binder.IRemoteChatWindow* \
-                              -com.mediatek.rcse.service.binder.IRemoteChatWindowManager* \
-                              -com.mediatek.rcse.service.binder.IRemoteChatWindowMessage* \
-                              -com.mediatek.rcse.service.binder.IRemoteFileTransfer* \
-                              -com.mediatek.rcse.service.binder.IRemoteGroupChatWindow* \
-                              -com.mediatek.rcse.service.binder.IRemoteOne2OneChatWindow* \
-                              -com.mediatek.rcse.service.binder.IRemoteReceivedChatMessage* \
-                              -com.mediatek.rcse.service.binder.IRemoteSentChatMessage* \
-                              -com.mediatek.rcse.plugin.message.IRemoteWindowBinder* \
-                              -com.mediatek.rcse.service.binder.IRemoteBlockingRequest* \
-                              -com.mediatek.rcse.api.IRegistrationStatusRemoteListener* \
-                              -com.mediatek.rcse.api.ICapabilityRemoteListener* \
-                              -com.mediatek.rcse.service.IRegistrationStatus* \
-                              -com.mediatek.rcse.service.ICapabilities* \
-                              -com.mediatek.rcse.service.IFlightMode* \
-                              -com.mediatek.rcse.service.IApiServiceWrapper* \
-                              -com.mediatek.rcse.plugin.apn.IRcseOnlyApnStatus*
-# Exclude the debug java files
-LOCAL_EMMA_COVERAGE_FILTER += -com.mediatek.rcse.settings.PhoneNumberToAccountSettings* \
-                              -com.mediatek.rcse.settings.ProvisionProfileSettings* \
-                              -com.mediatek.rcse.activities.ConfigMessageActicity* \
-                              -com.mediatek.rcse.activities.RoamingActivity*
-
-#Specify install path for MTK CIP solution
-ifeq ($(strip $(MTK_CIP_SUPPORT)),yes)
-LOCAL_MODULE_PATH := $(TARGET_CUSTOM_OUT)/plugin
-else
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/system/plugin
-endif
-
-# Tell it to build an APK
-include $(BUILD_PACKAGE)
-
-# Include plug-in's makefile to automated generate .mpinfo
-include vendor/mediatek/proprietary/frameworks/opt/plugin/mplugin.mk
-
-include $(CLEAR_VARS)
-#For auto test
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
diff --git a/proprietary/packages/apps/RCSe/RcsStack/Android.mk b/proprietary/packages/apps/RCSe/RcsStack/Android.mk
deleted file mode 100755
index 3966a31513721d7022ae0a33438161c0d61b20c6..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/RCSe/RcsStack/Android.mk
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2011. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-# Software Name : RCS IMS Stack
-#
-# Copyright (C) 2010 France Telecom S.A.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-
-##########################################################################
-# Build the RCS Sdk : joyn-api.jar
-##########################################################################
-
-#include $(CLEAR_VARS)
-#
-## This is the target being built. (Name of Jar)
-#LOCAL_MODULE := joyn-api
-#
-## Only compile source java files in this jar.
-#LOCAL_SRC_FILES := \
-#    $(call all-java-files-under, src/org)
-#
-## Add AIDL files (the parcelable must not be added in SRC_FILES, but included in LOCAL_AIDL_INCLUDES)
-#LOCAL_SRC_FILES += \
-#    src/org/gsma/joyn/IJoynServiceRegistrationListener.aidl\
-#    src/org/gsma/joyn/capability/ICapabilitiesListener.aidl\
-#    src/org/gsma/joyn/capability/ICapabilityService.aidl\
-#    src/org/gsma/joyn/chat/IChat.aidl\
-#    src/org/gsma/joyn/chat/IChatListener.aidl\
-#    src/org/gsma/joyn/chat/IChatService.aidl\
-#    src/org/gsma/joyn/chat/IGroupChatListener.aidl\
-#    src/org/gsma/joyn/chat/INewChatListener.aidl\
-#    src/org/gsma/joyn/chat/IGroupChat.aidl\
-#    src/org/gsma/joyn/chat/ISpamReportListener.aidl\
-#    src/org/gsma/joyn/gsh/IGeolocSharingListener.aidl\
-#    src/org/gsma/joyn/gsh/INewGeolocSharingListener.aidl\
-#    src/org/gsma/joyn/gsh/IGeolocSharing.aidl\
-#    src/org/gsma/joyn/gsh/IGeolocSharingService.aidl\
-#    src/org/gsma/joyn/ipcall/IIPCall.aidl\
-#    src/org/gsma/joyn/ipcall/IIPCallPlayer.aidl\
-#    src/org/gsma/joyn/ipcall/IIPCallRenderer.aidl\
-#    src/org/gsma/joyn/ipcall/IIPCallListener.aidl\
-#    src/org/gsma/joyn/ipcall/IIPCallPlayerListener.aidl\
-#    src/org/gsma/joyn/ipcall/IIPCallRendererListener.aidl\
-#    src/org/gsma/joyn/ipcall/IIPCallService.aidl\
-#    src/org/gsma/joyn/ipcall/INewIPCallListener.aidl\
-#    src/org/gsma/joyn/ish/IImageSharing.aidl\
-#    src/org/gsma/joyn/ish/IImageSharingListener.aidl\
-#    src/org/gsma/joyn/ish/IImageSharingService.aidl\
-#    src/org/gsma/joyn/ish/INewImageSharingListener.aidl\
-#    src/org/gsma/joyn/vsh/INewVideoSharingListener.aidl\
-#    src/org/gsma/joyn/vsh/IVideoSharingListener.aidl\
-#    src/org/gsma/joyn/vsh/IVideoPlayer.aidl\
-#    src/org/gsma/joyn/vsh/IVideoPlayerListener.aidl\
-#    src/org/gsma/joyn/vsh/IVideoRenderer.aidl\
-#    src/org/gsma/joyn/vsh/IVideoRendererListener.aidl\
-#    src/org/gsma/joyn/vsh/IVideoSharing.aidl\
-#    src/org/gsma/joyn/vsh/IVideoSharingService.aidl\
-#    src/org/gsma/joyn/session/IMultimediaSession.aidl\
-#    src/org/gsma/joyn/session/IMultimediaSessionListener.aidl\
-#    src/org/gsma/joyn/session/IMultimediaSessionService.aidl\
-#    src/org/gsma/joyn/ft/IFileTransfer.aidl\
-#    src/org/gsma/joyn/ft/IFileTransferService.aidl\
-#    src/org/gsma/joyn/ft/IFileTransferListener.aidl\
-#    src/org/gsma/joyn/ft/INewFileTransferListener.aidl\
-#    src/org/gsma/joyn/ft/IFileSpamReportListener.aidl\
-#    src/org/gsma/joyn/contacts/IContactsService.aidl\
-#    src/org/gsma/joyn/ICoreServiceWrapper.aidl \    
-#
-#
-##Specify install path for MTK CIP solution
-#ifeq ($(strip $(MTK_CIP_SUPPORT)),yes)
-#LOCAL_MODULE_PATH := $(TARGET_CUSTOM_OUT)/framework
-#endif
-#
-#LOCAL_PROGUARD_ENABLED := disabled
-#
-## Tell it to build an Jar
-#include $(BUILD_JAVA_LIBRARY)
-#
-##For make files
-#include $(CLEAR_VARS)
-
-##########################################################################
-# Build the RCS Sdk : RcsStack.apk
-##########################################################################
-
-include $(CLEAR_VARS)
-
-# This is the target being built. (Name of APK)
-LOCAL_PACKAGE_NAME := RcsStack
-LOCAL_MODULE_TAGS := optional
-
-
-
-LOCAL_CERTIFICATE := platform
-
-
-LOCAL_JAVA_LIBRARIES += \
-	bouncycastle \
-	mediatek-framework\
-	ims-common\
-	com.mediatek.settings.ext\
-	org.apache.http.legacy.boot
-
-LOCAL_JAVA_LIBRARIES += telephony-common
-
-# Only compile source java files in this apk.
-LOCAL_SRC_FILES := \
-    $(call all-java-files-under, src/com/orangelabs)\
-    $(call all-java-files-under, src/gov2)\
-    $(call all-java-files-under, src/javax2)\
-    $(call all-java-files-under, src/org)
-
-# Add AIDL files (the parcelable must not be added in SRC_FILES, but included in LOCAL_AIDL_INCLUDES)
-LOCAL_SRC_FILES += \
-    src/com/orangelabs/rcs/plugin/apn/IRcseOnlyApnStatus.aidl\
-    src/com/orangelabs/rcs/core/ims/network/INetworkConnectivity.aidl \
-    src/com/orangelabs/rcs/core/ims/network/INetworkConnectivityApi.aidl \
-    src/com/orangelabs/rcs/service/api/client/terms/ITermsApi.aidl \
-    src/org/gsma/joyn/ICoreServiceWrapper.aidl \
-    
-    
-
-# FRAMEWORKS_BASE_JAVA_SRC_DIRS comes from build/core/pathmap.mk
-LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS)
-LOCAL_AIDL_INCLUDES += \
-    org/gsma/joyn/capability/Capabilities.aidl \
-    org/gsma/joyn/chat/ChatMessage.aidl \
-    org/gsma/joyn/chat/ConferenceUser.aidl\
-
-#Added for JPE begin
-LOCAL_JAVASSIST_ENABLED := true
-LOCAL_JAVASSIST_OPTIONS := $(LOCAL_PATH)/jpe.config
-#Added for JPE end
-
-# Add classes used by reflection
-# LOCAL_PROGUARD_FLAG_FILES := proguard.cfg
-LOCAL_PROGUARD_ENABLED := disabled
-
-#Specify install path for MTK CIP solution
-ifeq ($(strip $(MTK_CIP_SUPPORT)),yes)
-LOCAL_MODULE_PATH := $(TARGET_CUSTOM_OUT)/app
-endif
-
-# Tell it to build an APK
-include $(BUILD_PACKAGE)
-include $(CLEAR_VARS)
-
-include $(BUILD_MULTI_PREBUILT)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/packages/apps/RegionalPhoneManager/Android.mk b/proprietary/packages/apps/RegionalPhoneManager/Android.mk
deleted file mode 100755
index afda4a21baa485c88e071059c1d15b90662e8fc2..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/RegionalPhoneManager/Android.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-    LOCAL_MODULE_TAGS := optional
-    
-    LOCAL_SRC_FILES := $(call all-java-files-under, src)
-    LOCAL_JAVA_LIBRARIES += mediatek-framework
-
-    LOCAL_STATIC_JAVA_LIBRARIES := \
-        android-common \
-        com.mediatek.rpm.ext
-
-    LOCAL_PACKAGE_NAME := RegionalPhoneManager
-    LOCAL_CERTIFICATE := platform
-
-    LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-    LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/packages/apps/RegionalPhoneManager/ext/Android.mk b/proprietary/packages/apps/RegionalPhoneManager/ext/Android.mk
deleted file mode 100755
index 62aafb909a9a78b8c3bad00170c78c1edc588dbf..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/RegionalPhoneManager/ext/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := com.mediatek.rpm.ext
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/proprietary/packages/apps/SchedulePowerOnOff/Android.mk b/proprietary/packages/apps/SchedulePowerOnOff/Android.mk
deleted file mode 100755
index c3fc01eedd058cbdfbe0e27389eb4f6b2a691a56..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/SchedulePowerOnOff/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-ifneq ($(strip $(MTK_A1_FEATURE)),yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_JAVA_LIBRARIES := bouncycastle
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := SchedulePowerOnOff
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
-# Use the folloing include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
diff --git a/proprietary/packages/apps/SelfRegister/Android.mk b/proprietary/packages/apps/SelfRegister/Android.mk
deleted file mode 100755
index a599f19b9521767a0107432ca065183de5ad2252..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/SelfRegister/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-ifeq ($(strip $(OPTR_SPEC_SEG_DEF)),OP09_SPEC0212_SEGDEFAULT)
-ENABLE_DATA_REGISTER := true
-endif
-
-ifeq ($(strip $(OPTR_SPEC_SEG_DEF)),OP09_SPEC0212_SEGC)
-ENABLE_DATA_REGISTER := true
-endif
-
-ifeq ($(strip $(MTK_CT4GREG_APP)),yes)
-ENABLE_DATA_REGISTER := true
-endif
-
-ifeq ($(strip $(ENABLE_DATA_REGISTER)),true)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PROGUARD_FLAG_FILES :=proguard.cfg
-LOCAL_PROGUARD_ENABLED := disabled
-
-LOCAL_SRC_FILES := $(call all-java-files-under,src)
-
-LOCAL_PACKAGE_NAME := SelfRegister
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES += mediatek-framework \
-                        org.apache.http.legacy \
-                        telephony-common
-
-include $(BUILD_PACKAGE)
-
-endif
diff --git a/proprietary/packages/apps/SelfRegister/tests/Android.mk b/proprietary/packages/apps/SelfRegister/tests/Android.mk
deleted file mode 100755
index 011d219d9c5dbb7bf8129a75e24b3dbed9d8879e..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/SelfRegister/tests/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifeq ($(strip $(MTK_AUTO_TEST)), yes) 
-    LOCAL_PATH:= $(call my-dir)
-    include $(CLEAR_VARS)
-
-    # We only want this apk build for tests.
-    LOCAL_MODULE_TAGS := tests
-
-    LOCAL_JAVA_LIBRARIES := android.test.runner
-    LOCAL_JAVA_LIBRARIES += mediatek-framework
-    
-    #Add for juint report
-    LOCAL_STATIC_JAVA_LIBRARIES := libjunitreport-for-tests
-    #End add
-
-    # Include all test java files.
-    LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-    LOCAL_PACKAGE_NAME := SelfRegisterTests
-
-    LOCAL_CERTIFICATE := platform
-
-    LOCAL_INSTRUMENTATION_FOR := SelfRegister
-
-    include $(BUILD_PACKAGE)
-
-    # Use the following include to make our test apk.
-    include $(call all-makefiles-under,$(LOCAL_PATH))
-    
-    #Add for junit report    
-    include $(CLEAR_VARS)
-    LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := libjunitreport-for-tests:android-junit-report-1.2.6.jar
-    include $(BUILD_MULTI_PREBUILT)
-    #Edd add
-#endif
diff --git a/proprietary/packages/apps/SensorHub/Android.mk b/proprietary/packages/apps/SensorHub/Android.mk
deleted file mode 100755
index f0f8e3c168c047475664ecd34db480005212baec..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/SensorHub/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-# Copyright 2007-2008 The Android Open Source Project
-
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-LOCAL_PACKAGE_NAME := SensorHub
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
diff --git a/proprietary/packages/apps/SimLock/Android.mk b/proprietary/packages/apps/SimLock/Android.mk
deleted file mode 100755
index 69d7236a3a75960c8f1bf6743276909095c8ef54..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/SimLock/Android.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-ifeq ($(MTK_INTERNAL), yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_PACKAGE_NAME := EngineerModeSim
-LOCAL_CERTIFICATE := platform
-LOCAL_JAVA_LIBRARIES += mediatek-framework telephony-common
-
-include $(BUILD_PACKAGE)
-
-# Use the folloing include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
-
diff --git a/proprietary/packages/apps/SmartMotion/Android.mk b/proprietary/packages/apps/SmartMotion/Android.mk
deleted file mode 100755
index c7d490b436f1c48a19ed55bdb58bc19fee656cfe..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/SmartMotion/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-
-ifeq ($(MTK_SENSOR_HUB_SUPPORT), yes)
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-#LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-# for mediatek sdk MediaRecorderEx and StorageManagerEx
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-
-LOCAL_PACKAGE_NAME := SmartMotion
-LOCAL_CERTIFICATE := platform
-include $(BUILD_PACKAGE)
-include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
diff --git a/proprietary/packages/apps/SmsReg/Android.mk b/proprietary/packages/apps/SmsReg/Android.mk
deleted file mode 100755
index 0938aeaa2bd5207470ad6a5d6bd6ce51960a8740..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/SmsReg/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-ifeq ($(MTK_SMSREG_APP),yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-#LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_SRC_FILES := $(call all-java-files-under,src)
-
-LOCAL_PACKAGE_NAME := SmsReg
-
-#LOCAL_PROGUARD_ENABLED := full
-
-LOCAL_JAVA_LIBRARIES += telephony-common
-LOCAL_JAVA_LIBRARIES += mediatek-framework mediatek-telephony-common
-
-include $(BUILD_PACKAGE)
-
-include $(CLEAR_VARS)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
diff --git a/proprietary/packages/apps/SmsReg/tests/Android.mk b/proprietary/packages/apps/SmsReg/tests/Android.mk
deleted file mode 100755
index 49e474d8ad66e03d20f8c5329a540dc7100a0549..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/SmsReg/tests/Android.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-ifeq ($(strip $(MTK_AUTO_TEST)), yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-LOCAL_STATIC_JAVA_LIBRARIES := librobotium4 junit-report
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := SmsRegTests
-LOCAL_INSTRUMENTATION_FOR := SmsReg
-
-include $(BUILD_PACKAGE)
-
-endif
diff --git a/proprietary/packages/apps/Stk/Android.mk b/proprietary/packages/apps/Stk/Android.mk
deleted file mode 100755
index 868031c9008290f0c48b5cdde746ba4b306482d8..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Stk/Android.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-# Copyright 2007-2008 The Android Open Source Project
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-ifneq ($(strip $(MTK_EMULATOR_SUPPORT)), yes)
-#ifndef MTK_TB_WIFI_3G_MODE
-ifneq ($(strip $(MTK_TB_WIFI_3G_MODE)),WIFI_ONLY)
-ifneq ($(strip $(MTK_MODEM_SUPPORT)), no)
-ifneq ($(strip $(GEMINI)), yes)
-    ifeq (OP01,$(word 1,$(subst _, ,$(OPTR_SPEC_SEG_DEF))))
-        LOCAL_MANIFEST_FILE := single/cmcc/AndroidManifest.xml
-    else
-        ifeq (OP02,$(word 1,$(subst _, ,$(OPTR_SPEC_SEG_DEF))))
-            LOCAL_MANIFEST_FILE := single/cu/AndroidManifest.xml
-        else
-            ifeq (OP03,$(word 1,$(subst _, ,$(OPTR_SPEC_SEG_DEF))))
-                LOCAL_MANIFEST_FILE := single/orange/AndroidManifest.xml
-            else
-                LOCAL_MANIFEST_FILE := single/AndroidManifest.xml
-            endif
-        endif
-    endif
-else
-    ifeq (OP02,$(word 1,$(subst _, ,$(OPTR_SPEC_SEG_DEF))))
-        LOCAL_MANIFEST_FILE := cu/AndroidManifest.xml
-    endif
-endif
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-com.mediatek.stk.ext
-LOCAL_MODULE_TAGS := optional
-LOCAL_JAVA_LIBRARIES += telephony-common \
-                        mediatek-framework
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-#LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_PACKAGE_NAME := Stk1
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-
-include $(BUILD_PACKAGE)
-include $(call all-makefiles-under,$(LOCAL_PATH))
-endif #MTK_MODEM_SUPPORT
-endif #MTK_TB_WIFI_3G_MODE
-endif
diff --git a/proprietary/packages/apps/Stk/ext/Android.mk b/proprietary/packages/apps/Stk/ext/Android.mk
deleted file mode 100755
index 86b6057a381e1c8305bd9b31a4275401fee7facd..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Stk/ext/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_JAVA_LIBRARIES := mediatek-framework
-LOCAL_JAVA_LIBRARIES += telephony-common
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-
-LOCAL_MODULE := com.mediatek.stk.ext
-
-LOCAL_CERTIFICATE := platform
-
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
diff --git a/proprietary/packages/apps/Stk/tests/Android.mk b/proprietary/packages/apps/Stk/tests/Android.mk
deleted file mode 100755
index c286d3e97694d39067a9678c805590ec5e8e9ce3..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/Stk/tests/Android.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := tests
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common
-LOCAL_STATIC_JAVA_LIBRARIES := librobotium4 junit-report
-
-LOCAL_CERTIFICATE := shared
-LOCAL_CERTIFICATE := platform
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := Stk1Tests
-
-LOCAL_INSTRUMENTATION_FOR := Stk1
-
-
-include $(BUILD_PACKAGE)
-
-
-
-###############
-
-# Use the folloing include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/packages/apps/SystemUpdateAssistant/Android.mk b/proprietary/packages/apps/SystemUpdateAssistant/Android.mk
deleted file mode 100755
index 28b55335835ed910553eb0f8b632051945748fad..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/SystemUpdateAssistant/Android.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-ifeq ($(MTK_SYSTEM_UPDATE_SUPPORT), yes)
-LOCAL_PATH:= $(call my-dir)
-
-# the library
-# ============================================================
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := \
- 	$(call all-java-files-under,src) \
-
-LOCAL_PACKAGE_NAME := SystemUpdateAssistant
-LOCAL_CERTIFICATE := platform
-#LOCAL_MODULE:= com.mediatek.systemupdate
-
-include $(BUILD_PACKAGE)
-
-endif
-
diff --git a/proprietary/packages/apps/TeledongleDemo/Android.mk b/proprietary/packages/apps/TeledongleDemo/Android.mk
deleted file mode 100755
index 518f362c88d48354585177d3745ac589ade7136c..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/TeledongleDemo/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := TeledongleDemo
-LOCAL_MODULE_TAGS := optional
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES := tedongle-telephony
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-# Flag for ram optimize.
-ifeq (yes, strip$(MTK_GMO_RAM_OPTIMIZE))
-    LOCAL_AAPT_FLAGS := --utf16
-endif
-
-include $(BUILD_PACKAGE)
-
-# Build the test package
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/packages/apps/VendorEmail/Android.mk b/proprietary/packages/apps/VendorEmail/Android.mk
deleted file mode 100755
index 4711e507f40dbd355a39cefa9ae00d6e80d064ef..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/VendorEmail/Android.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2008, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-res_dir := res
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-
-LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir))
-
-LOCAL_CERTIFICATE := platform
-
-LOCAL_PACKAGE_NAME := VendorEmail
-
-
-include $(BUILD_PACKAGE)
-
-# only include rules to build other stuff for the original package, not the derived package.
-ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
-# additionally, build unit tests in a separate .apk
-include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
\ No newline at end of file
diff --git a/proprietary/packages/apps/VoiceCommand/Android.mk b/proprietary/packages/apps/VoiceCommand/Android.mk
deleted file mode 100755
index f5f319fb99efd7e2f16baadd35f04ce6db575caa..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/VoiceCommand/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_SRC_FILES += src/com/mediatek/voicecommand/service/IVoiceWakeupInteractionService.aidl \
-                   src/com/mediatek/voicecommand/service/IVoiceWakeupInteractionCallback.aidl
-
-LOCAL_PACKAGE_NAME := VoiceCommand
-# Enroll sound model to Native, must need a priv app.
-LOCAL_PRIVILEGED_MODULE := true
-
-LOCAL_JNI_SHARED_LIBRARIES := libvoicerecognition_jni
-LOCAL_MULTILIB := 32
-#LOCAL_CERTIFICATE := media
-LOCAL_CERTIFICATE := platform
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-LOCAL_EMMA_COVERAGE_FILTER := +com.mediatek.voicecommand.adapter.*\
-                              +com.mediatek.voicecommand.business.*\
-                              +com.mediatek.voicecommand.cfg.*\
-                              +com.mediatek.voicecommand.data.*\
-                              +com.mediatek.voicecommand.mgr.*\
-                              +com.mediatek.voicecommand.service.*\
-                              +com.mediatek.voicecommand.voicesettings.*
-
-#EMMA_INSTRUMENT := true
-
-include $(BUILD_PACKAGE)
-
-# Use the following include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/proprietary/packages/apps/VoiceCommand/tests/Android.mk b/proprietary/packages/apps/VoiceCommand/tests/Android.mk
deleted file mode 100755
index dc7eb997d750c308162be382fbefe23342a1c52c..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/VoiceCommand/tests/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := librobotium4
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := VoiceCommandTests
-
-LOCAL_INSTRUMENTATION_FOR := VoiceCommand
-
-
-include $(BUILD_PACKAGE)
diff --git a/proprietary/packages/apps/VoiceExtension/Android.mk b/proprietary/packages/apps/VoiceExtension/Android.mk
deleted file mode 100755
index fda334e30ff3eaa5b7cba27f97b9ed1dd3136001..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/VoiceExtension/Android.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := VoiceExtension
-#LOCAL_CERTIFICATE := media
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JNI_SHARED_LIBRARIES := libvie_jni
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-LOCAL_MULTILIB := 32
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-LOCAL_EMMA_COVERAGE_FILTER := +com.mediatek.voiceextension.*\
-                              +com.mediatek.voiceextension.command.*\
-                              +com.mediatek.voiceextension.common.*\
-                              +com.mediatek.voiceextension.swip.*
-
-#EMMA_INSTRUMENT := true
-
-include $(BUILD_PACKAGE)
-
-# Use the following include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/packages/apps/VoiceUnlock/Android.mk b/proprietary/packages/apps/VoiceUnlock/Android.mk
deleted file mode 100755
index 9aa72790c2e39f621a8d7b89ce87ae5f7f4c101a..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/VoiceUnlock/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_JAVA_LIBRARIES := bouncycastle
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := VoiceUnlock
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
-# Use the folloing include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/proprietary/packages/apps/WiFiSDIOTest/Android.mk b/proprietary/packages/apps/WiFiSDIOTest/Android.mk
deleted file mode 100755
index 5fde9c5712c5fd412d76bf7ede5968f3ebe40edf..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/WiFiSDIOTest/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_PACKAGE_NAME := WiFiSDIOTest
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
diff --git a/proprietary/packages/apps/WiFiTest/Android.mk b/proprietary/packages/apps/WiFiTest/Android.mk
deleted file mode 100755
index 0d1eb4456b7245f7ba60c8e03884d5bab1e15c72..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/WiFiTest/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_MODULE_TAGS := eng
-LOCAL_PACKAGE_NAME := WiFiTest
-LOCAL_PRIVILEGED_MODULE := true
-
-LOCAL_CERTIFICATE := platform
-
-
-
-
-include $(BUILD_PACKAGE)
-
-# Use the folloing include to make our test apk.
-# include $(call all-makefiles-under,$(LOCAL_PATH))
-
diff --git a/proprietary/packages/apps/YGPS/Android.mk b/proprietary/packages/apps/YGPS/Android.mk
deleted file mode 100755
index fbc137a1d6de5cb891ca37961ddc20d1665dedd9..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/YGPS/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-ifeq ($(MTK_GPS_SUPPORT),yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_PACKAGE_NAME := YGPS
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
-# Use the folloing include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
diff --git a/proprietary/packages/apps/YGPS/tests/Android.mk b/proprietary/packages/apps/YGPS/tests/Android.mk
deleted file mode 100755
index 4498e3b2e6d677a27f0384aa9cf837705783cda6..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/YGPS/tests/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifeq ($(strip $(MTK_AUTO_TEST)), yes)
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := librobotium4
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := YGPSTests
-
-LOCAL_INSTRUMENTATION_FOR := YGPS
-
-include $(BUILD_PACKAGE)
-#endif
diff --git a/proprietary/packages/apps/iSMS/Android.mk b/proprietary/packages/apps/iSMS/Android.mk
deleted file mode 100755
index 5271161ad73a1eeddea1aab9fbfd90360f6af8d3..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/iSMS/Android.mk
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2012. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-ifeq ($(strip $(MTK_ISMS_SUPPORT)), yes)
-$(warning MTK_ISMS_SUPPORT=yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PROGUARD_ENABLED := disabled
-res_dir := res
-
-LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/,$(res_dir))
-LOCAL_AAPT_FLAGS := --auto-add-overlay
-
-LOCAL_MODULE_TAGS := optional
-#LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_SRC_FILES += $(call all-java-files-under, plugin/src)
-LOCAL_PACKAGE_NAME :=  ISmsService
-LOCAL_JNI_SHARED_LIBRARIES := libhpe \
-                              liblocSDK5
-LOCAL_STATIC_JAVA_LIBRARIES := hpe \
-                               fastjson-1.1.27 \
-                               Hstat \
-                               locSDK_5.0
-
-# Put plugin apk together to specific folder
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/system/plugin
-
-# link your plug-in interface .jar here
-LOCAL_JAVA_LIBRARIES += com.mediatek.mms.ext
-include $(BUILD_PACKAGE)
-
-# Include plug-in's makefile to automated generate .mpinfo
-include vendor/mediatek/proprietary/frameworks/opt/plugin/mplugin.mk
-
-include $(CLEAR_VARS)
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := hpe:libs/hpe.jar\
-                            fastjson-1.1.27:libs/fastjson-1.1.27.jar \
-                            Hstat:libs/Hstat.jar \
-                            locSDK_5.0:libs/locSDK_5.0.jar
-include $(BUILD_MULTI_PREBUILT)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-else
-$(warning MTK_ISMS_SUPPORT=no)
-endif
-
diff --git a/proprietary/packages/apps/iSMS/libs/Android.mk b/proprietary/packages/apps/iSMS/libs/Android.mk
deleted file mode 100755
index d4c47fc34fc9b2621361f3eb5575cd7fdc051c82..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/iSMS/libs/Android.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2012. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-ifeq ($(strip $(TARGET_ARCH)), arm)
-$(warning libsL32bit)
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libhpe.so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := liblocSDK5.so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib
-include $(BUILD_PREBUILT)
-
-else
-$(warning libsL64bit)
-endif
diff --git a/proprietary/packages/apps/iSMS/libs64/Android.mk b/proprietary/packages/apps/iSMS/libs64/Android.mk
deleted file mode 100755
index 7aed7596f99fea2260f965099971ac7ec262d7fc..0000000000000000000000000000000000000000
--- a/proprietary/packages/apps/iSMS/libs64/Android.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2012. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-ifeq ($(strip $(TARGET_ARCH)), arm64)
-$(warning libs64L64bit)
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libhpe.so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib64
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := liblocSDK5.so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib64
-include $(BUILD_PREBUILT)
-
-else
-$(warning libs64L32bit)
-endif
diff --git a/proprietary/packages/providers/DrmProvider/Android.mk b/proprietary/packages/providers/DrmProvider/Android.mk
deleted file mode 100755
index c88b9c580b4393a7685d626e2f0fb8cfca77e39b..0000000000000000000000000000000000000000
--- a/proprietary/packages/providers/DrmProvider/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_JAVA_LIBRARIES := telephony-common
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-
-LOCAL_PACKAGE_NAME := DrmProvider
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
diff --git a/proprietary/packages/services/AtciService/Android.mk b/proprietary/packages/services/AtciService/Android.mk
deleted file mode 100755
index e4f5fff20c29e9227dfe61926f79e3d43fd23dde..0000000000000000000000000000000000000000
--- a/proprietary/packages/services/AtciService/Android.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-ifneq ($(strip $(MTK_DISABLE_ATCIJ)), yes)
-ifneq ($(strip $(MTK_PLATFORM)),)
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := AtciService
-LOCAL_MULTILIB := both
-LOCAL_CERTIFICATE := platform
-LOCAL_REQUIRED_MODULES := libatciserv_jni
-
-LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-include $(BUILD_PACKAGE)
-
-# Use the folloing include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
-endif
diff --git a/proprietary/packages/services/AtciService/jni/Android.mk b/proprietary/packages/services/AtciService/jni/Android.mk
deleted file mode 100755
index 85496e02c0db2c7df246529e2cdf78106eefa130..0000000000000000000000000000000000000000
--- a/proprietary/packages/services/AtciService/jni/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SHARED_LIBRARIES += libcutils
-
-ifeq ($(TARGET_ARCH), arm)
-ifeq ($(MTK_BLUEANGEL_SUPPORT),yes)
-LOCAL_SHARED_LIBRARIES += libexttestmode
-LOCAL_CFLAGS += -D__MTK_BT_SUPPORT__
-endif
-endif
-
-LOCAL_SRC_FILES := atciserv_jni.cpp
-
-LOCAL_C_INCLUDES := $(JNI_H_INCLUDE)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE := libatciserv_jni
-
-LOCAL_PRELINK_MODULE := false
-include $(BUILD_SHARED_LIBRARY)
-
-
diff --git a/proprietary/packages/services/AtciService/tests/Android.mk b/proprietary/packages/services/AtciService/tests/Android.mk
deleted file mode 100755
index 6e12fc5d553e3ea91e12968d1de7f9cb0a4a8960..0000000000000000000000000000000000000000
--- a/proprietary/packages/services/AtciService/tests/Android.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-#
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := optional
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-#LOCAL_SRC_FILES += $(call all-java-files-under, ../src)
-#LOCAL_SRC_FILES += ../src/com/mediatek/atci/service/IFMRadioService.aidl
-
-LOCAL_PACKAGE_NAME := AtciServiceTestCase
-
-LOCAL_CERTIFICATE := platform
-
-LOCAL_INSTRUMENTATION_FOR := AtciService
-
-# uncomment when dalvik.annotation.Test* are removed or part of SDK
-#LOCAL_SDK_VERSION := current
-
-include $(BUILD_PACKAGE)
-
-# Build the test APK using its own makefile, and any other CTS-related packages
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
diff --git a/proprietary/packages/services/Ims/Android.mk b/proprietary/packages/services/Ims/Android.mk
deleted file mode 100755
index 4b3200c00360d6e6c0c7d13ded6d49d725d2b94c..0000000000000000000000000000000000000000
--- a/proprietary/packages/services/Ims/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-# Build the Ims OEM implementation including imsservice, imsadapter, imsriladapter.
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_JAVA_LIBRARIES += telephony-common
-LOCAL_JAVA_LIBRARIES += mediatek-framework
-LOCAL_JAVA_LIBRARIES += ims-common
-LOCAL_STATIC_JAVA_LIBRARIES += wfo-common
-
-# Use SimServs.jar for VoLTE MMTelSS Package
-LOCAL_STATIC_JAVA_LIBRARIES += Simservs
-
-LOCAL_PACKAGE_NAME := ImsService
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-
-LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_PROGUARD_FLAGS := $(proguard.flags)
-
-include $(BUILD_PACKAGE)
diff --git a/proprietary/packages/services/SmartcardService/Android.mk b/proprietary/packages/services/SmartcardService/Android.mk
deleted file mode 100755
index 8f969c89034b12860b145c3d21bec4bb087373df..0000000000000000000000000000000000000000
--- a/proprietary/packages/services/SmartcardService/Android.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-# Does not support ASSD by now.
-include $(call all-subdir-makefiles)
diff --git a/proprietary/packages/services/SmartcardService/SmartCardService/Android.mk b/proprietary/packages/services/SmartcardService/SmartCardService/Android.mk
deleted file mode 100755
index 2e19ae80d1c9bc3fb8e3b06f3d7aded66f3cf691..0000000000000000000000000000000000000000
--- a/proprietary/packages/services/SmartcardService/SmartCardService/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-ifeq ($(MTK_NFC_OMAAC_SUPPORT), yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := SmartcardService
-LOCAL_SRC_FILES := ./SmartcardService.apk
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-
-include $(BUILD_PREBUILT)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
-
-#android:versionName="4.0.0.23.5
diff --git a/proprietary/packages/services/SmartcardService/SmartCardService/openmobileapi/Android.mk b/proprietary/packages/services/SmartcardService/SmartCardService/openmobileapi/Android.mk
deleted file mode 100755
index e23596bfccb0b3d0939afbe3b6001e4de15e4637..0000000000000000000000000000000000000000
--- a/proprietary/packages/services/SmartcardService/SmartCardService/openmobileapi/Android.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-#================================================
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := org.simalliance.openmobileapi.xml
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-
-include $(BUILD_PREBUILT)
-#================================================
-include $(CLEAR_VARS)
-
-LOCAL_MODULE:= org.simalliance.openmobileapi.jar
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_MODULE_PATH := $(TARGET_OUT_JAVA_LIBRARIES)
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-
-include $(BUILD_PREBUILT)
-
diff --git a/proprietary/packages/services/SmartcardService/Uicc1Terminal/Android.mk b/proprietary/packages/services/SmartcardService/Uicc1Terminal/Android.mk
deleted file mode 100755
index d083168dfd01280aaaff326b6e65e57fa5399cb2..0000000000000000000000000000000000000000
--- a/proprietary/packages/services/SmartcardService/Uicc1Terminal/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-ifeq ($(MTK_NFC_OMAAC_SUPPORT), yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := Uicc1Terminal
-LOCAL_SRC_FILES := ./Uicc1Terminal.apk
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-
-include $(BUILD_PREBUILT)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
-
-#android:versionName="4.0.0.23.2
diff --git a/proprietary/packages/services/SmartcardService/Uicc2Terminal/Android.mk b/proprietary/packages/services/SmartcardService/Uicc2Terminal/Android.mk
deleted file mode 100755
index c22a8032b9e3953fedecd002340d8aae3a346102..0000000000000000000000000000000000000000
--- a/proprietary/packages/services/SmartcardService/Uicc2Terminal/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-ifeq ($(MTK_NFC_OMAAC_SUPPORT), yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := Uicc2Terminal
-LOCAL_SRC_FILES := ./Uicc2Terminal.apk
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-
-include $(BUILD_PREBUILT)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
-
-#android:versionName="4.0.0.23.1
diff --git a/proprietary/packages/services/SmartcardService/eSETerminal/Android.mk b/proprietary/packages/services/SmartcardService/eSETerminal/Android.mk
deleted file mode 100755
index 8f56f9591eeb95273b0781dc91fdaf1de2d74665..0000000000000000000000000000000000000000
--- a/proprietary/packages/services/SmartcardService/eSETerminal/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-ifeq ($(MTK_NFC_OMAAC_SUPPORT), yes)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := eSETerminal
-LOCAL_SRC_FILES := ./eSETerminal.apk
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-
-include $(BUILD_PREBUILT)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
-
-#android:versionName="4.0.0.23.3
diff --git a/proprietary/packages/services/WifiOffload/Android.mk b/proprietary/packages/services/WifiOffload/Android.mk
deleted file mode 100755
index ba4811a7bf5a1514a75b4258c0a71e617b6e420c..0000000000000000000000000000000000000000
--- a/proprietary/packages/services/WifiOffload/Android.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-# interface lib
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, lib/src)
-
-LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/lib/src
-
-# aidl
-LOCAL_SRC_FILES += \
-    lib/src/com/mediatek/wfo/IWifiOffloadService.aidl \
-    lib/src/com/mediatek/wfo/IWifiOffloadListener.aidl
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := wfo-common
-
-include $(BUILD_JAVA_LIBRARY)
-
-# JNI
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-    jni/com_mediatek_wfo_WifiOffloadService.c
-
-LOCAL_MULTILIB := both
-LOCAL_ARM_MODE := arm
-
-LOCAL_SHARED_LIBRARIES := \
-    libnativehelper \
-    libcutils \
-    liblog \
-    libutils \
-    libmal \
-    libmdfx
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libwfo_jni
-
-include $(BUILD_SHARED_LIBRARY)
-
-# apk
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_JAVA_LIBRARIES += telephony-common ims-common
-LOCAL_STATIC_JAVA_LIBRARIES += wfo-common
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := WfoService
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-
-LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_PROGUARD_FLAGS := $(proguard.flags)
-
-include $(BUILD_PACKAGE)
diff --git a/proprietary/prebuilts/sdk/Android.mk b/proprietary/prebuilts/sdk/Android.mk
deleted file mode 100755
index 5ca23ebb64d861b957c7c40e6f1432c962514b83..0000000000000000000000000000000000000000
--- a/proprietary/prebuilts/sdk/Android.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2014. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-# Define MediaTek SDK API libraries (stub) for linking using LOCAL_JAVA_LIBRARIES.
-# Targets are dynamically generated based on number of API levels under prebuilts/sdk/ folder.
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-TARGET_AVAILABLE_MTK_SDK_VERSIONS := $(call numerically_sort,\
-    $(patsubst $(LOCAL_PATH)/%/mediatek-android.jar,%, \
-    $(wildcard $(LOCAL_PATH)/*/mediatek-android.jar)))
-
-# $(1): MediaTek SDK Level (e.g. 1, 2 or 3)
-define _copy_prebuilt_mtk_sdk_to_the_right_place
-_cpsttrp_mtk_src_jar := $(LOCAL_PATH)/$(1)/mediatek-android.jar
-_cpsttrp_mtk_sdk_intermediates := $(call intermediates-dir-for,JAVA_LIBRARIES,mtk_sdk_v$(1),,COMMON)
-$$(_cpsttrp_mtk_sdk_intermediates)/classes.jar: $$(_cpsttrp_mtk_src_jar) | $(ACP)
-	$$(call copy-file-to-target)
-
-$$(_cpsttrp_mtk_sdk_intermediates)/javalib.jar: $$(_cpsttrp_mtk_sdk_intermediates)/classes.jar | $(ACP)
-	$$(call copy-file-to-target)
-endef
-
-$(foreach s,$(TARGET_AVAILABLE_MTK_SDK_VERSIONS),$(eval $(call _copy_prebuilt_mtk_sdk_to_the_right_place,$(s))))
diff --git a/proprietary/scripts/ptgen/mt6757/Android.mk b/proprietary/scripts/ptgen/mt6757/Android.mk_
similarity index 99%
rename from proprietary/scripts/ptgen/mt6757/Android.mk
rename to proprietary/scripts/ptgen/mt6757/Android.mk_
index d9c09141cd36a94505c2f6ff9bea638e20159c34..c72312ab1347218b15542bdc62efdd2602fa57e2 100755
--- a/proprietary/scripts/ptgen/mt6757/Android.mk
+++ b/proprietary/scripts/ptgen/mt6757/Android.mk_
@@ -33,7 +33,7 @@
 # applicable license agreements with MediaTek Inc.
 
 
-ifeq ($(MTK_PLATFORM),MT8163)
+ifeq ($(MTK_PLATFORM),MT6757)
 # Deump debug information of build enviornment
 $(info Ptgen Env of Andorid)
 $(info value of MTK_PLATFORM is: $(MTK_PLATFORM))
diff --git a/proprietary/scripts/ptgen/mt8163/Android.mk b/proprietary/scripts/ptgen/mt8163/Android.mk
deleted file mode 100755
index d9c09141cd36a94505c2f6ff9bea638e20159c34..0000000000000000000000000000000000000000
--- a/proprietary/scripts/ptgen/mt8163/Android.mk
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright Statement:
-#
-# This software/firmware and related documentation ("MediaTek Software") are
-# protected under relevant copyright laws. The information contained herein
-# is confidential and proprietary to MediaTek Inc. and/or its licensors.
-# Without the prior written permission of MediaTek inc. and/or its licensors,
-# any reproduction, modification, use or disclosure of MediaTek Software,
-# and information contained herein, in whole or in part, shall be strictly prohibited.
-
-# MediaTek Inc. (C) 2010. All rights reserved.
-#
-# BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
-# THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
-# RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
-# AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
-# NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
-# SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
-# SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
-# THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
-# THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
-# CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
-# SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
-# STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
-# CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
-# AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
-# OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
-# MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
-#
-# The following software/firmware and/or related documentation ("MediaTek Software")
-# have been modified by MediaTek Inc. All revisions are subject to any receiver's
-# applicable license agreements with MediaTek Inc.
-
-
-ifeq ($(MTK_PLATFORM),MT8163)
-# Deump debug information of build enviornment
-$(info Ptgen Env of Andorid)
-$(info value of MTK_PLATFORM is: $(MTK_PLATFORM))
-$(info value of PRODUCT_OUT is: $(PRODUCT_OUT))
-$(info value of TARGET_OUT_INTERMEDIATES is: $(TARGET_OUT_INTERMEDIATES))
-$(info value of MTK_TARGET_PROJECT is: $(MTK_TARGET_PROJECT))
-$(info value of PLATFORM is: $(PLATFORM))
-$(info value of MTK_PROJECT is: $(MTK_PROJECT))
-$(info value of MTK_ATF_SUPPORT is: $(MTK_ATF_SUPPORT))
-$(info value of MTK_TEE_SUPPORT is: $(MTK_TEE_SUPPORT))
-
-
-#input file for ptgen
-ifeq ($(MTK_GPT_SCHEME_SUPPORT),yes)
-PTGEN_PERL = device/mediatek/build/build/tools/ptgen/$(MTK_PLATFORM)/ptgen.pl
-else
-PTGEN_PERL = device/mediatek/build/build/tools/ptgen/$(MTK_PLATFORM)/ptgen_pmt.pl
-PTGENXLS_PERL = ./device/mediatek/build/build/tools/ptgen/$(MTK_PLATFORM)/ptgen_xls.pl
-endif
-
-OTA_SCATTER_PERL = device/mediatek/build/build/tools/ptgen/ota_scatter.pl
-CHIP = $(shell echo $(TARGET_BOARD_PLATFORM) | tr '[a-z]' '[A-Z]')
-
-ifneq ($(MTK_GPT_SCHEME_SUPPORT),yes)
-#find the associated partition table from project setting
-PTGEN_XLS:=$(shell PLATFORM=${MTK_PLATFORM} PROJECT=${MTK_TARGET_PROJECT} perl ${PTGENXLS_PERL})
-endif
-
-#outpath
-PTGEN_PROJECT_OUT:=$(PRODUCT_OUT)
-PTGEN_MK_OUT=${TARGET_OUT_INTERMEDIATES}/PTGEN
-
-ifneq ($(MTK_GPT_SCHEME_SUPPORT),yes)
-TMP_OUT_PATH=${TARGET_OUT_INTERMEDIATES}/PTGEN_TEMP
-endif
-
-droidcore: $(PTGEN_MK_OUT)/partition_size.mk
-ptgen: $(PTGEN_MK_OUT)/partition_size.mk
-
-$(PTGEN_MK_OUT)/partition_size.mk:
-	@PLATFORM=${MTK_PLATFORM} \
-	MTK_TARGET_PROJECT=${MTK_TARGET_PROJECT} \
-	TARGET_BUILD_VARIANT=${TARGET_BUILD_VARIANT} \
-	MTK_NAND_PAGE_SIZE=${MTK_NAND_PAGE_SIZE} \
-	MTK_EMMC_SUPPORT=${MTK_EMMC_SUPPORT} \
-	MTK_TC1_FEATURE=${MTK_TC1_FEATURE} \
-	MTK_LDVT_SUPPORT=${MTK_LDVT_SUPPORT} \
-	MTK_EMMC_SUPPORT_OTP=${MTK_EMMC_SUPPORT_OTP} \
-	MTK_SHARED_SDCARD=${MTK_SHARED_SDCARD} \
-	MTK_CIP_SUPPORT=${MTK_CIP_SUPPORT} \
-	MTK_FAT_ON_NAND=${MTK_FAT_ON_NAND} \
-	MTK_SPI_NAND_SUPPORT=${MTK_SPI_NAND_SUPPORT} \
-	MTK_NAND_UBIFS_SUPPORT=${MTK_NAND_UBIFS_SUPPORT} \
-	MTK_COMBO_NAND_SUPPORT=${MTK_COMBO_NAND_SUPPORT} \
-	PL_MODE=${PL_MODE} \
-	MTK_PARTITION_TABLE_PLAIN_TEXT=${MTK_PARTITION_TABLE_PLAIN_TEXT} \
-	MTK_ATF_SUPPORT=${MTK_ATF_SUPPORT} \
-	MTK_TEE_SUPPORT=${MTK_TEE_SUPPORT} \
-	MTK_PERSIST_PARTITION_SUPPORT=${MTK_PERSIST_PARTITION_SUPPORT} \
-	MTK_DRM_KEY_MNG_SUPPORT=${MTK_DRM_KEY_MNG_SUPPORT} \
-	MTK_BASE_PROJECT=${MTK_BASE_PROJECT} \
-	PRELOADER_TARGET_PRODUCT=${PRELOADER_TARGET_PRODUCT} \
-	PTGEN_ENV="ANDROID" \
-	PTGEN_PROJECT_OUT=${PTGEN_PROJECT_OUT} \
-	PTGEN_MK_OUT=${PTGEN_MK_OUT} \
-	TMP_OUT_PATH=${TMP_OUT_PATH} \
-	perl $(PTGEN_PERL)
-	perl $(OTA_SCATTER_PERL) ${PRODUCT_OUT}/$(CHIP)_Android_scatter.txt ${PRODUCT_OUT}/ota_scatter.txt
-
-endif
diff --git a/proprietary/scripts/secroimage/Android.mk b/proprietary/scripts/secroimage/Android.mk
deleted file mode 100755
index 350452ee15c8867f7d3aceee627691fb4feef064..0000000000000000000000000000000000000000
--- a/proprietary/scripts/secroimage/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright (C) 2009-2011 The Android-x86 Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-
-ifneq ($(strip $(MTK_PROJECT_NAME)),)
-
-MTK_SEC_SECRO_AC_SUPPORT := yes
-INSTALLED_SECROIMAGE_TARGET = $(OUT_DIR)/target/product/$(MTK_TARGET_PROJECT)/secro.img
-
-SECRO_POST_SCRIPT := vendor/mediatek/proprietary/scripts/secroimage/secro_post.pl
-SECRO_TYPE := GMP
-
-ifeq ($(strip $(SECRO_TYPE)),GMP)
-SECRO_CONFIG := vendor/mediatek/proprietary/custom/common/secro/SECRO_GMP.ini
-else
-SECRO_CONFIG := vendor/mediatek/proprietary/custom/common/secro/SECRO_DEFAULT_LOCK_CFG.ini
-endif
-
-secroimage: 
-	@perl $(SECRO_POST_SCRIPT) $(SECRO_CONFIG) $(MTK_PROJECT) $(MTK_PATH_CUSTOM) $(MTK_SEC_SECRO_AC_SUPPORT) $(INSTALLED_SECROIMAGE_TARGET) $(SECRO_TYPE) $(MTK_TARGET_PROJECT) $(OUT_DIR) $(HOST_OS)
-
-droidcore: secroimage
-
-endif
diff --git a/proprietary/scripts/secroimage/Android.mk_ b/proprietary/scripts/secroimage/Android.mk_
index 350452ee15c8867f7d3aceee627691fb4feef064..e0f0d353f37ae92585b51203b63f6fc81b02a653 100755
--- a/proprietary/scripts/secroimage/Android.mk_
+++ b/proprietary/scripts/secroimage/Android.mk_
@@ -21,6 +21,8 @@ SECRO_CONFIG := vendor/mediatek/proprietary/custom/common/secro/SECRO_GMP.ini
 else
 SECRO_CONFIG := vendor/mediatek/proprietary/custom/common/secro/SECRO_DEFAULT_LOCK_CFG.ini
 endif
+MTK_PROJECT := "mt6757"
+MTK_PATH_CUSTOM := "vendor/mediatek/proprietary/custom"
 
 secroimage: 
 	@perl $(SECRO_POST_SCRIPT) $(SECRO_CONFIG) $(MTK_PROJECT) $(MTK_PATH_CUSTOM) $(MTK_SEC_SECRO_AC_SUPPORT) $(INSTALLED_SECROIMAGE_TARGET) $(SECRO_TYPE) $(MTK_TARGET_PROJECT) $(OUT_DIR) $(HOST_OS)