From: YoungHun Cho <hoon.cho@samsung.com>
Date: Thu, 26 May 2016 04:54:37 +0000 (+0900)
Subject: add popup & apps view bg
X-Git-Tag: submit/tizen/20160526.053042^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a062ea812273737de7f86165ba21b34d3d373b01;p=profile%2Fmobile%2Fapps%2Fnative%2Fhomescreen-efl.git

add popup & apps view bg

Change-Id: I455c3ec4d7e49c2e49546d3d75b1d3ad216b96b6
Signed-off-by: YoungHun Cho <hoon.cho@samsung.com>
---

diff --git a/.cproject b/.cproject
index 072c9a0..518044c 100755
--- a/.cproject
+++ b/.cproject
@@ -27,7 +27,7 @@
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.481743771" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.2102599528" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.compiler.option.1070320025" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-emulator.core_llvm36.i386.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm36.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.312288874" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
@@ -118,6 +118,7 @@
 									<listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/>
 									<listOptionValue builtIn="false" value=" -fPIE"/>
 									<listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
+									<listOptionValue builtIn="false" value="-mthumb"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.include.paths.1857385470" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -132,7 +133,7 @@
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.247638963" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.982331969" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.c.compiler.option.1644890019" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-emulator.core_llvm36.i386.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm36.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1483034184" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
@@ -223,6 +224,7 @@
 									<listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/>
 									<listOptionValue builtIn="false" value=" -fPIE"/>
 									<listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
+									<listOptionValue builtIn="false" value="-mthumb"/>
 								</option>
 								<option id="gnu.c.compiler.option.include.paths.1774757534" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -254,7 +256,7 @@
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool command="i386-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1815664769" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
+							<tool command="arm-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1815664769" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.88475890" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
 							<tool id="org.tizen.nativecore.tool.fnmapgen.304005350" name="C FN-Map Generator" superClass="org.tizen.nativecore.tool.fnmapgen"/>
diff --git a/.rds_delta b/.rds_delta
index a8acc85..0d3bdc4 100644
--- a/.rds_delta
+++ b/.rds_delta
@@ -3,4 +3,4 @@
 #modify
 author-signature.xml
 signature1.xml
-bin/homescreen-efl
+res/edje/apps_chooser_btn.edj
diff --git a/.sdk_delta.info b/.sdk_delta.info
index 4d9edaa..1fa2e24 100644
Binary files a/.sdk_delta.info and b/.sdk_delta.info differ
diff --git a/.sign/.manifest.tmp b/.sign/.manifest.tmp
index c6fc747..26f7e6e 100644
--- a/.sign/.manifest.tmp
+++ b/.sign/.manifest.tmp
@@ -1,18 +1,18 @@
-bin/homescreen-efl__DEL__Vd1hS0VIBQcDiUBL4H5RUagaoFVyoSN7F7arwKRsgro=
-res/edje/add_widget_viewer.edj__DEL__yjuM2TzRJk0qmbbgZm8CEJjhKW12PFL3mvH8p6XI/7A=
-res/edje/app_icon.edj__DEL__Hu5w5HMPIF4AeyEkT5HTQrIMbubp4EZa4Mynq2AT8IE=
-res/edje/apps_chooser_btn.edj__DEL__Lhzbzd2xr9TwWBn9usNTpq7fvLUhr4RBU7ulLfGdjTs=
-res/edje/apps_folder_icon.edj__DEL__iJtRbyrDqIKGn2habGi0LO2ACBOYxgFqvEcuabJwFKM=
-res/edje/apps_folder_popup.edj__DEL__AZ7u3E4yosFt2q9UWKNHQmgxJxOUytwS2LYq2vFxTRw=
-res/edje/apps_view.edj__DEL__twdBdvt0OXctB/m9LMbw77xGPOYYhWlkMG2rkEdnIXU=
-res/edje/apps_view_bg.edj__DEL__Rr+4ieuJ/jwhde7+jjJ2HqctoSyD9BjUg/DrwAo3+PM=
-res/edje/cluster_allpage.edj__DEL__FnZKXPhbViostAA/bmMYIBj5iFfuHxvKlYcMERPKvdU=
-res/edje/cluster_allpage_thumbnail.edj__DEL__Hc/3Ns69OvMHmOAWnL3L0mkPpgslmrXa6LQFeOTQYEA=
-res/edje/cluster_page.edj__DEL__X0OYWeT8uBBTAh4BbXdwcU40sIW/ZnG4i7vgRzMbVKY=
-res/edje/home.edj__DEL__zSZTzpCMLnN2wgCL9diTlFqZYaAYqaK9AhjZFi4if7Q=
-res/edje/home_btn.edj__DEL__qgmfKXFjX19XzVySIRBBYD14DeWsEiipC7N2C36119c=
-res/edje/page_indicator_unit.edj__DEL__D4gzjCW5HGaBzlEFU5yGPR0zYiQhYJoyQ3z1f7akkq4=
-res/edje/widget.edj__DEL__pT8X3lZOd7zvW/vBOlSXv2HVh+OGH6pkMhFddtNSCxg=
+bin/homescreen-efl__DEL__R/GdPheI6ENeaZXAuFNgLeu4rlXVsKAxbYM6fehbfy0=
+res/edje/add_widget_viewer.edj__DEL__KaDoUUh0Qg+t+Cw1qHJXA6PUxIh2xuIQHnCu9OV4/hc=
+res/edje/app_icon.edj__DEL__Eu43j1+2+ea+oxjufrHtApUvLicZcONCnpZkQFMLZUs=
+res/edje/apps_chooser_btn.edj__DEL__pAJeOFkfFmGw5h4Uvur4s7KUUVSRScqAnG8rBBiF/b8=
+res/edje/apps_folder_icon.edj__DEL__CjxtXzz3JIaxVzS7/4sMm1530dLMMbLt7bXsXUTaxVY=
+res/edje/apps_folder_popup.edj__DEL__4jjfC1WUf47jMNjx4HiA4jSqqJT3TkWSY8Y9smNAnho=
+res/edje/apps_view.edj__DEL__uPbY0nk6vZ4l4LCSw022vHFGA0ImbzIhlVJ8MzFltzc=
+res/edje/apps_view_bg.edj__DEL__1Ng05qvrCC315hPy/ekMeqiXqNfIYyt+LuUsU5m0eLE=
+res/edje/cluster_allpage.edj__DEL__WtmYWB3bi4WEzN28IlodOnIZ6T88qo52wR/xBwFB3kA=
+res/edje/cluster_allpage_thumbnail.edj__DEL__QhYcaoP9mnP4J8Uski3uKtyWFp8+oGs5aaCRix1yCcI=
+res/edje/cluster_page.edj__DEL__oXQPkNrYEB4djrOeNNEoyqqTPKDQ+u2GzDLaxIT5AIA=
+res/edje/home.edj__DEL__MPsLzRdqMFBPp+0veKjxytfv3IRY/Rs0FUPKXiWTn7c=
+res/edje/home_btn.edj__DEL__cjUutx3Xu/QaCKyySHoTGTM4O2a2ml4cn34QTMbJUAI=
+res/edje/page_indicator_unit.edj__DEL__e/SQs2RRSuMGl4kkrXtNO8klSqR+9ig29iTQr3svMPw=
+res/edje/widget.edj__DEL__bZiBoDmHJvmEm7iXTEZ4pVkriORUqUpnKHeFoxygJfM=
 res/images/add_page_nor.png__DEL__hqnpwU7y0026fePoeHQUHiIsQkQkE6YMrEOLgWmi24s=
 res/images/add_page_press.png__DEL__FeY8xIiCwRls8AYZLRxOVUNJqWCB85HWNvWcSibOOhE=
 res/images/all_page_add.png__DEL__NaFgj2lXKUfBbZk4VmOeQamahPg7kXuwItRyeq8/bSY=
