Fixed Nabi Issues: 53721,53372,53761,53768

Change-Id: I3b50be28b12af299672ebba6d3630bd66f6cab34
Signed-off-by: Vinay Sachdeva <v.sachdeva@samsung.com>

diff --git a/inc/IntInternetApp.h b/inc/IntInternetApp.h
index 12cd572..4d27e7f 100644 (file)
--- a/inc/IntInternetApp.h
+++ b/inc/IntInternetApp.h
@@ -91,6 +91,7 @@ private:
        Tizen::Base::String __operationId;
        const Tizen::Base::String* __value;
        bool __isShowMsg;
+       Tizen::App::AppControl* __pAc;
 };
 
 #endif // _INT_INTERNET_APP_H_

diff --git a/res/ara-AE.xml b/res/ara-AE.xml
index 2f1ea22..5254104 100644 (file)
--- a/res/ara-AE.xml
+++ b/res/ara-AE.xml
@@ -210,7 +210,7 @@
     <text id="IDS_BR_BODY_PRINT">طباعة</text>
     <text id="IDS_BR_BODY_SECURITY_CERTIFICATE_PROBLEM_MSG">توجد مشاكل في شهادة الأمان الخاصة بهذا الموقع</text>
     <text id="IDS_COM_OPT_BRIGHTNESS">السطوع</text>
-    <text id="IDS_BR_SK3_DELETE">?مسح</text>
+    <text id="IDS_BR_SK3_DELETE">؟مسح</text>
     <text id="IDS_BR_BODY_FONT_SIZE">حجم الخط</text>
     <text id="IDS_BR_OPT_AUTO_DETECT">اكتشاف تلقائي</text>
     <text id="IDS_BR_BODY_REMEMBER_FORM_DATA">تذكر بيانات النموذج</text>

diff --git a/res/deu-DE.xml b/res/deu-DE.xml
index bea6a50..929e0d5 100644 (file)
--- a/res/deu-DE.xml
+++ b/res/deu-DE.xml
@@ -96,7 +96,7 @@
     <text id="IDS_BR_OPT_VIEW_BY_ABB">Ans. von</text>
     <text id="IDS_COM_BODY_TUE">Di</text>
     <text id="IDS_COM_BODY_MON">Mo</text>
-    <text id="IDS_BR_HEADER_MULTI_WINDOW">Multi-Window</text>
+    <text id="IDS_BR_HEADER_MULTI_WINDOW">Multi-venster</text>
     <text id="IDS_BR_POP_ALREADY_EXISTS">Bereits vorhanden</text>
     <text id="IDS_BR_BODY_COPY_URL">URL kopieren</text>
     <text id="IDS_BR_BODY_REMEMBER_PREFERENCE">Voreinstellung merken</text>

diff --git a/res/screen-size-normal/IDL_BRIGHTNESS.xml b/res/screen-size-normal/IDL_BRIGHTNESS.xml
index 7d7c5d5..6bbcaa7 100644 (file)
--- a/res/screen-size-normal/IDL_BRIGHTNESS.xml
+++ b/res/screen-size-normal/IDL_BRIGHTNESS.xml
@@ -4,7 +4,7 @@
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
 
-<Scene Bversion="2.0.0.201307161751" Dversion="20120315">
+<Scene Bversion="2.0.0.201309242034" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_BRIGHTNESS">
         <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
@@ -24,12 +24,12 @@
     </Header>
     <Slider id="IDC_FONT_SLIDER" parent="IDL_BRIGHTNESS">
         <property accessibilityHint="" backgroundColor="" backgroundStyle="BACKGROUND_STYLE_DEFAULT" barBackgroundColor="" barColor="" color="" colorOfTitleText="" colorOpacity="100" disabledThumbBitmap="" disabledThumbTextColor="" groupStyle="GROUP_STYLE_NONE" highlightedThumbBitmap="" highlightedThumbTextColor="" leftIconBitmapPath="00_slider_btn_brightness_01.png" max="10" min="0" normalThumbBitmap="" normalThumbTextColor="" pressedThumbBitmap="" rightIconBitmapPath="00_slider_btn_brightness_02.png" showTitleText="false" sliderStyleBubble="false" sliderStyleTitle="false" titleText="" value="10"/>
