HW Key Changes. Removal of unsupported and deprecated API's. NABI issue fix

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

diff --git a/inc/IntBookmarkListForm.h b/inc/IntBookmarkListForm.h
index 9529740..ddf4a57 100644 (file)
--- a/inc/IntBookmarkListForm.h
+++ b/inc/IntBookmarkListForm.h
@@ -33,6 +33,7 @@ class BookmarkListForm
 : public Tizen::Ui::Controls::Form
   , public Tizen::Ui::IActionEventListener
   , public Tizen::Ui::Controls::IFastScrollListener
+  , public Tizen::Ui::IFocusEventListener
   , public Tizen::Ui::Controls::IFormBackEventListener
   , public Tizen::Ui::Controls::IListViewItemProvider
   , public Tizen::Ui::Controls::IListViewItemEventListener
@@ -92,6 +93,10 @@ class BookmarkListForm
        // IFastScrollListener
        virtual void OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::Base::String& index);
 
+       //IFocusEventListener
+       virtual void OnFocusGained(const Tizen::Ui::Control& source) ;
+       virtual void OnFocusLost(const Tizen::Ui::Control& source) ;
+
        // IListViewItemEventListener
        virtual void OnListViewContextItemStateChanged(Tizen::Ui::Controls::ListView& listView, int index, int elementId, Tizen::Ui::Controls::ListContextItemStatus status);
        virtual void OnListViewItemLongPressed(Tizen::Ui::Controls::ListView& listView, int index, int elementId, bool& invokeListViewItemCallback);

diff --git a/inc/IntHistoryListForm.h b/inc/IntHistoryListForm.h
index 0a7444d..2b41c90 100644 (file)
--- a/inc/IntHistoryListForm.h
+++ b/inc/IntHistoryListForm.h
@@ -35,6 +35,7 @@
 class HistoryListForm
        : public Tizen::Ui::Controls::Form
        , public Tizen::Ui::IActionEventListener
+       , public Tizen::Ui::IFocusEventListener
        , public Tizen::Ui::Controls::IFormBackEventListener
        , public Tizen::Ui::Controls::IGroupedListViewItemProvider
        , public Tizen::Ui::Controls::IGroupedListViewItemEventListener
@@ -72,6 +73,10 @@ public:
        // IActionEventListener
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
 
+       //IFocusEventListener
+       virtual void OnFocusGained(const Tizen::Ui::Control& source) ;
+       virtual void OnFocusLost(const Tizen::Ui::Control& source) ;
+
        // IFormBackEventListener
        virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
 

diff --git a/inc/IntInternetApp.h b/inc/IntInternetApp.h
index 287c585..8301419 100644 (file)
--- a/inc/IntInternetApp.h
+++ b/inc/IntInternetApp.h
@@ -54,8 +54,6 @@ public:
        virtual ~InternetApp(void);
 
 public:
-       bool IsHwBackKeyExists(void);
-
        bool OnAppInitializing(Tizen::App::AppRegistry& appRegistry);
 
        bool OnAppInitialized(void);
@@ -86,7 +84,6 @@ public:
 private:
        MultipleWindowPresentationModel* __pMultiWindowManager;
        WindowInfo* __pNewWindowInfo;//the new window object to be created either by the normal launch of application or as an appcontrol launch
-       bool __isHwBackButtonExists;
 };
 
 #endif // _INT_INTERNET_APP_H_

diff --git a/inc/IntMainForm.h b/inc/IntMainForm.h
index ef419ab..54fd0a2 100644 (file)
--- a/inc/IntMainForm.h
+++ b/inc/IntMainForm.h
@@ -392,7 +392,7 @@ private:
        Tizen::Graphics::Point __longPressPoint;
        NotificationPanel* __pNotification;
        int __fontSize;
-       bool __isHwKeySupported;
+//     bool __isHwKeySupported;
 };
 
 #endif  //_INT_MAIN_FORM_H_