@@ -92,4 +92,4 @@ res/locale/zh_HK/LC_MESSAGES/homescreen-efl.mo__DEL__XbmoPGvpjZD09qMkipbn/N/GNg/
 res/locale/zh_TW/LC_MESSAGES/homescreen-efl.mo__DEL__oV3fIhDtXRMBjVuLETwBwYVDwiCHWvpDVpgtektLlM4=
 shared/res/homescreen-efl.png__DEL__1d0oEZHqPn+QzNzGIHwj9ODby6x9ggFs9uOsav6jPNs=
 tizen-manifest.xml__DEL__HlwQmaFXgrNH4ygDj7kH+fT/9cUP7JE60jlK1v0pnlo=
-author-signature.xml__DEL__9onQ7m9DFFe/lzVwl+cU1zeOaIpptMVQNsvjbFX4DEE=
+author-signature.xml__DEL__LEJgor6DxAIDrDYn7VOLyJJmQw051xwNYfubBv0ui+o=
diff --git a/.sign/author-signature.xml b/.sign/author-signature.xml
index a20dab7..7659ecb 100644
--- a/.sign/author-signature.xml
+++ b/.sign/author-signature.xml
@@ -4,63 +4,63 @@
 <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"></SignatureMethod>
 <Reference URI="bin%2Fhomescreen-efl">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Vd1hS0VIBQcDiUBL4H5RUagaoFVyoSN7F7arwKRsgro=</DigestValue>
+<DigestValue>R/GdPheI6ENeaZXAuFNgLeu4rlXVsKAxbYM6fehbfy0=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fadd_widget_viewer.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>yjuM2TzRJk0qmbbgZm8CEJjhKW12PFL3mvH8p6XI/7A=</DigestValue>
+<DigestValue>KaDoUUh0Qg+t+Cw1qHJXA6PUxIh2xuIQHnCu9OV4/hc=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fapp_icon.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Hu5w5HMPIF4AeyEkT5HTQrIMbubp4EZa4Mynq2AT8IE=</DigestValue>
+<DigestValue>Eu43j1+2+ea+oxjufrHtApUvLicZcONCnpZkQFMLZUs=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fapps_chooser_btn.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Lhzbzd2xr9TwWBn9usNTpq7fvLUhr4RBU7ulLfGdjTs=</DigestValue>
+<DigestValue>pAJeOFkfFmGw5h4Uvur4s7KUUVSRScqAnG8rBBiF/b8=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fapps_folder_icon.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>iJtRbyrDqIKGn2habGi0LO2ACBOYxgFqvEcuabJwFKM=</DigestValue>
+<DigestValue>CjxtXzz3JIaxVzS7/4sMm1530dLMMbLt7bXsXUTaxVY=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fapps_folder_popup.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>AZ7u3E4yosFt2q9UWKNHQmgxJxOUytwS2LYq2vFxTRw=</DigestValue>
+<DigestValue>4jjfC1WUf47jMNjx4HiA4jSqqJT3TkWSY8Y9smNAnho=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fapps_view.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>twdBdvt0OXctB/m9LMbw77xGPOYYhWlkMG2rkEdnIXU=</DigestValue>
+<DigestValue>uPbY0nk6vZ4l4LCSw022vHFGA0ImbzIhlVJ8MzFltzc=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fapps_view_bg.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Rr+4ieuJ/jwhde7+jjJ2HqctoSyD9BjUg/DrwAo3+PM=</DigestValue>
+<DigestValue>1Ng05qvrCC315hPy/ekMeqiXqNfIYyt+LuUsU5m0eLE=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fcluster_allpage.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>FnZKXPhbViostAA/bmMYIBj5iFfuHxvKlYcMERPKvdU=</DigestValue>
+<DigestValue>WtmYWB3bi4WEzN28IlodOnIZ6T88qo52wR/xBwFB3kA=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fcluster_allpage_thumbnail.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Hc/3Ns69OvMHmOAWnL3L0mkPpgslmrXa6LQFeOTQYEA=</DigestValue>
+<DigestValue>QhYcaoP9mnP4J8Uski3uKtyWFp8+oGs5aaCRix1yCcI=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fcluster_page.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>X0OYWeT8uBBTAh4BbXdwcU40sIW/ZnG4i7vgRzMbVKY=</DigestValue>
+<DigestValue>oXQPkNrYEB4djrOeNNEoyqqTPKDQ+u2GzDLaxIT5AIA=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fhome.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>zSZTzpCMLnN2wgCL9diTlFqZYaAYqaK9AhjZFi4if7Q=</DigestValue>
+<DigestValue>MPsLzRdqMFBPp+0veKjxytfv3IRY/Rs0FUPKXiWTn7c=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fhome_btn.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>qgmfKXFjX19XzVySIRBBYD14DeWsEiipC7N2C36119c=</DigestValue>
+<DigestValue>cjUutx3Xu/QaCKyySHoTGTM4O2a2ml4cn34QTMbJUAI=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fpage_indicator_unit.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>D4gzjCW5HGaBzlEFU5yGPR0zYiQhYJoyQ3z1f7akkq4=</DigestValue>
+<DigestValue>e/SQs2RRSuMGl4kkrXtNO8klSqR+9ig29iTQr3svMPw=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fwidget.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>pT8X3lZOd7zvW/vBOlSXv2HVh+OGH6pkMhFddtNSCxg=</DigestValue>
+<DigestValue>bZiBoDmHJvmEm7iXTEZ4pVkriORUqUpnKHeFoxygJfM=</DigestValue>
 </Reference>
 <Reference URI="res%2Fimages%2Fadd_page_nor.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -387,9 +387,9 @@
 </Reference>
 </SignedInfo>
 <SignatureValue>
-ej0LVboKd3qzvknzqbvv9cIkb9d0MmBsMcdKyx3ypLeObafdOEdZ9USZFZhF3plO7IcWrpIi4bSw
-9coC1+3laPfvhm3QCAxzg1hOXlkxqX9uiX9znwQ4B98Zm/3etDWkiDXKN7rE+60rt+iXFDjV/yNB
-8OSK9WDZLGTpG1y2nGA=
+ATS/lBe3U3mDOGWBzlGsQQAthuPohthWdudegnw6d0psxAgmbYMGD/chaeYPmmbVLsFTiopEtmrl
+xE1T8DFjKqG+snMMKQAd82XF2vATSbHAEkHgt2b1kjqw0iaggHNAjK2AedwLL/tH5zFMHt+3GpI5
+6b24fmnPqpQZDqCfoxY=
 </SignatureValue>
 <KeyInfo>
 <X509Data>
diff --git a/.sign/signature1.xml b/.sign/signature1.xml
index 4e3089c..4ae1011 100644
--- a/.sign/signature1.xml
+++ b/.sign/signature1.xml
@@ -4,67 +4,67 @@
 <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"></SignatureMethod>
 <Reference URI="author-signature.xml">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>9onQ7m9DFFe/lzVwl+cU1zeOaIpptMVQNsvjbFX4DEE=</DigestValue>