-        <layout bottomRelation="IDL_BRIGHTNESS" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_BRIGHTNESS" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_BRIGHTNESS" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="914.0"/>
-        <layout bottomRelation="IDL_BRIGHTNESS" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_BRIGHTNESS" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_BRIGHTNESS" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="432.0"/>
+        <layout bottomRelation="IDL_BRIGHTNESS" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_BRIGHTNESS" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_BRIGHTNESS" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="1012.0"/>
+        <layout bottomRelation="IDL_BRIGHTNESS" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_BRIGHTNESS" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_BRIGHTNESS" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="517.0"/>
     </Slider>
     <Label id="IDC_LABEL" parent="IDL_BRIGHTNESS">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="IDC_FONT_SLIDER"  centerHorizontal="false" centerVertical="false" height="884.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="15.0" marginLeft="0.0" marginRight="0.0" marginTop="15.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDL_BRIGHTNESS" verticalFitPolicy="FIT_POLICY_FIXED" width="480.0" x="120.0" y="15.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="false" height="350.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1113.0" x="83.5" y="10.0"/>
+        <layout bottomRelation="IDC_FONT_SLIDER" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="982.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="15.0" marginLeft="0.0" marginRight="0.0" marginTop="15.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDL_BRIGHTNESS" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="480.0" x="120.0" y="15.0"/>
+        <layout bottomRelation="IDC_FONT_SLIDER" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="true" centerVertical="false" height="517.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDL_BRIGHTNESS" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1113.0" x="83.5" y="0.0"/>
     </Label>
 </Scene>

diff --git a/res/screen-size-normal/IDL_EDIT_BOOKMARK_LIST.xml b/res/screen-size-normal/IDL_EDIT_BOOKMARK_LIST.xml
index 2832a35..ca8481c 100644 (file)
--- a/res/screen-size-normal/IDL_EDIT_BOOKMARK_LIST.xml
+++ b/res/screen-size-normal/IDL_EDIT_BOOKMARK_LIST.xml
@@ -4,7 +4,7 @@
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
 
-<Scene Bversion="2.0.0.201307161751" Dversion="20120315">
+<Scene Bversion="2.0.0.201309242034" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_EDIT_BOOKMARK_LIST">
         <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"/>
@@ -23,8 +23,8 @@
     </Header>
     <Panel id="IDC_INFO_PANEL" parent="IDL_EDIT_BOOKMARK_LIST">
         <property backgroundColor="#444444" backgroundColorOpacity="100" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
-        <layout bottomRelation="IDL_EDIT_BOOKMARK_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="54.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="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="972.0"/>
-        <layout bottomRelation="IDL_EDIT_BOOKMARK_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="60.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="484.0"/>
+        <layout bottomRelation="IDL_EDIT_BOOKMARK_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="54.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="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="1070.0"/>
+        <layout bottomRelation="IDL_EDIT_BOOKMARK_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="60.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="569.0"/>
     </Panel>
     <Label id="IDC_INFO_LABEL" parent="IDC_INFO_PANEL">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#444444" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#FFFFFF" textSize="35.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