diff --git a/res/screen-size-normal/IDL_FORM.xml b/res/screen-size-normal/IDL_FORM.xml
deleted file mode 100644 (file)
index 220e140..0000000
--- a/res/screen-size-normal/IDL_FORM.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-       This XML file was automatically generated by UiBuilder - do not modify by hand.
--->
-<!DOCTYPE Scene SYSTEM "UIForm.dtd">
-
-<Scene Bversion="2.0.0.201305162056" 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"/>
-        <layout mode="Portrait" style="FORM_STYLE_INDICATOR" type="LAYOUT_RELATIVE"/>
-        <layout mode="Landscape" style="FORM_STYLE_INDICATOR" type="LAYOUT_RELATIVE"/>
-    </Form>
-    <Panel id="IDC_ADDRESSBAR_PANEL" parent="IDL_FORM">
-        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="94.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="0.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="94.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDL_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="0.0"/>
-    </Panel>
-    <Panel id="IDC_FOOTER_PANEL" parent="IDL_FORM">
-        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" 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" y="1108.0"/>
-        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="105.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" 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" y="555.0"/>
-    </Panel>
-    <Label id="IDC_CHECK_LABEL" parent="IDC_FOOTER_PANEL">
-        <property accessibilityHint="" backgroundBitmapPath="I01_toolbar_bg_02.png" 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="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.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="720.0" x="0.0" y="0.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="105.0" horizontalFitPolicy="FIT_POLICY_PARENT" 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" y="0.0"/>
-    </Label>
-    <Button id="IDC_MULTIWINDOW_BUTTON" parent="IDC_FOOTER_PANEL">
-        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="20.0" NormalBitmapY="20.0" PressedBitmapX="20.0" PressedBitmapY="20.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_toolbar_icon_windows_manager_empty.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_controlbar_icon_multiview.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="60.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="63.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="63.0" x="119.0" y="25.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="112.0" x="112.0" y="10.0"/>
-    </Button>
-    <Button id="IDC_PAGEFORWARD_BUTTON" parent="IDC_FOOTER_PANEL">
-        <property DisabledBitmapX="20.0" DisabledBitmapY="20.0" NormalBitmapX="20.0" NormalBitmapY="20.0" PressedBitmapX="20.0" PressedBitmapY="20.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="EditBackground.png" disabledBitmapPath="I01_toolbar_icon_forward_web_disabled.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_toolbar_icon_forward_web.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_toolbar_icon_forward_press_web.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="63.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="63.0" x="635.0" y="25.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_FOOTER_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="112.0" x="1168.0" y="10.0"/>
-    </Button>
-    <Button id="IDC_PAGEBACK_BUTTON" parent="IDC_FOOTER_PANEL">
-        <property DisabledBitmapX="20.0" DisabledBitmapY="20.0" NormalBitmapX="20.0" NormalBitmapY="20.0" PressedBitmapX="20.0" PressedBitmapY="20.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="EditBackground.png" disabledBitmapPath="I01_toolbar_icon_back_web_disabled.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="20.0" highlightedBitmapY="20.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_toolbar_icon_back_web.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_toolbar_icon_back_press_web.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="60.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="63.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="63.0" x="542.0" y="25.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_PAGEFORWARD_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="112.0" x="1056.0" y="10.0"/>
-    </Button>
-    <Label id="IDC_FOOTER_LABEL" parent="IDC_FOOTER_PANEL">
-        <property accessibilityHint="" backgroundBitmapPath="I01_toolbar_bg_02.png" 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="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="71.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="300.0" x="212.0" y="25.0"/>
-        <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="832.0" x="224.0" y="19.0"/>
-    </Label>
-    <Button id="IDC_MORE_BUTTON" parent="IDC_FOOTER_PANEL">
-        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="20.0" NormalBitmapY="20.0" PressedBitmapX="20.0" PressedBitmapY="20.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_controlbar_icon_more.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_controlbar_icon_more.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="60.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="63.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="63.0" x="26.0" y="25.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_FOOTER_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="10.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="112.0" x="0.0" y="10.0"/>
-    </Button>
-    <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"/>
-        <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="55.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_FOOTER_LABEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="64.0" x="982.0" y="35.0"/>
-    </Button>
-    <EditField id="IDC_URL_EDIT_FIELD" parent="IDC_FOOTER_PANEL">
-        <property accessibilityHint="" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="false" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalMargin="16.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="2048" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="EditBackground.png" normalColor="" normalColorOpacity="100" normalTextColor="#4E4945" pressedBGBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="32.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12.0" viewMode="false"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="71.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="241.0" x="212.0" y="25.0"/>
-        <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_STOP_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="758.0" x="224.0" y="19.0"/>
-    </EditField>
-    <Label id="IDC_PROGRESS_BAR_LABEL" parent="IDC_FOOTER_PANEL">
-        <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="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="12.0" horizontalFitPolicy="FIT_POLICY_PARENT" 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="720.0" x="0" y="0.0"/>
-        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="12.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" 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" y="0.0"/>
-    </Label>
-    <Button id="IDC_CLEAR_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"/>
-        <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="55.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_FOOTER_LABEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="64.0" x="982.0" y="35.0"/>
-    </Button>
-    <Button id="IDC_REFRESH_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="" normalBitmapPath="I01_search_icon_refresh.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="IDC_STOP_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="43.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_STOP_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_STOP_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_STOP_BUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="42.0" x="454.0" y="40.0"/>
-        <layout bottomRelation="IDC_STOP_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="55.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_STOP_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_STOP_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_STOP_BUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="54.0" x="982.0" y="35.0"/>
-    </Button>
-    <Button id="IDC_READER_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="" normalBitmapPath="I01_search_icon_refresh.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="IDC_STOP_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="43.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_URL_EDIT_FIELD" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_STOP_BUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="42.0" x="212.0" y="40.0"/>
-        <layout bottomRelation="IDC_STOP_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="55.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_STOP_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_STOP_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_STOP_BUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="54.0" x="982.0" y="35.0"/>
-    </Button>
-    <Panel id="IDC_FIND_ON_PAGE_PANEL" parent="IDL_FORM">
-        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="82.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="0.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="82.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDL_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="0.0"/>
-    </Panel>
-</Scene>

