From 1dabcddd1eb9610ca80e8e7303a6be8bcd27a6ff Mon Sep 17 00:00:00 2001
From: Vinay Sachdeva <v.sachdeva@samsung.com>
Date: Thu, 12 Sep 2013 20:17:04 +0530
Subject: [PATCH] Fixed Nabi Issues
 N_SE-51372,N_SE-51671,N_SE-51871,N_SE-51866,N_SE-51567,N_SE-51536,N_SE-51754,N_SE-51390,N_SE-51762

Change-Id: I6d5d182eeca05440a0befb5d9d94e0fdcb2cf153
Signed-off-by: Vinay Sachdeva <v.sachdeva@samsung.com>
---
 .../I01_search_icon_refresh.png                    | Bin 3546 -> 3482 bytes
 res/screen-size-normal/IDL_ADD_BOOKMARK.xml        |   6 ++--
 .../IDL_CREATE_BOOKMARK_FOLDER.xml                 |   6 ++--
 res/screen-size-normal/IDL_EDIT_HOME_PAGE.xml      |   6 ++--
 res/screen-size-normal/IDL_FORM.xml                |   4 +--
 src/IntAddBookmarkForm.cpp                         |  16 ++++-----
 src/IntCreateBookmarkFolderForm.cpp                |   4 +--
 src/IntEditBookmarkListForm.cpp                    |   5 ++-
 src/IntEditHistoryListForm.cpp                     |   4 +--
 src/IntEditHomePageForm.cpp                        |   4 +--
 src/IntHistoryListForm.cpp                         |  14 ++++++++
 src/IntMainForm.cpp                                |  38 +++++++++++++++------
 src/IntRadioCustomItem.cpp                         |   2 +-
 src/IntSettingForm.cpp                             |   2 +-
 14 files changed, 73 insertions(+), 38 deletions(-)