@@ -34,11 +34,11 @@
     <CheckButton id="IDC_SELECT_CHECKBUTTON" parent="IDL_EDIT_BOOKMARK_LIST">
         <property accessibilityHint1="" accessibilityHint2="" backgroundStyle="BACKGROUND_STYLE_DEFAULT" colorOfText="" colorOfTitleText="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" disabledTitleTextColor="" groupId="0" groupStyle="GROUP_STYLE_NONE" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" highlightedTitleTextColor="" horizontalAlign="ALIGN_LEFT" normalColor="#DCDAD3" normalColorOpacity="100" pressedColor="" pressedColorOpacity="100" pressedTextColor="" pressedTitleTextColor="" showTitleText="false" text="::IDS_BR_OPT_SELECT_ALL" titleText="" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" style="" topRelation="IDL_EDIT_BOOKMARK_LIST" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="0.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="108.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" style="" topRelation="IDL_EDIT_BOOKMARK_LIST" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" style="" topRelation="IDL_EDIT_BOOKMARK_LIST" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="0.0"/>
     </CheckButton>
     <ListView id="IDC_LISTVIEW1" parent="IDL_EDIT_BOOKMARK_LIST">
         <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="" colorOfEmptyListText="" itemDivider="true" itemDividerColor="" listScrollStyle="SCROLL_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" sweepEnabled="false" textOfEmptyList=""/>
-        <layout bottomRelation="IDC_INFO_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="860.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_EDIT_BOOKMARK_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_EDIT_BOOKMARK_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_SELECT_CHECKBUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="112.0"/>
-        <layout bottomRelation="IDC_INFO_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="376.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_SELECT_CHECKBUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="108.0"/>
+        <layout bottomRelation="IDC_INFO_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="958.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_EDIT_BOOKMARK_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_EDIT_BOOKMARK_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_SELECT_CHECKBUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="112.0"/>
+        <layout bottomRelation="IDC_INFO_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="457.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_EDIT_BOOKMARK_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_EDIT_BOOKMARK_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_SELECT_CHECKBUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="112.0"/>
     </ListView>
 </Scene>

diff --git a/res/screen-size-normal/IDL_EDIT_HISTORY_LIST.xml b/res/screen-size-normal/IDL_EDIT_HISTORY_LIST.xml
index 4309309..b1da021 100644 (file)
--- a/res/screen-size-normal/IDL_EDIT_HISTORY_LIST.xml
+++ b/res/screen-size-normal/IDL_EDIT_HISTORY_LIST.xml
@@ -4,7 +4,7 @@
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
 
-<Scene Bversion="2.0.0.201307161751" Dversion="20120315">
+<Scene Bversion="2.0.0.201309242034" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_EDIT_HISTORY_LIST">
         <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"/>
@@ -25,16 +25,16 @@
     <CheckButton id="IDC_SELECT_ALL" parent="IDL_EDIT_HISTORY_LIST">
         <property accessibilityHint1="" accessibilityHint2="" backgroundStyle="BACKGROUND_STYLE_DEFAULT" colorOfText="" colorOfTitleText="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" disabledTitleTextColor="" groupId="0" groupStyle="GROUP_STYLE_MIDDLE" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" highlightedTitleTextColor="" horizontalAlign="ALIGN_LEFT" normalColor="#DCDAD3" normalColorOpacity="100" pressedColor="" pressedColorOpacity="100" pressedTextColor="" pressedTitleTextColor="" showTitleText="false" text="::IDS_BR_OPT_SELECT_ALL" titleText="" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_EDIT_HISTORY_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_EDIT_HISTORY_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="CHECK_BUTTON_STYLE_MARK" topRelation="IDL_EDIT_HISTORY_LIST" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="0.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="108.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_EDIT_HISTORY_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_EDIT_HISTORY_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="CHECK_BUTTON_STYLE_MARK" topRelation="IDL_EDIT_HISTORY_LIST" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_EDIT_HISTORY_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_EDIT_HISTORY_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="CHECK_BUTTON_STYLE_MARK" topRelation="IDL_EDIT_HISTORY_LIST" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="0.0"/>
     </CheckButton>
     <Label id="IDC_LABEL1" parent="IDL_EDIT_HISTORY_LIST">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#444444" backgroundColorOpacity="100" horizontalAlign="ALIGN_CENTER" leftMargin="16" text="Selected(0)" textColor="#FFFFFF" textSize="35.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="IDL_EDIT_HISTORY_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="54.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_EDIT_HISTORY_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_EDIT_HISTORY_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="972.0"/>