+<DigestValue>LEJgor6DxAIDrDYn7VOLyJJmQw051xwNYfubBv0ui+o=</DigestValue>
 </Reference>
 <Reference URI="bin%2Fhomescreen-efl">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Vd1hS0VIBQcDiUBL4H5RUagaoFVyoSN7F7arwKRsgro=</DigestValue>
+<DigestValue>R/GdPheI6ENeaZXAuFNgLeu4rlXVsKAxbYM6fehbfy0=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fadd_widget_viewer.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>yjuM2TzRJk0qmbbgZm8CEJjhKW12PFL3mvH8p6XI/7A=</DigestValue>
+<DigestValue>KaDoUUh0Qg+t+Cw1qHJXA6PUxIh2xuIQHnCu9OV4/hc=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fapp_icon.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Hu5w5HMPIF4AeyEkT5HTQrIMbubp4EZa4Mynq2AT8IE=</DigestValue>
+<DigestValue>Eu43j1+2+ea+oxjufrHtApUvLicZcONCnpZkQFMLZUs=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fapps_chooser_btn.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Lhzbzd2xr9TwWBn9usNTpq7fvLUhr4RBU7ulLfGdjTs=</DigestValue>
+<DigestValue>pAJeOFkfFmGw5h4Uvur4s7KUUVSRScqAnG8rBBiF/b8=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fapps_folder_icon.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>iJtRbyrDqIKGn2habGi0LO2ACBOYxgFqvEcuabJwFKM=</DigestValue>
+<DigestValue>CjxtXzz3JIaxVzS7/4sMm1530dLMMbLt7bXsXUTaxVY=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fapps_folder_popup.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>AZ7u3E4yosFt2q9UWKNHQmgxJxOUytwS2LYq2vFxTRw=</DigestValue>
+<DigestValue>4jjfC1WUf47jMNjx4HiA4jSqqJT3TkWSY8Y9smNAnho=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fapps_view.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>twdBdvt0OXctB/m9LMbw77xGPOYYhWlkMG2rkEdnIXU=</DigestValue>
+<DigestValue>uPbY0nk6vZ4l4LCSw022vHFGA0ImbzIhlVJ8MzFltzc=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fapps_view_bg.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Rr+4ieuJ/jwhde7+jjJ2HqctoSyD9BjUg/DrwAo3+PM=</DigestValue>
+<DigestValue>1Ng05qvrCC315hPy/ekMeqiXqNfIYyt+LuUsU5m0eLE=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fcluster_allpage.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>FnZKXPhbViostAA/bmMYIBj5iFfuHxvKlYcMERPKvdU=</DigestValue>
+<DigestValue>WtmYWB3bi4WEzN28IlodOnIZ6T88qo52wR/xBwFB3kA=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fcluster_allpage_thumbnail.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Hc/3Ns69OvMHmOAWnL3L0mkPpgslmrXa6LQFeOTQYEA=</DigestValue>
+<DigestValue>QhYcaoP9mnP4J8Uski3uKtyWFp8+oGs5aaCRix1yCcI=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fcluster_page.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>X0OYWeT8uBBTAh4BbXdwcU40sIW/ZnG4i7vgRzMbVKY=</DigestValue>
+<DigestValue>oXQPkNrYEB4djrOeNNEoyqqTPKDQ+u2GzDLaxIT5AIA=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fhome.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>zSZTzpCMLnN2wgCL9diTlFqZYaAYqaK9AhjZFi4if7Q=</DigestValue>
+<DigestValue>MPsLzRdqMFBPp+0veKjxytfv3IRY/Rs0FUPKXiWTn7c=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fhome_btn.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>qgmfKXFjX19XzVySIRBBYD14DeWsEiipC7N2C36119c=</DigestValue>
+<DigestValue>cjUutx3Xu/QaCKyySHoTGTM4O2a2ml4cn34QTMbJUAI=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fpage_indicator_unit.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>D4gzjCW5HGaBzlEFU5yGPR0zYiQhYJoyQ3z1f7akkq4=</DigestValue>
+<DigestValue>e/SQs2RRSuMGl4kkrXtNO8klSqR+9ig29iTQr3svMPw=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fwidget.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>pT8X3lZOd7zvW/vBOlSXv2HVh+OGH6pkMhFddtNSCxg=</DigestValue>
+<DigestValue>bZiBoDmHJvmEm7iXTEZ4pVkriORUqUpnKHeFoxygJfM=</DigestValue>
 </Reference>
 <Reference URI="res%2Fimages%2Fadd_page_nor.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -391,9 +391,9 @@
 </Reference>
 </SignedInfo>
 <SignatureValue>
-fqT3GSjVLa7SUeQfefVSSo9jr+pK8VAGB40cxK1Bo6LL99FKjfLs6M0S58d0Z6B7bZoYzqpNSSuE
-vygfaC0/fABW00NpxXOKE2JreYHkLtHoVCm/XCX0v4oyHjyIvtoX/j0PblBhkhLkAruf63oKWcti
-tVyj3xXPmMNjeG2XJn8=
+qzYK1eyFru9qMzWatulA2jLFF4NpcW775/b+g2zc5l+kRFstUOwKoSqNJL9DLX4HDznlpOcq6699
+soYm4maO5blm9FYimKlKMiPexaaMWvwY3x7hvaRp2ayvjubNJD9Eq1jRfx0dgR4eJdSDZ+Z1xCJx
+8QQQuhEm0mYVpDoOLvs=
 </SignatureValue>
 <KeyInfo>
 <X509Data>
diff --git a/inc/apps_view.h b/inc/apps_view.h
index 97aebf1..27cb582 100755
--- a/inc/apps_view.h
+++ b/inc/apps_view.h
@@ -40,7 +40,7 @@ void apps_view_icon_unset(app_data_t *item);
 void apps_view_icon_add(app_data_t *item);
 
 void apps_view_hw_menu_key(void);
-bool apps_view_hw_home_key(void);
+void apps_view_hw_home_key(void);
 bool apps_view_hw_back_key(void);
 view_state_t apps_view_get_state(void);
 void apps_view_set_state(view_state_t state);
diff --git a/inc/cluster_view.h b/inc/cluster_view.h
index 56499d6..3b0ddcb 100755
--- a/inc/cluster_view.h
+++ b/inc/cluster_view.h
@@ -31,7 +31,7 @@ void cluster_view_show_anim(double pos);
 void cluster_view_hide_anim(double pos);
 
 void cluster_view_hw_menu_key(void);
-bool cluster_view_hw_home_key(void);
+void cluster_view_hw_home_key(void);
 bool cluster_view_hw_back_key(void);
 view_state_t cluster_view_get_state(void);
 void cluster_view_set_state(view_state_t state);
diff --git a/inc/conf.h b/inc/conf.h
index 3b403af..4ab597c 100755
--- a/inc/conf.h
+++ b/inc/conf.h
@@ -19,6 +19,8 @@
 
 #define FRAMES_PER_SECOND 1.0/60.0
 
+#define STR_ID_LEN 256
+#define STR_PATH_LEN 1024
 #define STR_MAX 2048
 #define INIT_VALUE -987654321
 