diff --git a/res/screen-density-xhigh/I01_search_icon_refresh.png b/res/screen-density-xhigh/I01_search_icon_refresh.png
index eb1003680cdcab3ebb73679a75be222b15493caf..b62f105994d7842e3d5b904ed46cc4a2d19560f6 100644
GIT binary patch
delta 774
zcmV+h1Nr>g8=4y-iBL{Q4GJ0x0000DNk~Le0000g0000h2nGNE01lrT{;?s93Jwtf
z01FWTe`H^g0000Qle-EWe=#sH^m3s900N~+L_t(oN9~qNNL4`?$JGiA%hD(dFVX`_
zXmhs_ln5b0EkcaCgf4`ZK`kPr7Quy9B`$(q+?|^!qIPW(+7v-()Fvnd!y=<=(Nn8i
zzdz1_<Kf7hIdJU3T=;S3p7~z$&CGYcsw)5U8SokK8SokK8Tc<Ve^4rwmOvwHG&J*E
z_E#*HK&qi0_QGYj3r`I9d0vA)SO+x<9QMPiMO%Q$-~pZw;FpD$%%6daM(*&U1d6j-
zI1e8Z1Q{&i2ePw9eptJaX|On`g8`7^AczX%X}AYNa2Bq^EBGF>m{H!X%{tKDi1Qi#
zUxIB>$Gp?o)LD%le+?~acV>ZNycNbmj?0Yup*AK+U7nMmg+v3@4jj!g&?7hq&e>1K
zMTjjyyjQt81{3fx<_O%(GSHDwb{;ccZ*zu>&h!ow^bMYqpo~u1bW_b^cn!P_1$vrs
z;+rd3SPnY3d!Udi5StQ)x5GGmF&XK!>HM*I0^9)IFbKIce}SO43$~=ub=JYrQmAoO
zL;=00@D3irzBD$hIv8FFEzqQ3tqKtVbXLGubIw&Yj=S1OB#&X08+~bX<1fG=*qlgt
zE}Ok3NYz!H^=!^LhSep>K~TWIF)o7|lT)zZXOX#0pigI@`+{*p(nUJSVYm(CAg)__
z&HH?uLEf*1e=DHvmah7QqLXtMVT`Mvyb}|sjzbU3yI}lR?c55tAl#hj=(M`{c9z9~
zI;XgAx3>QTbU_Cc;3|}%64H6YxD%XxJ1O8`r`fuNn&r>TzYlG5SWaD&>acUga0*hw
zI8k|e2A|B9s^PG8_?lPU>~MCNRzcYSbx|r!YB=<1NIeISU@8=}s>5@*4F{ni^X;}R
ziU8Dm<{%I426arjNGkF+6Mo)jz-Pc`z-Pc`;2+DtZx?s?Qq2KxJOBUy07*qoM6N<$
Ef~XQ+cmMzZ

delta 839
zcmbOweM?%gGr-TCmrII^fq{Y7)59eQNPB=V2OE$KeY@Fxqhb#ipAZ8Bw-Do{yLEqn
zqLPz$bIH`3dUpMJz`(%t%+tj&q$2L^tlB~*LxH0c8(35n7&$#0oKzny-~*B&OhOYH
zTFlmOHlG|f`Awd_;?9SqYV}|Ao;;p@cl++fvu*V%4oo=F1}UcLr&GmmDQ@|^X6}a?
zQ|XmEFKqZ&n{mDV!n=jFlDFJnFelvpX?19``IcF)Uz<&fIJKP7gYTB}nm6oI9OnIc
zw>vlI<q?aY7ZO;-vNwKVT=BEw`O?>KK2;W~=bYH|QMEQN)@(=0CG|ry5B$5hLiKh2
zuSoVeCu0SU_ALq)i2GAt9CdHw%Vk--db1Yq6ji$6IotS)qZC7g*!SJ_S&w-?-cvZS
zZi7vCm}<axMTRM2ih4m@m)8}%X)r#!Q(7wMMu6t|kB1toBV)ARE#8%D-k@}5C-2TX
zS+`nV^qW3Dc1Qj$Lxyns(Y@(@HHCdjNxenR+JSPntak6^?>;}b<m(6RYh5J_l3&+%
z+~jRgI%m1J!YgIsgNBj^@$2r$WYsHHtyMP9^yN^WesR8`{}$5;SAI;KaBNq>i;dGl
z&uHddHz^c8?fPYn97h;qWORy>q3fcmYj)p_-ZS^49Q|*^Fy#u9`P7wX{%Wpl{VkBT
zl+919($jb%U$XLMKSrs|cLK5uUCfp+t!oP1xFF`4U0#-<|8HaUo=Xg-p`TXEbiWj<
z|D+cYa`{ANWc;@ND{k|&xylPQr_I{EQRebqwWL!gmmS!t_1D0zWoOCXi$0&lBK=rS
z6rW^OydR}5c3ShG<n1aYk7?X`J32V~B6`aT^X1N0DV+V)$q-$_p|E+PuMS(Pi(mdD
z%WJ_|3-nI8=<`aQV%d^X79;Wb%9}0GJUV&{57w{vS{GZOB>O3<QC#9q-kXl4DLXf=
zU=phnX8HcH$>Xd0q)ee7Vsb&LJ}H}(*6nw)^t-G0$WSJN=RnVF)o?}i<_<sK_{U3h
yxE(&o1oAA}pVz&Tvp;zv1Lp)Bh{x-J^t6hv2R&!cRR?AQP6kg`KbLh*2~7Yf<7$=w

diff --git a/res/screen-size-normal/IDL_ADD_BOOKMARK.xml b/res/screen-size-normal/IDL_ADD_BOOKMARK.xml
index d8848ae..6ebf53f 100644
--- a/res/screen-size-normal/IDL_ADD_BOOKMARK.xml
+++ b/res/screen-size-normal/IDL_ADD_BOOKMARK.xml
@@ -4,7 +4,7 @@
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
 
-<Scene Bversion="2.0.0.201308220944" Dversion="20120315">
+<Scene Bversion="2.0.0.201309041510" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_ADD_BOOKMARK">
         <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
@@ -14,8 +14,8 @@
     <Header>
         <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" showBackButton="false" titleIconPath="" titleText="Add Bookmarks" titleTextColor=""/>
         <itemSet>
-            <buttonItem accessibilityHint="" actionId="102" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_LEFT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_COM_SK_SAVE" type="left"/>
-            <buttonItem accessibilityHint="" actionId="103" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_RIGHT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_CANCEL" type="right"/>
+            <buttonItem accessibilityHint="" actionId="103" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_LEFT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_CANCEL" type="left"/>
+            <buttonItem accessibilityHint="" actionId="102" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_RIGHT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_COM_SK_SAVE" type="right"/>
         </itemSet>
     </Header>
     <ScrollPanel id="IDC_SCROLLPANEL2" parent="IDL_ADD_BOOKMARK">
diff --git a/res/screen-size-normal/IDL_CREATE_BOOKMARK_FOLDER.xml b/res/screen-size-normal/IDL_CREATE_BOOKMARK_FOLDER.xml
index fb2c97d..5310600 100644
--- a/res/screen-size-normal/IDL_CREATE_BOOKMARK_FOLDER.xml
+++ b/res/screen-size-normal/IDL_CREATE_BOOKMARK_FOLDER.xml
@@ -4,7 +4,7 @@
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
 
-<Scene Bversion="2.0.0.201308220944" Dversion="20120315">
+<Scene Bversion="2.0.0.201309041510" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_CREATE_BOOKMARK_FOLDER">
         <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
@@ -14,8 +14,8 @@
     <Header>
         <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" showBackButton="false" titleIconPath="" titleText="" titleTextColor=""/>
         <itemSet>
-            <buttonItem accessibilityHint="" actionId="101" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_LEFT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_DONE" type="left"/>
-            <buttonItem accessibilityHint="" actionId="102" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_RIGHT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_CANCEL" type="right"/>
+            <buttonItem accessibilityHint="" actionId="102" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_LEFT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_CANCEL" type="left"/>
+            <buttonItem accessibilityHint="" actionId="101" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_RIGHT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_DONE" type="right"/>
         </itemSet>
     </Header>
     <Label id="IDC_LABEL1" parent="IDL_CREATE_BOOKMARK_FOLDER">
diff --git a/res/screen-size-normal/IDL_EDIT_HOME_PAGE.xml b/res/screen-size-normal/IDL_EDIT_HOME_PAGE.xml
index 81791e8..c3d2bc8 100644
--- a/res/screen-size-normal/IDL_EDIT_HOME_PAGE.xml
+++ b/res/screen-size-normal/IDL_EDIT_HOME_PAGE.xml
@@ -4,7 +4,7 @@
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
 
-<Scene Bversion="2.0.0.201307161751" Dversion="20120315">
+<Scene Bversion="2.0.0.201309041510" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_EDIT_HOME_PAGE">
         <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
@@ -14,8 +14,8 @@
     <Header>
         <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" showBackButton="false" titleIconPath="" titleText="::IDS_BR_BODY_HOMEPAGE" titleTextColor=""/>
         <itemSet>
-            <buttonItem accessibilityHint="" actionId="102" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_RIGHT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_CANCEL" type="right"/>
-            <buttonItem accessibilityHint="" actionId="101" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_LEFT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_DONE" type="left"/>
+            <buttonItem accessibilityHint="" actionId="101" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_RIGHT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_DONE" type="right"/>
+            <buttonItem accessibilityHint="" actionId="102" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="" position="BUTTON_POSITION_LEFT" pressedBGBitmapPath="" pressedIconPath="" style="BUTTON_ITEM_STYLE_TEXT" text="::IDS_BR_SK_CANCEL" type="left"/>
         </itemSet>
     </Header>
     <Label id="IDC_LABEL1" parent="IDL_EDIT_HOME_PAGE">
diff --git a/res/screen-size-normal/IDL_FORM.xml b/res/screen-size-normal/IDL_FORM.xml
index 3853fdc..511350a 100644
--- a/res/screen-size-normal/IDL_FORM.xml
+++ b/res/screen-size-normal/IDL_FORM.xml
@@ -4,7 +4,7 @@
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
 
-<Scene Bversion="2.0.0.201307161751" Dversion="20120315">
+<Scene Bversion="2.0.0.201309041510" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_FORM">
         <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
@@ -47,7 +47,7 @@
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="78.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_MULTIWINDOW_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_PAGEBACK_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="944.0" x="112.0" y="19.0"/>
     </Label>
     <Button id="IDC_STOP_BUTTON" parent="IDC_FOOTER_PANEL">
-        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="I01_field_btn_Clear.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="I01_field_btn_Clear.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="43.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="42.0" x="454.0" y="40.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="30.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_FOOTER_LABEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="43.0" x="983.0" y="35.0"/>
     </Button>
diff --git a/src/IntAddBookmarkForm.cpp b/src/IntAddBookmarkForm.cpp
index d21500c..441d781 100644
--- a/src/IntAddBookmarkForm.cpp
+++ b/src/IntAddBookmarkForm.cpp
@@ -954,10 +954,10 @@ AddBookmarkForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId
 		}
 	}
 
-	if(__pEditFieldTitle != NULL)
-	{
-		__pEditFieldTitle->ShowKeypad();
-	}
+//	if(__pEditFieldTitle != NULL)
+//	{
+//		__pEditFieldTitle->ShowKeypad();
+//	}
 	if ( previousSceneId != IDSCN_CREATE_BOOKMARK_FOLDER )
 	{
 		if (__pEditFieldTitle != NULL)
@@ -1059,12 +1059,12 @@ AddBookmarkForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId
 	// To disable done button if either of the Title or Url field is empty
 	if (title.GetLength() == 0 || url.GetLength() == 0)
 	{
-		pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, false);
+		pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);
 		pHeader->Invalidate(true);
 	}
 	else
 	{
-		pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, true);
+		pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, true);
 		pHeader->Invalidate(true);
 	}
 
@@ -1145,12 +1145,12 @@ AddBookmarkForm::OnTextValueChanged(const Control& source)
 	// To disable done button if either of the Title or Url field is empty
 	if (title.GetLength() == 0 || url.GetLength() == 0)
 	{
-		pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, false);
+		pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);
 		pHeader->Invalidate(true);
 	}
 	else
 	{
-		pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, true);
+		pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, true);
 		pHeader->Invalidate(true);
 	}
 
diff --git a/src/IntCreateBookmarkFolderForm.cpp b/src/IntCreateBookmarkFolderForm.cpp
index 838805b..d1b750b 100644
--- a/src/IntCreateBookmarkFolderForm.cpp
+++ b/src/IntCreateBookmarkFolderForm.cpp
@@ -443,11 +443,11 @@ CreateBookmarkFolderForm::OnTextValueChanged(const Control& source)
 	// To disable done button when folder title edit-field is empty
 	if (__pFolderTitle && title.GetLength() == 0)
 	{
-		pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, false);
+		pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);
 	}
 	else
 	{
-		pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, true);
+		pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, true);
 	}
 	pHeader->Invalidate(true);
 	return;
diff --git a/src/IntEditBookmarkListForm.cpp b/src/IntEditBookmarkListForm.cpp
index b8c6ec9..dd630ed 100644
--- a/src/IntEditBookmarkListForm.cpp
+++ b/src/IntEditBookmarkListForm.cpp
@@ -468,7 +468,6 @@ EditBookmarkListForm::CreateItem(int index, int itemWidth)
 
 		pItem->AddElement(Rectangle(92, 8, width_Title/*__pListview->GetWidth() - 92 - 80*/, 112 + (__fontSize - 44)), IDA_FORMAT_FOLDER, pBookMark->GetBookmarkTitle(),__fontSize, CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true);
 
-
 		pBitmap = AppResource::GetInstance()->GetBitmapN(IDB_ITEM);
 
 		if (pBitmap != null)
@@ -822,6 +821,10 @@ EditBookmarkListForm::OnSceneActivatedN(const SceneId& previousSceneId, const Sc
 	__pListview->UpdateList();
 
 	count = __pListview->GetItemCount();
+	if(count == 0)
+	{
+		__pTimer->Start(1000);
+	}
 
 	for(int index = 0 ; index < count ; index++)
 	{
diff --git a/src/IntEditHistoryListForm.cpp b/src/IntEditHistoryListForm.cpp
index 5e79a57..55e5bb1 100644
--- a/src/IntEditHistoryListForm.cpp
+++ b/src/IntEditHistoryListForm.cpp
@@ -515,7 +515,7 @@ EditHistoryListForm::CreateGroupItem(int groupIndex, int itemWidth)
 	if (pGroupItemClass->__titleText != L"Older")
 	{
 		text.Append(pGroupItemClass->__startTime.GetDay());
-		text.Append(L". ");
+		text.Append(L" ");
 		strMonth = pGroupItemClass->__startTime.GetMonth();
 		month = GetMonth(strMonth);
 		text.Append(month);
@@ -529,7 +529,7 @@ EditHistoryListForm::CreateGroupItem(int groupIndex, int itemWidth)
 	{
 		text.Append(L" - ");
 		text.Append(pGroupItemClass->__endTime.GetDay());
-		text.Append(L". ");
+		text.Append(L" ");
 		strMonth = pGroupItemClass->__endTime.GetMonth();
 		month = GetMonth(strMonth);
 		text.Append(month);
diff --git a/src/IntEditHomePageForm.cpp b/src/IntEditHomePageForm.cpp
index 88256ae..0448bab 100644
--- a/src/IntEditHomePageForm.cpp
+++ b/src/IntEditHomePageForm.cpp
@@ -232,11 +232,11 @@ EditHomePageForm::OnTextValueChanged(const Control& source)
 	// To disable done button when folder title edit-field is empty
 	if (__pUrlEditField && title.IsEmpty() == true)
 	{
-		pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, false);
+		pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, false);
 	}
 	else
 	{
-		pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, true);
+		pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, true);
 	}
 	pHeader->Invalidate(true);
 	return;
diff --git a/src/IntHistoryListForm.cpp b/src/IntHistoryListForm.cpp
index 8cdb954..6dba4ff 100644
--- a/src/IntHistoryListForm.cpp
+++ b/src/IntHistoryListForm.cpp
@@ -590,6 +590,7 @@ HistoryListForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 	}
 	if (pBitmap != null)
 	{
+		AppLog("rrrr:: width %d height %d of the faviconbitmap",pBitmap->GetWidth(),pBitmap->GetHeight());
 		r = pItem->AddElement(Rectangle(16, 28 + (__fontSize - 44)/2,72, 72), IDA_FORMAT_ICON, *pBitmap, null);
 		delete pBitmap;
 		if (IsFailed(r))
@@ -1980,4 +1981,17 @@ HistoryListForm::OnSettingChanged(Tizen::Base::String& key)
 	{
 		__pGroupedListView->UpdateList();
 	}
+	if (__isNoHistoryPresent == true )
+	{
+		if(__pSearchBar)
+			__pSearchBar->SetShowState(false);
+		GetFooter()->SetItemEnabled(0, false);
+	}
+	else
+	{
+		if(__pSearchBar)
+			__pSearchBar->SetShowState(true);
+		GetFooter()->SetItemEnabled(0, true);
+	}
+	GetFooter()->Invalidate(true);
 }
diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 70c1f4c..d9b4a8d 100644
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -2487,7 +2487,6 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 	break;
 	case IDA_PASTE_TEXT_CLICKED:
 	{
-		__pWebViewer->ReleaseBlock();
 		Clipboard* pClipboard = Clipboard::GetInstance();
 
 		if(pClipboard == null)
@@ -2551,6 +2550,8 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 			delete pCount;
 		}
 		delete pItem;
+		if(__pWebViewer)
+			__pWebViewer->ReleaseBlock();
 	}
 	break;
 	case IDA_GO_BACK:
@@ -3092,7 +3093,7 @@ MainForm::OnLoadingStarted(void)
 		if (__pWindowInfo != NULL)
 		{
 			// resetting the page title to blank, it will be received in OnPageTitleReceived()
-			__pWindowInfo->pageTitle = L"";
+//			__pWindowInfo->pageTitle = L"";
 			__pWindowInfo->pageUrl = __pWebViewer->GetUrl();
 		}
 		__pAddressbar->Invalidate(true);
@@ -3162,6 +3163,8 @@ MainForm::OnLoadingCompleted(void)
 		return;
 	}
 
+	if(__pWindowInfo && __pWebViewer)
+		__pWindowInfo->pageTitle = __pWebViewer->GetTitle();
 	if(__pImageMenu && __pImageMenu->GetShowState())
 	{
 		__pImageMenu->SetShowState(false);
@@ -3226,7 +3229,6 @@ MainForm::OnLoadingCompleted(void)
 				__pHistory->SetFavIconBitmap(*pTempBitmap);
 			}
 
-			AppLog("MainForm::OnLoadingCompleted setting the fav icon 2");
 		}
 
 		Canvas* pCanvas = __pWebViewer->GetCanvasN();
@@ -3240,6 +3242,13 @@ MainForm::OnLoadingCompleted(void)
 		Bitmap *pFavIcon = __pWebViewer->GetFaviconN();
 		if (pFavIcon)
 		{
+			Tizen::Graphics::BufferInfo bmpInfo;
+			pFavIcon->Lock(bmpInfo);
+			AppLog("rrrr:: width %d height %d of the faviconbitmap from bufferinfo", bmpInfo.width, bmpInfo.height);
+
+			AppLog("MainForm::OnLoadingCompleted setting the fav icon 2");
+
+			AppLog("rrrr:: width %d height %d of the faviconbitmap",pFavIcon->GetWidth(),pFavIcon->GetHeight());
 			__pHistory->SetFavIconBitmap(*pFavIcon);
 			delete pFavIcon;
 		}
@@ -3976,7 +3985,7 @@ MainForm::OnWebDataReceived(const Tizen::Base::String& mime,
 void
 MainForm::OnWebPageBlockSelected(Web& source, FloatPoint& startPoint, FloatPoint& endPoint)
 {
-	AppLog("MainForm::OnWebPageBlockSelected");
+	AppLog("LMN::MainForm::OnWebPageBlockSelected");
 //	if(__isLongPressedDone == false)
 //		return;
 
@@ -4028,7 +4037,7 @@ MainForm::OnWebPageBlockSelected(Web& source, FloatPoint& startPoint, FloatPoint
 			AppLog("Tagnameseemstobe INPUT");
 		}
 
-		if (((tagName.Equals(L"INPUT",false) == true)  || tagName.Equals(L"TEXTAREA",false) == true) /*&& __isLongPressedDone == true*/ && __currentSelectedStr.CompareTo(L"") !=0)
+		if (((tagName.Equals(L"INPUT",false) == true)  || tagName.Equals(L"TEXTAREA",false) == true) /*&& __isLongPressedDone == true*/ && __currentSelectedStr.CompareTo(L"") !=0 )
 		{
 			AppLog("MainForm::OnWebPageBlockSelected show paste option");
 
@@ -4612,6 +4621,11 @@ MainForm::OnWebKeypadClosed(Tizen::Web::Controls::Web& source)
 		__pWebViewer->GetBlockRange(p,q);
 		if (p == Point(0,0) && q == Point(0,0))
 			return;
+		if(p.y < 150)
+		{
+			p.y = p.y + 100;
+
+		}
 
 		__pImageMenu->SetAnchorPosition(p);
 		__pImageMenu->Show();
@@ -4652,14 +4666,16 @@ MainForm::OnTouchDoublePressed(const Control& source, const Point& currentPositi
 
 void MainForm::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)
 {
-	AppLog("abcde::MainForm::OnTouchLongPressed %d, %d" ,currentPosition.x,currentPosition.y);
+	AppLog("LMN::abcde::MainForm::OnTouchLongPressed %d, %d" ,currentPosition.x,currentPosition.y);
 	if(TouchEventManager::GetInstance() && TouchEventManager::GetInstance()->GetTouchInfoListN() && TouchEventManager::GetInstance()->GetTouchInfoListN()->GetCount() >1)
 	{
 		AppLog("Returning because of more than one touch point.");
 		return;
 	}
+//	if(__pWebViewer)
+//		__pWebViewer->ReleaseBlock();
 	if(__pWebViewer)
-		__pWebViewer->ReleaseBlock();
+		__pWebViewer->SetFocus();
 	__longPressPoint = currentPosition;
 
 	if (__pHitElementResult != null)
@@ -4711,7 +4727,7 @@ void MainForm::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen:
 		String type = __pHitElementResult->GetAttributeValue("type");
 		String value = __pHitElementResult->GetAttributeValue(L"value");
 		String innerHtml = __pHitElementResult->GetAttributeValue(L"innerHTML");
-
+		result r = E_FAILURE;
 		__currentSelectedStr.Clear();
 		__currentSelectedStr = __pWebViewer->GetTextFromBlock();
 
@@ -4721,8 +4737,9 @@ void MainForm::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen:
 
 
 		__isLongPressedDone = true;
-		result r =__pWebViewer->SetBlockSelectionPosition(currentPosition);
-		if (((tagName.Equals(L"INPUT",false) == true)  || tagName.Equals(L"TEXTAREA",false) == true) && innerHtml.GetLength() == 0  && type.Equals(L"submit",false) !=true && type.Equals(L"range",false) !=true/*&& __isWebKeypadOpened == true*/ && __currentSelectedStr.Equals(L"",false) == true && r == E_INVALID_ARG)
+		if( type.Equals(L"submit",false) !=true && type.Equals(L"checkbox",false) !=true && type.Equals(L"range",false) !=true && type.Equals(L"file",false) !=true)
+			r =__pWebViewer->SetBlockSelectionPosition(currentPosition);
+		if (((tagName.Equals(L"INPUT",false) == true)  || tagName.Equals(L"TEXTAREA",false) == true) && innerHtml.GetLength() == 0  && type.Equals(L"submit",false) !=true && type.Equals(L"checkbox",false) !=true && type.Equals(L"range",false) !=true  && type.Equals(L"file",false) !=true/*&& __isWebKeypadOpened == true*/ && __currentSelectedStr.Equals(L"",false) == true && r == E_INVALID_ARG)
 		{
 			AppLog("MainForm::OnWebPageBlockSelected show paste option");
 
@@ -5269,6 +5286,7 @@ MainForm::OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphics
 void
 MainForm::OnTouchMoved(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)
 {
+	AppLog("LMN::MainForm::OnTouchMoved entered");
 //	__currentWordIndex = 0;
 	__isLongPressedDone = false;
 
diff --git a/src/IntRadioCustomItem.cpp b/src/IntRadioCustomItem.cpp
index 608650a..1f58b61 100644
--- a/src/IntRadioCustomItem.cpp
+++ b/src/IntRadioCustomItem.cpp
@@ -77,7 +77,7 @@ RadioCustomItem::Make(void)
 	Color pressedTextColor = CUSTOM_COLOR_LISTVIEW_TEXT;
 
 	AppLogDebug("RadioCustomItem::the text is %ls",__text.GetPointer());
-	r = AddElement(Rectangle(16, 5, __width - 60 , __height), IDA_FORMAT_STRING, __text, __fontSize, textColor, textColor, textColor, true);
+	r = AddElement(Rectangle(16, 5, __width - 120 , __height), IDA_FORMAT_STRING, __text, __fontSize, textColor, textColor, textColor, true);
 	TryCatch(!IsFailed(r),,"RadioCustomItem::the value is %s",GetErrorMessage(r));
 
 	CATCH:
diff --git a/src/IntSettingForm.cpp b/src/IntSettingForm.cpp
index 426e6b3..519ed70 100644
--- a/src/IntSettingForm.cpp
+++ b/src/IntSettingForm.cpp
@@ -229,7 +229,7 @@ SettingForm::InitializeSettingValues(void)
 	settingInfo[SETTING_SEARCH_ENGINE_NAVER].itemType = ITEM_TYPE_RADIO;
 	settingInfo[SETTING_SEARCH_ENGINE_NAVER].isSelected = !(String::Compare(settingInfo[SETTING_SEARCH_ENGINE_NAVER].titleText, settingInfo[SETTING_SEARCH_ENGINE_TITLE].subText));
 
-	settingInfo[SETTING_SEARCH_ENGINE_GOOGLE].titleText = CommonUtil::GetString(L"IDS_COM_BODY_GOOGLE");
+	settingInfo[SETTING_SEARCH_ENGINE_GOOGLE].titleText = L"Google";//CommonUtil::GetString(L"IDS_COM_BODY_GOOGLE");
 	settingInfo[SETTING_SEARCH_ENGINE_GOOGLE].subText = L"";
 	settingInfo[SETTING_SEARCH_ENGINE_GOOGLE].itemType = ITEM_TYPE_RADIO;
 	settingInfo[SETTING_SEARCH_ENGINE_GOOGLE].isSelected = !(String::Compare(settingInfo[SETTING_SEARCH_ENGINE_GOOGLE].titleText, settingInfo[SETTING_SEARCH_ENGINE_TITLE].subText));
-- 
2.7.4