-        <layout bottomRelation="IDL_EDIT_HISTORY_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="494.0"/>
+        <layout bottomRelation="IDL_EDIT_HISTORY_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="54.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_EDIT_HISTORY_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_EDIT_HISTORY_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="1070.0"/>
+        <layout bottomRelation="IDL_EDIT_HISTORY_LIST" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="50.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="579.0"/>
     </Label>
     <GroupedListView id="IDC_GROUPEDLISTVIEW1" parent="IDL_EDIT_HISTORY_LIST">
         <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="" colorOfEmptyListText="" itemDivider="true" itemDividerColor="" listScrollStyle="SCROLL_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" sectionColor="" sweepEnabled="false" textOfEmptyList="Empty List"/>
-        <layout bottomRelation="IDC_LABEL1" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="860.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_EDIT_HISTORY_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_EDIT_HISTORY_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="CUSTOM_LIST_STYLE_NORMAL" topRelation="IDC_SELECT_ALL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="112.0"/>
-        <layout bottomRelation="IDC_LABEL1" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="386.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_EDIT_HISTORY_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_EDIT_HISTORY_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="CUSTOM_LIST_STYLE_NORMAL" topRelation="IDC_SELECT_ALL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="108.0"/>
+        <layout bottomRelation="IDC_LABEL1" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="958.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_EDIT_HISTORY_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_EDIT_HISTORY_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="CUSTOM_LIST_STYLE_NORMAL" topRelation="IDC_SELECT_ALL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="112.0"/>
+        <layout bottomRelation="IDC_LABEL1" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="467.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_EDIT_HISTORY_LIST" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_EDIT_HISTORY_LIST" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="CUSTOM_LIST_STYLE_NORMAL" topRelation="IDC_SELECT_ALL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0.0" y="112.0"/>
     </GroupedListView>
 </Scene>