@@ -71,6 +73,7 @@ extern int __conf_get_window_w();
 #define CLUSTER_DELETE_BUTTON_H CLUSTER_DELETE_BUTTON_W
 #define CLUSTER_EDIT_LEFT_SCROLL_REGION ((72) * (__conf_get_resolution_scale_w()))
 #define CLUSTER_EDIT_RIGHT_SCROLL_REGION (CLUSTER_VIEW_W - CLUSTER_EDIT_LEFT_SCROLL_REGION)
+#define CLUSTER_ADDVIEWER_TEXT_SIZE ((38) * (__conf_get_resolution_scale_h()))
 
 #define CLUSTER_ROW 4
 #define CLUSTER_COL 4
@@ -87,11 +90,11 @@ extern int __conf_get_window_w();
 #define ALLPAGE_PREVIEW_PADDING_MID ((12) * (__conf_get_resolution_scale_w()))
 #define ALLPAGE_PREVIEW_PADDING_TOP ((18) * (__conf_get_resolution_scale_h()))
 #define ALLPAGE_PREVIEW_LIST_ITEM_W ((720) * (__conf_get_resolution_scale_w()))
-#define ALLPAGE_PREVIEW_LIST_ITEM_H ((388) * (__conf_get_resolution_scale_h()))
+#define ALLPAGE_PREVIEW_LIST_ITEM_H ((405) * (__conf_get_resolution_scale_h()))
 #define ALLPAGE_PREVIEW_4X4_W ((300) * (__conf_get_resolution_scale_w()))
 #define ALLPAGE_PREVIEW_4X4_H ALLPAGE_PREVIEW_4X4_W
 #define ALLPAGE_PREVIEW_4X2_W ((300) * (__conf_get_resolution_scale_w()))
-#define ALLPAGE_PREVIEW_4X2_H ((ALLPAGE_PREVIEW_4X4_W/2) * (__conf_get_resolution_scale_h()))
+#define ALLPAGE_PREVIEW_4X2_H (ALLPAGE_PREVIEW_4X4_W / 2)
 #define ALLPAGE_MOVE_GAP 0.15
 
 #define APPS_FOLDER_MAX_ITEM 9
diff --git a/inc/edc_conf.h b/inc/edc_conf.h
index 3883b4e..795f6bc 100755
--- a/inc/edc_conf.h
+++ b/inc/edc_conf.h
@@ -88,6 +88,8 @@
 #define SIGNAL_CHOOSER_BUTTON_HIDE "chooser_button_hide"
 
 #define ANIMATION_RESIZE_TIME 0.3
+
+#define SIGNAL_EDIT_MODE_ON_ANI_DONE "edit_on_ani_done"
 #define SIGNAL_SET_BLACK_TEXT "set_black_text"
 #define SIGNAL_EDIT_MODE_ON_ANI "edit_on_ani"
 #define SIGNAL_EDIT_MODE_ON "edit_on"
diff --git a/inc/popup.h b/inc/popup.h
index e91a62a..7df99e4 100755
--- a/inc/popup.h
+++ b/inc/popup.h
@@ -17,14 +17,10 @@
 #ifndef __POPUP_H__
 #define __POPUP_H__
 
-typedef enum {
-    POPUP_DEFAULT = -1,
-    POPUP_CLUSTER_PAGE_FULL = 0,
-    POPUP_CLUSTER_DELETE_PAGE,
-    POPUP_MAX
-} popup_t;
+#include "conf.h"
 
-void popup_show(popup_t type, int btn_count, Evas_Smart_Cb btn_func[3], void *func_data[3]);
+void popup_show(int btn_count, Evas_Smart_Cb btn_func[3], void *func_data[3],
+        const char (*btn_text)[STR_MAX], const char *title_text, const char *popup_text);
 void popup_hide(void);
 bool popup_is_show(void);
 
