Fixed Nabi Issues N_SE-56966,56735

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

diff --git a/res/screen-density-xhigh/I01_toolbar_input_field_findword.#.png b/res/screen-density-xhigh/I01_toolbar_input_field_findword.#.png
index a9b2e74..7763c30 100644 (file)
Binary files a/res/screen-density-xhigh/I01_toolbar_input_field_findword.#.png and b/res/screen-density-xhigh/I01_toolbar_input_field_findword.#.png differ

diff --git a/res/screen-density-xhigh/I01_toolbar_input_field_findwordbkp.#.png b/res/screen-density-xhigh/I01_toolbar_input_field_findwordbkp.#.png
new file mode 100644 (file)
index 0000000..a9b2e74
Binary files /dev/null and b/res/screen-density-xhigh/I01_toolbar_input_field_findwordbkp.#.png differ

diff --git a/res/screen-size-normal/IDL_BOOKMARK_LIST.xml b/res/screen-size-normal/IDL_BOOKMARK_LIST.xml
index 174ccae..2654501 100644 (file)
--- a/res/screen-size-normal/IDL_BOOKMARK_LIST.xml
+++ b/res/screen-size-normal/IDL_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.201310282132" Dversion="20120315">
     <LogicalCoordinate>480</LogicalCoordinate>
     <Form id="IDL_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"/>
@@ -14,7 +14,7 @@
     <Footer>
         <property backgroundBitmapPath="" color="" colorOpacity="100" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_ICON" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" showBackButton="false" showMenuButton="false"/>
         <itemSet>
-            <footerItem accessibilityHint="" actionId="105" disabledIconPath="" highlightedIconPath="" normalIconPath="I01_controlbar_icon_create.png" pressedIconPath="" selectedIconPath="" text=""/>
+            <footerItem accessibilityHint="" actionId="105" disabledIconPath="I01_controlbar_icon_create_disable.png" highlightedIconPath="" normalIconPath="I01_controlbar_icon_create.png" pressedIconPath="" selectedIconPath="" text=""/>
             <footerItem accessibilityHint="" actionId="103" disabledIconPath="I01_controlbar_icon_compose_diabled.png" highlightedIconPath="" normalIconPath="I01_controlbar_icon_compose.png" pressedIconPath="" selectedIconPath="" text=""/>
             <footerItem accessibilityHint="" actionId="104" disabledIconPath="I01_controlbar_icon_create_folder_diabled.png" highlightedIconPath="" normalIconPath="I01_controlbar_icon_create_folder.png" pressedIconPath="" selectedIconPath="" text=""/>
         </itemSet>

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index ec91e91..0005ffc 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -3898,6 +3898,7 @@ MainForm::OnPageTitleReceived(const Tizen::Base::String& title)
 void
 MainForm::UpdateFavicon(void)
 {
+       AppLog("MainForm::UpdateFavicon called");
        bool urlImageType = false;
        String *tempPath = null;
        if(__pWebViewer)
@@ -3935,6 +3936,7 @@ MainForm::UpdateFavicon(void)
 
                        if (pBitmap != null)
                        {
+                               AppLog("__pWindowInfo->pFavicon updating favicon");
                                if (__pWindowInfo->pFavicon != NULL)
                                {
                                        __pWindowInfo->pFavicon = null;
@@ -5624,8 +5626,7 @@ MainForm::ShowIndicatorNotification(const String& messageText, const String& con
        request.SetAlertText(messageText);
        request.SetTitleText(L"");
        request.SetAppMessage(contentPath);
-       request.SetOngoingActivityType(ONGOING_ACTIVITY_TYPE_TEXT);
-       request.SetNotificationStyle(NOTIFICATION_STYLE_THUMBNAIL);
+
        Tizen::App::App* pApp = Tizen::App::App::GetInstance();
        String homePath = pApp->GetAppRootPath();
        String iconPath = homePath + L"res/screen-density-xhigh/Notification_download_complete.png";
@@ -5634,7 +5635,7 @@ MainForm::ShowIndicatorNotification(const String& messageText, const String& con
 
        Tizen::Shell::NotificationManager notiMgr;
        notiMgr.Construct();
-       notiMgr.NotifyOngoingActivity(request);
+       notiMgr.Notify(request);
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
        return;
 }