diff --git a/src/IntAddBookmarkForm.cpp b/src/IntAddBookmarkForm.cpp
index 441d781..82cf5bd 100644 (file)
--- a/src/IntAddBookmarkForm.cpp
+++ b/src/IntAddBookmarkForm.cpp
@@ -515,7 +515,10 @@ AddBookmarkForm::OnListViewItemStateChanged(ListView& listView, int index, int e
        }
        else
        {
+               __pList->SetItemChecked(__selectedIndex,false);
+               __pList->SetItemChecked(index,true);
                __selectedIndex = index;
+
                if (index > 1 && __pList->GetItemCount() != index +1)
                {
                        String parentID = "0";
@@ -537,8 +540,8 @@ AddBookmarkForm::OnListViewItemStateChanged(ListView& listView, int index, int e
                        return;
                }
 
-               __pList->UpdateList();
-               //              __pList->RefreshList(0, LIST_REFRESH_TYPE_ITEM_MODIFY);
+//             __pList->UpdateList();//removed for issue 53372
+                               __pList->RefreshList(0, LIST_REFRESH_TYPE_ITEM_MODIFY);
 
        }
 

diff --git a/src/IntBookmarkListForm.cpp b/src/IntBookmarkListForm.cpp
index 27fcf15..cd13765 100644 (file)
--- a/src/IntBookmarkListForm.cpp
+++ b/src/IntBookmarkListForm.cpp
@@ -1184,6 +1184,7 @@ BookmarkListForm::OnOrientationChanged (const Tizen::Ui::Control &source, Tizen:
                {
                        __pListview->SetBounds(__pListview->GetX(),0,GetClientAreaBounds().width ,GetClientAreaBounds().height);
                }
+
        }
 
        if (__pSearchListView && __pListview)

diff --git a/src/IntBookmarkPresentationModel.cpp b/src/IntBookmarkPresentationModel.cpp
index 6dfdcd8..891723c 100644 (file)
--- a/src/IntBookmarkPresentationModel.cpp
+++ b/src/IntBookmarkPresentationModel.cpp
@@ -298,9 +298,9 @@ BookmarkPresentationModel::SaveTempBookmark(BookmarkData& bookmark)
        DateTime dt;
        String bookmarkId;
        String bookmarkTitle = bookmark.GetBookmarkTitle();
-       bookmarkTitle.Replace(L"'", L"\'");
+       bookmarkTitle.Replace(L"'", L"''");
        String bookmarkUrl = bookmark.GetUrl();
-       bookmarkUrl.Replace(L"'", L"\'");
+       bookmarkUrl.Replace(L"'", L"''");
 
        PresentationModelBase::GetCurrentDateTime(dt);
 

diff --git a/src/IntEditBookmarkListForm.cpp b/src/IntEditBookmarkListForm.cpp
index 0d72821..ff69d4d 100644 (file)
--- a/src/IntEditBookmarkListForm.cpp
+++ b/src/IntEditBookmarkListForm.cpp
@@ -493,7 +493,7 @@ EditBookmarkListForm::CreateItem(int index, int itemWidth)
                delete pBitmap;
 
                pItem->AddElement(Rectangle(104, 10, width_Title, itemHeight - height_Url + (__fontSize - 44)), IDA_FORMAT_SITE, pBookMark->GetBookmarkTitle(),__fontSize,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,CUSTOM_COLOR_TRANSPARENT,true);
-               pItem->AddElement(Rectangle(x_Margin_Url, y_Margin_Url + (__fontSize - 44), width_Url, height_Url), IDA_FORMAT_URL, pBookMark->GetUrl(),textSize,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,true);
+               pItem->AddElement(Rectangle(x_Margin_Url, y_Margin_Url + (__fontSize - 44), width_Url, height_Url), IDA_FORMAT_URL, pBookMark->GetUrl(),textSize,CUSTOM_COLOR_GREY,CUSTOM_COLOR_LISTVIEW_TEXT,CUSTOM_COLOR_LISTVIEW_TEXT,true);
 
                //pBitmap = AppResource::GetInstance()->GetBitmapN("I01_picker_arrow_right.png");
                pBitmap = AppResource::GetInstance()->GetBitmapN(IDB_RIGHT_ARROW);

diff --git a/src/IntEditHistoryListForm.cpp b/src/IntEditHistoryListForm.cpp
index 165a694..06c9b8c 100644 (file)
--- a/src/IntEditHistoryListForm.cpp
+++ b/src/IntEditHistoryListForm.cpp
@@ -601,7 +601,7 @@ EditHistoryListForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                return null;
        }
 
-       pItem->AddElement(Rectangle(92, 68  + (__fontSize - 44), GetClientAreaBounds().width - 108 - 32 - bookmarkBtnWidth - 32, 52), IDA_FORMAT_URL, pHistory->GetHistoryUrl(),32,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,CUSTOM_COLOR_GREY,true);
+       pItem->AddElement(Rectangle(92, 68  + (__fontSize - 44), GetClientAreaBounds().width - 108 - 32 - bookmarkBtnWidth - 32, 52), IDA_FORMAT_URL, pHistory->GetHistoryUrl(),32,CUSTOM_COLOR_GREY,CUSTOM_COLOR_LISTVIEW_TEXT,CUSTOM_COLOR_LISTVIEW_TEXT,true);
 
        return pItem;
 }

diff --git a/src/IntInternetApp.cpp b/src/IntInternetApp.cpp
index abbb349..e08e942 100644 (file)
--- a/src/IntInternetApp.cpp
+++ b/src/IntInternetApp.cpp
@@ -47,7 +47,7 @@ static const wchar_t* APPCONTROL_OPERATION_ID_IMAGE_VIEWER = L"http://tizen.org/
 const int MIN_MEMORY_NEEDED = 1048576;
 
 InternetApp::InternetApp(void)