diff --git a/src/IntBookmarkListForm.cpp b/src/IntBookmarkListForm.cpp
index bff61d5..826918d 100644 (file)
--- a/src/IntBookmarkListForm.cpp
+++ b/src/IntBookmarkListForm.cpp
@@ -190,8 +190,10 @@ BookmarkListForm::OnInitializing(void)
                return E_FAILURE;
        }
 
+       __pSearchBar->AddFocusEventListener(*this);
        if (__pListview != null)
        {
+               __pListview->SetBackgroundColor(GetBackgroundColor());
                //              __pListview->SetBounds(__pListview->GetX(), __pListview->GetY(), GetClientAreaBounds().width, GetClientAreaBounds().height);
                __pListview->AddFastScrollListener(*this);
                __pListview->AddListViewItemEventListener(*this);
@@ -987,6 +989,19 @@ BookmarkListForm::OnFastScrollIndexSelected(Tizen::Ui::Control& source, Tizen::B
 }
 
 void
+BookmarkListForm::OnFocusGained(const Tizen::Ui::Control& source)
+{
+       __pSearchListView->SetEnabled(false);
+}
+
+void
+BookmarkListForm::OnFocusLost(const Tizen::Ui::Control& source)
+{
+       __pSearchListView->SetEnabled(true);
+       __searchBookmark = false;
+}
+
+void
 BookmarkListForm::OnSearchBarModeChanged(Tizen::Ui::Controls::SearchBar& source, Tizen::Ui::Controls::SearchBarMode mode)
 {
        result r = E_FAILURE;

diff --git a/src/IntHistoryListForm.cpp b/src/IntHistoryListForm.cpp
index 8f6cef6..f6d597e 100644 (file)
--- a/src/IntHistoryListForm.cpp
+++ b/src/IntHistoryListForm.cpp
@@ -159,6 +159,7 @@ HistoryListForm::OnInitializing(void)
        {
                return E_FAILURE;
        }
+       __pSearchBar->AddFocusEventListener(*this);
        __pSearchListView = new(std::nothrow) GroupedListView();
        if (__pSearchListView == null)
        {
@@ -314,6 +315,18 @@ HistoryListForm::OnActionPerformed(const Control& source, int actionId)
 }
 
 void
+HistoryListForm::OnFocusGained(const Tizen::Ui::Control& source)
+{
+       __pSearchListView->SetEnabled(false);
+}
+
+void
+HistoryListForm::OnFocusLost(const Tizen::Ui::Control& source)
+{
+       __pSearchListView->SetEnabled(true);
+       __searchHistory = false;
+}
+void
 HistoryListForm::OnFormBackRequested(Form& source)
 {
        SceneManager* pSceneManager = SceneManager::GetInstance();

diff --git a/src/IntInternetApp.cpp b/src/IntInternetApp.cpp
index d0a380a..d94f7c7 100644 (file)
--- a/src/IntInternetApp.cpp
+++ b/src/IntInternetApp.cpp
@@ -45,7 +45,6 @@ const int MIN_MEMORY_NEEDED = 1048576;
 InternetApp::InternetApp(void)
 : __pMultiWindowManager(NULL),__pNewWindowInfo(null)
 {
-       __isHwBackButtonExists = false;
 }
 
 InternetApp::~InternetApp(void)
@@ -57,12 +56,6 @@ InternetApp::~InternetApp(void)
        }
 }
 
-bool
-InternetApp::IsHwBackKeyExists(void)
-{
-       return __isHwBackButtonExists;
-}
-
 UiApp*
 InternetApp::CreateInstance(void)
 {
@@ -100,7 +93,6 @@ InternetApp::OnAppInitializing(AppRegistry& appRegistry)
                result r = pAppMgr->SetAppControlProviderEventListener(this);
                AppLogDebug("SetAppControlProviderEventListener result %s",GetErrorMessage(r));
        }
-       Tizen::System::SystemInfo::GetValue(L"http://tizen.org/feature/input.keys.back",__isHwBackButtonExists);
        return true;
 }
 

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 8586605..d8fc186 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -211,7 +211,6 @@ MainForm::MainForm(void)
        __pReaderBtn = null;
        __isWebKeypadOpened = false;
        __fontSize = 44;