diff --git a/res/edje/add_widget_viewer.edc b/res/edje/add_widget_viewer.edc
index 0ce6449..d923d07 100755
--- a/res/edje/add_widget_viewer.edc
+++ b/res/edje/add_widget_viewer.edc
@@ -24,11 +24,7 @@ images {
 styles {
     style {
         name: "leaf,font";
-        base: "font=Tizen text_class=T024 font_size=38 align=left color=#AAAAAA color_class=T024 ellipsis=1.0";
-        tag:  "br" "\n";
-        tag:  "hilight" "+ font=Tizen:style=Bold";
-        tag:  "b" "+ font=Tizen:style=Bold";
-        tag:  "tab" "\t";
+        base: "font=Tizen text_class=T024 font_size=38 align=left color=#606060FF color_class=T024 ellipsis=1.0";
     }
 }
 
@@ -56,7 +52,7 @@ collections {
                 mouse_events: 0;
                 description {
                     state: "default" 0.0;
-                    rel1 { relative: 0.044 0.046; to: SIZE_SETTER; }
+                    rel1 { relative: 0.044 0.026; to: SIZE_SETTER; }
                     rel2 { relative: 0.894 0.159; to: SIZE_SETTER; }
                     align: 0.0 0.0;
                     text { style: "leaf,font"; }
diff --git a/res/edje/apps_view.edc b/res/edje/apps_view.edc
index 52f9981..8b716b9 100755
--- a/res/edje/apps_view.edc
+++ b/res/edje/apps_view.edc
@@ -62,6 +62,27 @@ collections {
                     rel2.relative: 0.0 0.0;
                 }
             }
+            part { name: APPS_APPS_VIEW_BG;
+                type: RECT;
+                mouse_events: 1;
+                repeat_events: 1;
+                description {
+                    state: "default" 0.0;
+                    align: 0 0;
+                    rel1 {relative: 0.0 0.0; to:SIZE_SETTER;}
+                    rel2 {relative: 1.0 1.0; to:SIZE_SETTER;}
+                    color: 0 0 0 0;
+                    visible: 0;
+                }
+                description {
+                    state: "edit_done" 0.0;
+                    inherit: "default" 0.0;
+                    rel1 {relative: 0.055 0.035; to:SIZE_SETTER;}
+                    rel2 {relative: 0.95 0.985; to:SIZE_SETTER;}
+                    color: 0 0 0 APPS_VIEW_BG_OPACITY;
+                    visible: 1;
+                }
+            }
             MAKE_TILE(0,0);
             MAKE_TILE(0,1);
             MAKE_TILE(0,2);
@@ -110,12 +131,21 @@ collections {
                 target: "icon_4_2";
                 target: "icon_4_3";
                 transition: DECELERATE ANIMATION_RESIZE_TIME;
+                after: bg_edit_mode_on_ani_done;
             }
             program {
                 name: "bg_edit_mode_off";
                 signal: SIGNAL_EDIT_MODE_OFF_ANI;
                 source: SIGNAL_SOURCE;
                 action: STATE_SET "default" 0.0;
+                target: APPS_APPS_VIEW_BG;
+                after: "bg_edit_mode_off2";
+            }
+            program {
+                name: "bg_edit_mode_off2";
+                signal: "bg_edit_mode_off2";
+                source: SIGNAL_SOURCE;
+                action: STATE_SET "default" 0.0;
                 target: "icon_0_0";
                 target: "icon_0_1";
                 target: "icon_0_2";
@@ -138,6 +168,13 @@ collections {
                 target: "icon_4_3";
                 transition: DECELERATE ANIMATION_RESIZE_TIME;
             }
+            program {
+                name: "bg_edit_mode_on_ani_done";
+                signal: SIGNAL_EDIT_MODE_ON_ANI_DONE;
+                source: SIGNAL_SOURCE;
+                action: STATE_SET "edit_done" 0.0;
+                target: APPS_APPS_VIEW_BG;
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/res/edje/apps_view_bg.edc b/res/edje/apps_view_bg.edc
index 6c28134..1bf4f53 100755
--- a/res/edje/apps_view_bg.edc
+++ b/res/edje/apps_view_bg.edc
@@ -63,29 +63,17 @@ collections {
                     inherit: "default" 0.0;
                     visible: 1;
                     rel1 {relative: 0.06 0.09; to:SIZE_SETTER;}
-                    rel2 {relative: 0.94 0.86; to:SIZE_SETTER;}
+                    rel2 {relative: 0.95 0.87; to:SIZE_SETTER;}
                 }
                 description {
                     state: "hide" 0.0;
                     inherit: "default" 0.0;
                     visible: 0;
-                    map {
-                        on: 1;
-                        perspective_on: 1;
-                        smooth: 1;
-                        alpha: 1;
-                    }
                 }
                 description {
                     state: "show" 0.0;
                     inherit: "default" 0.0;
                     visible: 1;
-                    map {
-                        on: 1;
-                        perspective_on: 1;
-                        smooth: 1;
-                        alpha: 1;
-                    }
                 }
             }
         }
@@ -123,11 +111,20 @@ collections {
                 action: STATE_SET "edit" 0.0;
                 target: APPS_APPS_VIEW_BG;
                 transition: DECELERATE ANIMATION_RESIZE_TIME;
+                after: SIGNAL_APPS_VIEW_HIDE;
             }
             program {
                 name: "bg_edit_mode_off";
                 signal: SIGNAL_EDIT_MODE_OFF_ANI;
                 source: SIGNAL_SOURCE;
+                action: STATE_SET "edit" 0.0;
+                target: APPS_APPS_VIEW_BG;
+                after: "bg_edit_mode_off2";
+            }
+            program {
+                name: "bg_edit_mode_off2";
+                signal: "bg_edit_mode_off2";
+                source: SIGNAL_SOURCE;
                 action: STATE_SET "show" 0.0;
                 target: APPS_APPS_VIEW_BG;
                 transition: DECELERATE ANIMATION_RESIZE_TIME;
diff --git a/src/add_widget_viewer/add_widget_viewer.c b/src/add_widget_viewer/add_widget_viewer.c
index 7d301fb..42116d4 100755
--- a/src/add_widget_viewer/add_widget_viewer.c
+++ b/src/add_widget_viewer/add_widget_viewer.c
@@ -156,7 +156,7 @@ static Evas_Object *__add_widget_viewer_create_conformant(void)
 static Evas_Object *__add_widget_viewer_create_layout()
 {
     Evas_Object *layout;
-    char edj_path[STR_MAX] = {0, };
+    char edj_path[STR_PATH_LEN] = {0, };
 
     if (!add_widget_viewer_s.conformant) {
         return NULL;
@@ -374,8 +374,11 @@ static char *__add_widget_viewer_list_text_get_cb(void *data, Evas_Object *obj,
     if (!widget || !part)
         return NULL;
 
-    if (!strcmp(part, "elm.text"))
-        return strdup(widget->label);
+    if (!strcmp(part, "elm.text")) {
+        char style_string[STR_MAX] = {0, };
+        snprintf(style_string, sizeof(style_string), "<font_size=%d>%s</font_size>", (int)CLUSTER_ADDVIEWER_TEXT_SIZE, widget->label);
+        return strdup(style_string);
+    }
 
     return strdup("widget name not found");
 }
diff --git a/src/apps_view.c b/src/apps_view.c
index 4dd348e..d126c36 100755
--- a/src/apps_view.c
+++ b/src/apps_view.c
@@ -40,6 +40,7 @@ static struct {
     Evas_Object *chooser_btn;
     Evas_Object *folder_popup_ly;
     Evas_Object *folder_title_entry;
+    Evas_Object *event_block_bg;
     app_data_t *picked_item;
     int width;
     int height;
@@ -64,6 +65,7 @@ static struct {
     .chooser_btn = NULL,
     .folder_popup_ly = NULL,
     .folder_title_entry = NULL,
+    .event_block_bg = NULL,
     .picked_item = NULL,
     .width = 0,
     .height = 0,
@@ -111,6 +113,8 @@ static void __apps_view_remove_page(void);
 static void __apps_view_fill_apps(void);
 static void __apps_view_icon_clicked_cb(app_data_t *item);
 static void __apps_view_icon_uninstall_btn_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source);
+static void __apps_view_delete_folder_cb(void *data, Evas_Object *obj, void *event_info);
+static void __apps_view_uninstall_app_cb(void *data, Evas_Object *obj, void *event_info);
 static void __apps_view_icon_check_changed_cb(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void __apps_view_create_chooser(void);
 static void __apps_view_chooser_left_btn_clicked(void *data, Evas_Object *obj, const char *emission, const char *source);
@@ -207,7 +211,9 @@ void apps_view_show_anim(double pos)
 
     evas_object_color_set(apps_view_s.box, 255, 255, 255, pos*255);
     evas_object_move(apps_view_s.scroller, 0, APPS_VIEW_PADDING_TOP + (APPS_VIEW_ANIMATION_DELTA * (1-pos)));
-    if (pos >= (1.0 - (1e-10))) {
+    if (pos <= 0.01) {
+        evas_object_show(apps_view_s.event_block_bg);
+    } else if (pos >= (1.0 - (1e-10))) {
         evas_object_color_set(apps_view_s.box, 255, 255, 255, 255);
         evas_object_move(apps_view_s.scroller, 0, APPS_VIEW_PADDING_TOP);
         edje_object_signal_emit(edje, SIGNAL_APPS_VIEW_SHOW, SIGNAL_SOURCE);
@@ -233,7 +239,9 @@ void apps_view_hide_anim(double pos)
 
     evas_object_color_set(apps_view_s.box, 255, 255, 255, (1-pos)*255);
     evas_object_move(apps_view_s.scroller, 0, APPS_VIEW_PADDING_TOP + (APPS_VIEW_ANIMATION_DELTA * pos));
-    if (pos >= (1.0 - (1e-10))) {
+    if (pos <= 0.01) {
+        evas_object_hide(apps_view_s.event_block_bg);
+    } else if (pos >= (1.0 - (1e-10))) {
         evas_object_color_set(apps_view_s.box, 255, 255, 255, 0);
         evas_object_move(apps_view_s.scroller, 0, apps_view_s.height);
         edje_object_signal_emit(edje, SIGNAL_APPS_VIEW_HIDE, SIGNAL_SOURCE);
@@ -528,6 +536,13 @@ static void __apps_view_create_base_gui(Evas_Object *win)
     elm_object_part_content_set(apps_view_s.bg, SIZE_SETTER, rect);
     evas_object_show(rect);
 
+    apps_view_s.event_block_bg = evas_object_rectangle_add(homescreen_efl_get_win());
+    evas_object_color_set(apps_view_s.event_block_bg, 0, 0, 0, 0);
+    evas_object_resize(apps_view_s.event_block_bg, apps_view_s.width, CLUSTER_VIEW_H + INDICATOR_H);
+    evas_object_move(apps_view_s.event_block_bg, 0, 0);
+    evas_object_repeat_events_set(apps_view_s.event_block_bg, EINA_FALSE);
+    evas_object_hide(apps_view_s.event_block_bg);
+
     apps_view_s.scroller = elm_scroller_add(win);
     if (!apps_view_s.scroller) {
         LOGE("[FAILED][apps_view_s.scroller==NULL]");
@@ -681,8 +696,6 @@ static void __apps_view_icon_clicked_cb(app_data_t *item)
 static void __apps_view_icon_uninstall_btn_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
     app_data_t *item  = (app_data_t *)data;
-    package_manager_request_h request;
-    int id = 0;
     feedback_play_type(FEEDBACK_TYPE_SOUND, FEEDBACK_PATTERN_TAP);
 
     if (!item) {
@@ -691,28 +704,64 @@ static void __apps_view_icon_uninstall_btn_clicked_cb(void *data, Evas_Object *o
 
     LOGD("Uninstall :: %s", item->pkg_str);
     if (item->is_folder) {
-        apps_data_delete_folder(item);
+        Evas_Smart_Cb func[3] = { __apps_view_delete_folder_cb, NULL, NULL };
+        void *data[3] = { item, NULL, NULL };
+        char btn_text[3][STR_MAX] = { "", "", "" };
+        char title_text[STR_MAX] = { "" };
+        char popup_text[STR_MAX] = { "" };
+        snprintf(btn_text[0], sizeof(btn_text[0]), "%s", _("IDS_ST_BUTTON_REMOVE_ABB2"));
+        snprintf(btn_text[1], sizeof(btn_text[1]), "%s", _("IDS_CAM_SK_CANCEL"));
+        snprintf(title_text, sizeof(title_text), "%s", _("IDS_HS_HEADER_REMOVE_FOLDER_ABB"));
+        snprintf(popup_text, sizeof(popup_text), "%s", _("IDS_HS_BODY_FOLDER_WILL_BE_REMOVED_APPLICATIONS_IN_THIS_FOLDER_WILL_NOT_BE_UNINSTALLED"));
+        popup_show(2, func, data, btn_text, title_text, popup_text);
     } else if (item->type >= APPS_DATA_TYPE_APP_SHORTCUT) {
         LOGD("Delete shortcut");
         apps_data_delete_item(item);
     } else {
-        if (package_manager_request_create(&request) != PACKAGE_MANAGER_ERROR_NONE) {
-            LOGE("Could not create unistall request. App: %s", item->pkg_str);
-            return;
-        }
-        int ret = package_manager_request_set_mode(request, PACKAGE_MANAGER_REQUEST_MODE_DEFAULT);
-        if (ret != PACKAGE_MANAGER_ERROR_NONE) {
-            LOGE("Could not set request mode. App: %s", item->pkg_str);
-            return;
-        }
-        if (package_manager_request_uninstall(request, item->pkg_str, &id) != PACKAGE_MANAGER_ERROR_NONE) {
-            LOGE("Could not uninstall application. App: %s", item->pkg_str);
-            return;
-        }
-        if (package_manager_request_destroy(request) != PACKAGE_MANAGER_ERROR_NONE) {
-            LOGE("Could not destroy unistall request. App: %s", item->pkg_str);
-            return;
-        }
+        Evas_Smart_Cb func[3] = { __apps_view_uninstall_app_cb, NULL, NULL };
+        void *data[3] = { item, NULL, NULL };
+        char btn_text[3][STR_MAX] = { "", "", "" };
+        char title_text[STR_MAX] = { "" };
+        char popup_text[STR_MAX] = { "" };
+        snprintf(btn_text[0], sizeof(btn_text[0]), "%s", _("IDS_AT_BODY_UNINSTALL"));
+        snprintf(btn_text[1], sizeof(btn_text[1]), "%s", _("IDS_CAM_SK_CANCEL"));
+        snprintf(title_text, sizeof(title_text), "%s", _("IDS_AT_BODY_UNINSTALL"));
+        snprintf(popup_text, sizeof(popup_text), _("IDS_HS_POP_PS_WILL_BE_UNINSTALLED"), item->label_str);
+        popup_show(2, func, data, btn_text, title_text, popup_text);
+    }
+}
+
+static void __apps_view_delete_folder_cb(void *data, Evas_Object *obj, void *event_info)
+{
+    popup_hide();
+    app_data_t *item  = (app_data_t *)data;
+    apps_data_delete_folder(item);
+}
+
+static void __apps_view_uninstall_app_cb(void *data, Evas_Object *obj, void *event_info)
+{
+    app_data_t *item  = (app_data_t *)data;
+    package_manager_request_h request;
+    int id = 0;
+
+    popup_hide();
+
+    if (package_manager_request_create(&request) != PACKAGE_MANAGER_ERROR_NONE) {
+        LOGE("Could not create unistall request. App: %s", item->pkg_str);
+        return;
+    }
+    int ret = package_manager_request_set_mode(request, PACKAGE_MANAGER_REQUEST_MODE_DEFAULT);
+    if (ret != PACKAGE_MANAGER_ERROR_NONE) {
+        LOGE("Could not set request mode. App: %s", item->pkg_str);
+        return;
+    }
+    if (package_manager_request_uninstall(request, item->pkg_str, &id) != PACKAGE_MANAGER_ERROR_NONE) {
+        LOGE("Could not uninstall application. App: %s", item->pkg_str);
+        return;
+    }
+    if (package_manager_request_destroy(request) != PACKAGE_MANAGER_ERROR_NONE) {
+        LOGE("Could not destroy unistall request. App: %s", item->pkg_str);
+        return;
     }
 }
 
@@ -751,15 +800,13 @@ void apps_view_hw_menu_key(void)
         menu_change_state_on_hw_menu_key(apps_menu_table);
 }
 
-bool apps_view_hw_home_key(void)
+void apps_view_hw_home_key(void)
 {
     if (apps_view_s.opened_folder != NULL) {
         __apps_view_close_folder_popup(apps_view_s.opened_folder);
     }
 
     apps_view_set_state(VIEW_STATE_NORMAL);
-
-    return false;
 }
 
 bool apps_view_hw_back_key(void)
@@ -792,13 +839,8 @@ void apps_view_set_state(view_state_t state)
     if (state == VIEW_STATE_EDIT) {
         homescreen_efl_btn_hide(HOMESCREEN_VIEW_APPS);
 
-        Evas_Object *edje = NULL;
-        edje = elm_layout_edje_get(apps_view_s.bg);
-        if (!edje) {
-            LOGE("Failed to get edje from layout");
-            return;
-        }
-        edje_object_signal_emit(edje, SIGNAL_EDIT_MODE_ON_ANI, SIGNAL_SOURCE);
+        if (apps_view_s.view_state != VIEW_STATE_CHOOSER)
+            elm_object_signal_emit(apps_view_s.bg, SIGNAL_EDIT_MODE_ON_ANI, SIGNAL_SOURCE);
 
         Eina_List *find_list = NULL;
         Evas_Object *page_ly;
@@ -827,14 +869,8 @@ void apps_view_set_state(view_state_t state)
         homescreen_efl_btn_hide(HOMESCREEN_VIEW_APPS);
         elm_win_indicator_mode_set(homescreen_efl_get_win(), ELM_WIN_INDICATOR_HIDE);
 
-        Evas_Object *edje = NULL;
-        edje = elm_layout_edje_get(apps_view_s.bg);
-        if (!edje) {
-            LOGE("Failed to get edje from layout");
-            return;
-        }
-        edje_object_signal_emit(edje, SIGNAL_EDIT_MODE_ON_ANI, SIGNAL_SOURCE);
-
+        if (apps_view_s.view_state != VIEW_STATE_EDIT)
+            elm_object_signal_emit(apps_view_s.bg, SIGNAL_EDIT_MODE_ON_ANI, SIGNAL_SOURCE);
         Eina_List *find_list = NULL;
         Evas_Object *page_ly;
         EINA_LIST_FOREACH(apps_view_s.page_list, find_list, page_ly) {
@@ -851,6 +887,7 @@ void apps_view_set_state(view_state_t state)
                 elm_object_signal_emit(item->app_layout, SIGNAL_UNINSTALL_BUTTON_HIDE_ANI, SIGNAL_SOURCE);
             }
         }
+
         elm_object_signal_emit(apps_view_s.chooser_btn, SIGNAL_CHOOSER_BUTTON_SHOW, SIGNAL_SOURCE);
     } else if (state == VIEW_STATE_NORMAL) {
         homescreen_efl_btn_show(HOMESCREEN_VIEW_APPS);
@@ -1062,8 +1099,7 @@ static void __apps_view_create_chooser(void)
     apps_view_s.chooser_btn = elm_layout_add(homescreen_efl_get_win());
     elm_layout_file_set(apps_view_s.chooser_btn, edj_path, GROUP_APPS_CHOOSER_BTN_LY);
     evas_object_size_hint_weight_set(apps_view_s.chooser_btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    elm_win_resize_object_add(homescreen_efl_get_win(), apps_view_s.chooser_btn);
-
+    evas_object_resize(apps_view_s.chooser_btn, apps_view_s.width, apps_view_s.height);
     evas_object_show(apps_view_s.chooser_btn);
 
     elm_object_signal_callback_add(apps_view_s.chooser_btn, SIGNAL_CHOOSER_LEFT_BTN_CLICKED, SIGNAL_SOURCE, __apps_view_chooser_left_btn_clicked, NULL);
@@ -1080,6 +1116,7 @@ static void __apps_view_chooser_left_btn_clicked(void *data, Evas_Object *obj, c
 static void __apps_view_chooser_right_btn_clicked(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
     LOGD("Done button clicked");
+    app_data_t *dest_folder_item = apps_view_s.dest_folder;
     Eina_List *find_list;
     app_data_t *item = NULL;
     EINA_LIST_FOREACH(apps_view_s.selected_items, find_list, item) {
@@ -1101,6 +1138,7 @@ static void __apps_view_chooser_right_btn_clicked(void *data, Evas_Object *obj,
     }
     //apps_view_update_folder_icon(apps_view_s.dest_folder);
     apps_view_set_state(VIEW_STATE_NORMAL);
+    __apps_view_open_folder_popup(dest_folder_item);
 }
 
 static void __apps_view_update_chooser_text(int item_count)
@@ -1420,10 +1458,6 @@ static void __apps_view_edit_pick_up_icon(void *data)
 
 static void __apps_view_edit_drag_icon(void *data)
 {
-    int page_x, page_y;
-    int bg_x, bg_y, bg_w, bg_h;
-    int widget_x, widget_y;
-
     if (!apps_view_s.picked_item)
         return ;
 
@@ -1464,7 +1498,6 @@ static void __apps_view_edit_drag_icon(void *data)
         if (apps_view_s.picked_item->parent_db_id == APPS_ROOT) {
             int index = __apps_view_get_index(apps_view_s.current_page, apps_mouse_info.move_x - apps_mouse_info.offset_x,
                     apps_mouse_info.move_y - apps_mouse_info.offset_y);
-            LOGD("ttt index = %d", index);
             if(apps_view_s.candidate_folder == NULL ||
                     apps_view_s.candidate_folder->position != index) {
                 if (apps_view_s.candidate_folder)
@@ -1475,7 +1508,6 @@ static void __apps_view_edit_drag_icon(void *data)
                 }
             }
             if (apps_view_s.candidate_folder) {
-                LOGD("ttt this is folder");
                 elm_object_signal_emit(apps_view_s.candidate_folder->folder_layout, SIGNAL_FRAME_POSSIBLE_SHOW, SIGNAL_SOURCE);
             }
         }
@@ -1508,8 +1540,6 @@ static void __apps_view_edit_drop_icon(void *data)
             char str[1024];
             sprintf(str, _("IDS_HS_TPOP_MAXIMUM_NUMBER_OF_APPLICATIONS_IN_FOLDER_HPD_REACHED"), APPS_FOLDER_MAX_ITEM);
             toast_show(str);
-            apps_view_icon_set(item);
-            return ;
         } else {
             item->parent_db_id = apps_view_s.candidate_folder->db_id;
             apps_db_update(apps_view_s.picked_item);
diff --git a/src/cluster_view.c b/src/cluster_view.c
index d456b0e..dd07a3c 100755
--- a/src/cluster_view.c
+++ b/src/cluster_view.c
@@ -324,7 +324,7 @@ void cluster_view_hw_menu_key(void)
         menu_change_state_on_hw_menu_key(cluster_menu_table);
 }
 
-bool cluster_view_hw_home_key(void)
+void cluster_view_hw_home_key(void)
 {
     if (cluster_view_s.view_state == VIEW_STATE_NORMAL) {
         __cluster_view_scroll_to_home();
@@ -335,8 +335,6 @@ bool cluster_view_hw_home_key(void)
     } else if (cluster_view_s.view_state == VIEW_STATE_ALL_PAGE) {
         cluster_view_set_state(VIEW_STATE_NORMAL);
     }
-
-    return true;
 }
 
 bool cluster_view_hw_back_key(void)
@@ -478,7 +476,13 @@ bool cluster_view_add_widget(widget_data_t *item, bool scroll)
 
                 Evas_Smart_Cb func[3] = { NULL, NULL, NULL };
                 void *data[3] = { NULL, NULL, NULL };
-                popup_show(POPUP_CLUSTER_PAGE_FULL, 1, func, data);
+                char btn_text[3][STR_MAX] = { "", "", "" };
+                char title_text[STR_MAX] = { "" };
+                char popup_text[STR_MAX] = { "" };
+                snprintf(btn_text[0], sizeof(btn_text[0]), "%s", _("IDS_CAM_SK_OK"));
+                snprintf(title_text, sizeof(title_text), "%s", _("IDS_HS_HEADER_UNABLE_TO_ADD_WIDGET_ABB"));
+                snprintf(popup_text, sizeof(popup_text), "%s", _("IDS_HS_POP_UNABLE_TO_ADD_THIS_HOME_BOX_TO_THE_HOME_SCREEN_THERE_IS_NOT_ENOUGH_SPACE_ON_THE_HOME_SCREEN_MSG"));
+                popup_show(1, func, data, btn_text, title_text, popup_text);
                 return false;
             } else {
                 cluster_page_t *page_t = __cluster_view_page_new();
@@ -766,7 +770,14 @@ static void __cluster_view_allpage_delete_clicked(void *data, Evas_Object *obj,
     if (eina_list_count(page_item->widget_list) > 0) {
         Evas_Smart_Cb func[3] = { __cluster_view_allpage_delete_page_cb, NULL, NULL };
         void *data[3] = { page_item, NULL, NULL };
-        popup_show(POPUP_CLUSTER_DELETE_PAGE, 2, func, data);
+        char btn_text[3][STR_MAX] = { "", "", "" };
+        char title_text[STR_MAX] = { "" };
+        char popup_text[STR_MAX] = { "" };
+        snprintf(btn_text[0], sizeof(btn_text[0]), "%s", _("IDS_HS_OPT_DELETE"));
+        snprintf(btn_text[1], sizeof(btn_text[1]), "%s", _("IDS_CAM_SK_CANCEL"));
+        snprintf(title_text, sizeof(title_text), "%s", _("IDS_HS_HEADER_DELETE_PAGE_ABB2"));
+        snprintf(popup_text, sizeof(popup_text), "%s", _("IDS_HS_POP_THIS_PAGE_AND_ALL_THE_ITEMS_IT_CONTAINS_WILL_BE_DELETED"));
+        popup_show(2, func, data, btn_text, title_text, popup_text);
     } else {
         __cluster_view_allpage_delete_page_cb(page_item, NULL, NULL);
     }
diff --git a/src/homescreen-efl.c b/src/homescreen-efl.c
index 00661b1..5f4fc9c 100755
--- a/src/homescreen-efl.c
+++ b/src/homescreen-efl.c
@@ -338,13 +338,10 @@ void homescreen_efl_hw_menu_key_release(void)
 void homescreen_efl_hw_home_key_release(void)
 {
     if (main_info.view_type == HOMESCREEN_VIEW_HOME) {
-        if (cluster_view_hw_home_key() == false) {
-            __homescreen_efl_change_view();
-        }
+        cluster_view_hw_home_key();
     } else if (main_info.view_type == HOMESCREEN_VIEW_APPS) {
-        if (apps_view_hw_home_key() == false) {
-            __homescreen_efl_change_view();
-        }
+        apps_view_hw_home_key();
+        __homescreen_efl_change_view();
     }
 }
 
diff --git a/src/hw_key.c b/src/hw_key.c
index 7ff7ab0..946867a 100755
--- a/src/hw_key.c
+++ b/src/hw_key.c
@@ -23,6 +23,7 @@
 #include "conf.h"
 #include "homescreen-efl.h"
 #include "menu.h"
+#include "popup.h"
 
 #define KEY_HOME "XF86Home"
 #define KEY_MENU "XF86Menu"
@@ -112,6 +113,8 @@ static Eina_Bool __hw_key_release_cb(void *data, int type, void *event)
     if (!strcmp(ev->keyname, KEY_BACK)) {
         if (menu_is_show()) {
             menu_hide();
+        } else if (popup_is_show()) {
+            popup_hide();
         } else {
             homescreen_efl_hw_back_key_release();
         }
@@ -120,6 +123,8 @@ static Eina_Bool __hw_key_release_cb(void *data, int type, void *event)
     } else if (!strcmp(ev->keyname, KEY_HOME)) {
         if (menu_is_show()) {
             menu_hide();
+        } else if (popup_is_show()) {
+            popup_hide();
         }
         homescreen_efl_hw_home_key_release();
     } else {
diff --git a/src/menu.c b/src/menu.c
index 973a5c2..07456d7 100755
--- a/src/menu.c
+++ b/src/menu.c
@@ -27,7 +27,7 @@ static struct {
 };
 
 /* menu_item_t */
-static const char menu_text[MENU_MAX][STR_MAX] = {
+static const char menu_text[MENU_MAX][STR_ID_LEN] = {
         "IDS_HS_OPT_EDIT",
         "IDS_HS_HEADER_ADD_WIDGET",
         "IDS_HS_OPT_CHANGE_WALLPAPER_ABB",
diff --git a/src/popup.c b/src/popup.c
index 502230f..670aaf9 100755
--- a/src/popup.c
+++ b/src/popup.c
@@ -20,7 +20,6 @@
 
 #include "homescreen-efl.h"
 #include "popup.h"
-#include "conf.h"
 #include "util.h"
 
 static struct {
@@ -31,32 +30,14 @@ static struct {
     .is_visible = false
 };
 
-/* popup_t
- * 0 : POPUP_CLUSTER_PAGE_FULL
- * 1 : POPUP_CLUSTER_DELETE_PAGE
- */
-static const char popup_title_text[POPUP_MAX][STR_MAX] = {
-        "IDS_HS_HEADER_UNABLE_TO_ADD_WIDGET_ABB",
-        "IDS_HS_HEADER_DELETE_PAGE_ABB2",
-};
-
-static const char popup_text[POPUP_MAX][STR_MAX] = {
-        "IDS_HS_POP_UNABLE_TO_ADD_THIS_HOME_BOX_TO_THE_HOME_SCREEN_THERE_IS_NOT_ENOUGH_SPACE_ON_THE_HOME_SCREEN_MSG",
-        "IDS_HS_POP_THIS_PAGE_AND_ALL_THE_ITEMS_IT_CONTAINS_WILL_BE_DELETED",
-};
-
-static const char popup_button_text[POPUP_MAX][3][STR_MAX] = {
-        { "IDS_CAM_SK_OK", "", "" },
-        { "IDS_HS_OPT_DELETE", "IDS_CAM_SK_CANCEL", "" }
-};
-
 static void __popup_default_cb(void *data, Evas_Object *obj, void *event_info);
 static void __popup_dismissed_cb(void *data, Evas_Object *obj, void *event_info);
 
 static void __toast_timeout_cb(void *data, Evas_Object *obj, void *event_info);
 static void __toast_block_clicked_cb(void *data, Evas_Object *obj, void *event_info);
 
-void popup_show(popup_t type, int btn_count, Evas_Smart_Cb btn_func[3], void *func_data[3])
+void popup_show(int btn_count, Evas_Smart_Cb btn_func[3], void *func_data[3],
+        const char (*btn_text)[STR_MAX], const char *title_text, const char *popup_text)
 {
     if (popup_info.is_visible) {
         return ;
@@ -69,8 +50,8 @@ void popup_show(popup_t type, int btn_count, Evas_Smart_Cb btn_func[3], void *fu
     popup_info.popup = elm_popup_add(homescreen_efl_get_win());
     elm_popup_align_set(popup_info.popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
     evas_object_size_hint_weight_set(popup_info.popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    elm_object_part_text_set(popup_info.popup, "title,text", _(popup_title_text[type]));
-    elm_object_part_text_set(popup_info.popup, "default", _(popup_text[type]));
+    elm_object_part_text_set(popup_info.popup, "title,text", title_text);
+    elm_object_part_text_set(popup_info.popup, "default", popup_text);
     evas_object_smart_callback_add(popup_info.popup, "dismissed", __popup_dismissed_cb, NULL);
 
     int idx = 0;
@@ -78,7 +59,7 @@ void popup_show(popup_t type, int btn_count, Evas_Smart_Cb btn_func[3], void *fu
         Evas_Object *btn;
         btn = elm_button_add(popup_info.popup);
         elm_object_style_set(btn, "popup");
-        elm_object_text_set(btn, _(popup_button_text[type][idx]));
+        elm_object_text_set(btn, btn_text[idx]);
         elm_object_part_content_set(popup_info.popup, part[idx], btn);
         evas_object_smart_callback_add(btn, "clicked",
                 (btn_func[idx] == NULL ? __popup_default_cb : btn_func[idx]), func_data[idx]);