-: __pMultiWindowManager(NULL),__pNewWindowInfo(null),pSceneManagementFrame(null),__value(null),__isShowMsg(false)
+: __pMultiWindowManager(NULL),__pNewWindowInfo(null),pSceneManagementFrame(null),__value(null),__isShowMsg(false),__pAc(null)
 {
 }
 
@@ -176,15 +176,21 @@ InternetApp::OnAppInitialized(void)
 
        if (__operationId.CompareTo(L"http://tizen.org/appcontrol/operation/main") == 0)
        {
-
-               AppControl* pAc = AppManager::FindAppControlN(APPCONTROL_PROVIDER_ID_IMAGE_VIEWER,
+               if(__pAc)
+               {
+                       r =__pAc->Stop();
+                       AppLog("AppControl Stop Result %s",GetErrorMessage(r));
+                       delete __pAc;
+                       __pAc = null;
+               }
+               __pAc = AppManager::FindAppControlN(APPCONTROL_PROVIDER_ID_IMAGE_VIEWER,
                                APPCONTROL_OPERATION_ID_IMAGE_VIEWER);
-               if (pAc && __value && __value->GetLength() > 0)
+               if (__pAc && __value && __value->GetLength() > 0)
                {
                        AppLog("17jul __value is %S", __value->GetPointer());
-                       if (pAc->Start(__value, null, null, null) == E_SUCCESS)
+                       if (__pAc->Start(__value, null, null, null) == E_SUCCESS)
                        {
-                               delete pAc;
+//                             delete pAc;
                        }
                        delete __value;
                        __value = null;
@@ -449,14 +455,21 @@ InternetApp::OnAppControlRequestReceived(RequestId reqId, const String &operatio
                                String typeVal = APPCONTROL_SELECT_VALUE_IMAGE;
                                extraData.Add(&typeKey, &typeVal);
 
-                               AppControl* pAc = AppManager::FindAppControlN(APPCONTROL_PROVIDER_ID_IMAGE_VIEWER,
+                               if(__pAc)
+                               {
+                                       result r = __pAc->Stop();
+                                       AppLog("AppControl Stop Result %s",GetErrorMessage(r));
+                                       delete __pAc;
+                                       __pAc = null;
+                               }
+                               __pAc = AppManager::FindAppControlN(APPCONTROL_PROVIDER_ID_IMAGE_VIEWER,
                                                APPCONTROL_OPERATION_ID_IMAGE_VIEWER);
-                               if (pAc)
+                               if (__pAc)
                                {
                                        AppLog("17jul __value is %S", __value->GetPointer());
-                                       if (pAc->Start(__value, null, null, null) == E_SUCCESS)
+                                       if (__pAc->Start(__value, null, null, null) == E_SUCCESS)
                                        {
-                                               delete pAc;
+//                                             delete pAc;
                                        }
                                }
                                delete __value;

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index ec2673a..f134e21 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -2471,7 +2471,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
        break;
        case IDA_COPY_TEXT_CLICKED:
        {
-               __pWebViewer->ReleaseBlock();
+//             __pWebViewer->ReleaseBlock();//as per hyunn lee request for issue 53500
                // need to implement
                //__currentSelectedStr
                // Sets data to a clip board item
@@ -3468,7 +3468,7 @@ MainForm::LoadUrl(String& url)
                }
                else
                {
-                               UrlEncoder::Encode(url, L"UTF-8", encodedUrl);
+                       UrlEncoder::Encode(url, L"UTF-8", encodedUrl);
                        __pWebViewer->LoadUrl(SettingPresentationModel::GetInstance()->GetSearchUrl(encodedUrl));
                }
        }
@@ -3493,6 +3493,11 @@ MainForm::OnFocusGained(const Tizen::Ui::Control& source)
                __pFooterPanel->SetShowState(false);
        }
 
+       if(__pWebViewer)
+       {
+               __pWebViewer->ReleaseBlock();
+       }
+
        if(__pAddressbar)
        {
                __pAddressbar->SetShowState(true);

diff --git a/src/IntMultipleWindowForm.cpp b/src/IntMultipleWindowForm.cpp
index eb86ef5..6e2f458 100644 (file)
--- a/src/IntMultipleWindowForm.cpp
+++ b/src/IntMultipleWindowForm.cpp
@@ -603,7 +603,7 @@ MultipleWindowForm::CreateItem(int index, int itemWidth)
 
        if (pageURL.CompareTo(L"") != 0)
        {
-               pItem->AddElement(pageURLRect, IDA_FORMAT_URL_STRING, pageURL, 32, CUSTOM_COLOR_GREY, CUSTOM_COLOR_GREY, CUSTOM_COLOR_GREY, true);
+               pItem->AddElement(pageURLRect, IDA_FORMAT_URL_STRING, pageURL, 32, CUSTOM_COLOR_GREY, CUSTOM_COLOR_LISTVIEW_TEXT, CUSTOM_COLOR_LISTVIEW_TEXT, true);
        }
 
        if (pAllWindowList)

diff --git a/src/IntSettingForm.cpp b/src/IntSettingForm.cpp
index fe1a7b7..62a905f 100644 (file)
--- a/src/IntSettingForm.cpp
+++ b/src/IntSettingForm.cpp
@@ -921,7 +921,7 @@ SettingForm::OnOrientationChanged(const Control& source, OrientationStatus orien
                return;
        }
        __pList->SetBounds(rect.x,rect.y,rect.width-16,rect.height);
-       __pList->UpdateList();
+//     __pList->UpdateList();//removed for issue 53768
 }
 
 SettingForm::SettingItemInfo::SettingItemInfo(void)

diff --git a/src/IntSettingToggleCustomItem.cpp b/src/IntSettingToggleCustomItem.cpp
index 30977c7..021c050 100644 (file)
--- a/src/IntSettingToggleCustomItem.cpp
+++ b/src/IntSettingToggleCustomItem.cpp
@@ -80,7 +80,7 @@ SettingToggleCustomItem::Make(void)
        const int Y_Margin = 26;
        const int textSize = 40;
 
-       AddElement(Rectangle(X_Margin, Y_Margin, __width - 185, 60 + (__fontSize - 44)), IDA_FORMAT_STRING, __text, __fontSize, textColor, pressedTextColor, pressedTextColor, true);
+       AddElement(Rectangle(X_Margin, Y_Margin, __width - 195, 60 + (__fontSize - 44)), IDA_FORMAT_STRING, __text, __fontSize, textColor, pressedTextColor, pressedTextColor, true);
 //     SetElementSelectionEnabled(IDA_FORMAT_STRING, false);
 
        return E_SUCCESS;

diff --git a/src/IntSharePopup.cpp b/src/IntSharePopup.cpp
index b92e1d0..7c0254d 100644 (file)
--- a/src/IntSharePopup.cpp
+++ b/src/IntSharePopup.cpp
@@ -367,6 +367,7 @@ SharePopup::GetItemCount(void)
        for(int pos = 0; pos < count; pos++)
        {
                AppControl * pControl = dynamic_cast<AppControl*>(__pAppControlList->GetAt(pos));
+               AppLog("pControl->GetAppName() %ls",pControl->GetAppName().GetPointer());
                if(pControl->GetAppName().Equals(L"Messages",false) == true || pControl->GetAppName().Equals(L"Email",false) == true )
                {
                        __pAppControlList->RemoveAt(pos,true);
@@ -377,7 +378,9 @@ SharePopup::GetItemCount(void)
        }
 
        AppLog("removeCount %d",removeCount);
-       return count+removeCount;
+       if(count+removeCount >=2)
+               return count+removeCount;
+       return 2;
 
 }