-       __isHwKeySupported = false;
        __pNotification = null;
 }
 
@@ -264,20 +263,8 @@ bool
 MainForm::Initialize(void)
 {
        InternetApp* pInternet = static_cast<InternetApp*> (Application::GetInstance());
+       Construct(L"IDL_FORM_HW_KEY");
 
-
-       if(pInternet)
-       {
-               __isHwKeySupported = pInternet->IsHwBackKeyExists();
-       }
-       if(__isHwKeySupported)
-       {
-               Construct(L"IDL_FORM_HW_KEY");
-       }
-       else
-       {
-               Construct(L"IDL_FORM");
-       }
 //     SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER);
        return true;
 }
@@ -582,20 +569,8 @@ MainForm::InitFooter(void)
                return E_FAILURE;
        }
 
-       if(__isHwKeySupported == false)
-       {
-               __pMoreButton = static_cast<Button*>(GetControl(L"IDC_MORE_BUTTON",true));
-
-               if ( __pMoreButton == NULL )
-               {
-                       return E_FAILURE;
-               }
-       }
-       else
-       {
-               SetFormBackEventListener(this);
-       }
 
+       SetFormBackEventListener(this);
        if (__pMultiWindowButton != null)
        {
                Bitmap* pBitmap = null;

diff --git a/src/IntSettingForm.cpp b/src/IntSettingForm.cpp
index ac83cb3..d788600 100644 (file)
--- a/src/IntSettingForm.cpp
+++ b/src/IntSettingForm.cpp
@@ -261,15 +261,8 @@ SettingForm::OnInitializing(void)
        InternetApp* pInternet = static_cast<InternetApp*> (Application::GetInstance());
 
        bool isHwKeySupported = false;
-       if(pInternet)
-       {
-               isHwKeySupported = pInternet->IsHwBackKeyExists();
-       }
 
-       if(isHwKeySupported)
-       {
-               SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR);
-       }
+       SetFormStyle(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR);
        __pList = static_cast< GroupedListView* >(GetControl(L"IDC_SETTING_LIST"));
        if ( __pList != NULL )
        {

diff --git a/src/IntSharePopup.cpp b/src/IntSharePopup.cpp
index b9e580c..fadbca5 100644 (file)
--- a/src/IntSharePopup.cpp
+++ b/src/IntSharePopup.cpp
@@ -200,7 +200,7 @@ SharePopup::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView& listView,
                        __appControlOngoing = true;
                        // share via message
                        StartMessageAppControl();
-                       __pTimer->Start(1000);
+                       __pTimer->Start(2500);
                }
        }
        break;
@@ -211,7 +211,7 @@ SharePopup::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView& listView,
                        __appControlOngoing = true;
                        // share via email
                        StartEmailAppControl();
-                       __pTimer->Start(1000);
+                       __pTimer->Start(2500);
                }
 
        }