Fixed Nabi issues N_SE-45388, N_Se-45329, N_SE-44967

Change-Id: I82d9c2836fa3d2be1f52ec1773a87c600cad7eb4

diff --git a/inc/IntMainForm.h b/inc/IntMainForm.h
index dcfed1e..4675f1d 100644 (file)
--- a/inc/IntMainForm.h
+++ b/inc/IntMainForm.h
@@ -264,7 +264,7 @@ public:
        virtual void  OnTextValueChanged (const Tizen::Ui::Control &source);
 
        void UpdateImageContent(Tizen::Base::ByteBuffer* aBuffer, Tizen::Base::String imageName);
-       void ShowIndicatorNotification(const Tizen::Base::String& messageText);
+       void ShowIndicatorNotification(const Tizen::Base::String& messageText, const Tizen::Base::String& contentPath);
 
        void SetForwardButtonEnabled(bool isEnabled);
        void SetBackButtonEnabled(bool isEnabled);

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

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

diff --git a/res/screen-size-normal/IDL_FIND_ON_PAGE.xml b/res/screen-size-normal/IDL_FIND_ON_PAGE.xml
index e248f79..d047a97 100644 (file)
--- a/res/screen-size-normal/IDL_FIND_ON_PAGE.xml
+++ b/res/screen-size-normal/IDL_FIND_ON_PAGE.xml
@@ -3,8 +3,7 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">
-
-<ScenePanel Bversion="2.0.0.201306151404" Dversion="20120315">
+<ScenePanel Bversion="2.0.0.201307041803" Dversion="20120315">
     <Panel id="IDL_FIND_ON_PAGE">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
         <layout height="82.0" mode="Portrait" type="LAYOUT_RELATIVE" width="720.0" x="3.0" y="27.0"/>
@@ -21,12 +20,12 @@
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="16.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_FIND_ON_PAGE" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_FIND_ON_PAGE" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="134.0" x="1130.0" y="5.0"/>
     </Button>
     <Button id="IDC_FIND_PREV" parent="IDL_FIND_ON_PAGE">
-        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="I01_title_btn_icon_up_disabled.png" disabledColor="#848484" disabledColorOpacity="40" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_title_btn_icon_up.png" normalColor="#848484" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_title_btn_icon_up.png" pressedColor="#008CD2" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.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="I01_title_btn_icon_up_disabled.png" disabledColor="#848484" disabledColorOpacity="40" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_title_btn_icon_up.png" normalColor="#848484" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_title_btn_icon_up_pressed.png" pressedColor="#008CD2" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="78.0" x="16.0" y="5.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_FIND_ON_PAGE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDL_FIND_ON_PAGE" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="78.0" x="16.0" y="5.0"/>
     </Button>
     <Button id="IDC_FIND_NEXT" parent="IDL_FIND_ON_PAGE">
-        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="I01_title_btn_icon_down_disabled.png" disabledColor="#848484" disabledColorOpacity="40" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_title_btn_icon_down.png" normalColor="#848484" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_title_btn_icon_down.png" pressedColor="#008CD2" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.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="I01_title_btn_icon_down_disabled.png" disabledColor="#848484" disabledColorOpacity="40" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_title_btn_icon_down.png" normalColor="#848484" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_title_btn_icon_down_pressed.png" pressedColor="#008CD2" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="3.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="78.0" x="97.0" y="5.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_FIND_PREV" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="3.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDL_FIND_ON_PAGE" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="78.0" x="97.0" y="5.0"/>
     </Button>

diff --git a/src/IntBookmarkListForm.cpp b/src/IntBookmarkListForm.cpp
index 42b1a56..891d254 100644 (file)
--- a/src/IntBookmarkListForm.cpp
+++ b/src/IntBookmarkListForm.cpp
@@ -352,7 +352,7 @@ BookmarkListForm::OnActionPerformed(const Tizen::Ui::Control& source, int action
                        else
                        {
 
-                               if(pSceneManager->GoBackward(BackwardSceneTransition())!= E_SUCCESS)
+                               if(pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT))!= E_SUCCESS)
                                {
                                        AppLogDebug("BookmarkListForm::OnActionPerformed GoBackward failed");
                                        return;

diff --git a/src/IntInternetApp.cpp b/src/IntInternetApp.cpp
index 1f4695a..cacad1d 100644 (file)
--- a/src/IntInternetApp.cpp
+++ b/src/IntInternetApp.cpp
@@ -40,6 +40,11 @@ using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
+static const wchar_t* APPCONTROL_SELECT_KEY_IMAGE = L"http://tizen.org/appcontrol/data/image/crop_mode";
+static const wchar_t* APPCONTROL_SELECT_VALUE_IMAGE = L"fit_to_screen";
+static const wchar_t* APPCONTROL_PROVIDER_ID_IMAGE_VIEWER = L"tizen.imageviewer";
+static const wchar_t* APPCONTROL_OPERATION_ID_IMAGE_VIEWER = L"http://tizen.org/appcontrol/operation/view";
+
 const int MIN_MEMORY_NEEDED = 1048576;
 
 InternetApp::InternetApp(void)
@@ -361,6 +366,32 @@ InternetApp::OnAppControlRequestReceived(RequestId reqId, const String &operatio
                        __pNewWindowInfo = null;
                }
        }
+       else if (operationId.CompareTo(L"http://tizen.org/appcontrol/operation/main") == 0)
+       {
+               if (pArgs)
+               {
+                       const String* pVal = (String *) pArgs->GetValue(String(L"http://tizen.org/appcontrol/data/notification"));
+                       if (pVal && pVal->GetLength() > 0)
+                       {
+                               HashMap extraData;
+                               extraData.Construct();
+                               String typeKey = APPCONTROL_SELECT_KEY_IMAGE;
+                               String typeVal = APPCONTROL_SELECT_VALUE_IMAGE;
+                               extraData.Add(&typeKey, &typeVal);
+
+                               AppControl* pAc = AppManager::FindAppControlN(APPCONTROL_PROVIDER_ID_IMAGE_VIEWER,
+                                               APPCONTROL_OPERATION_ID_IMAGE_VIEWER);
+                               if (pAc)
+                               {
+                                       if (pAc->Start(pVal, null, null, null) == E_SUCCESS)
+                                       {
+                                               delete pAc;
+                                       }
+                               }
+                       }
+               }
+       }
+
        AppLogDebug("ABC::Internet::OnAppControlRequestReceivedN Exit");
        return;
 }

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 7b84d7d..aeb00b2 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -5304,20 +5304,21 @@ void MainForm::UpdateImageContent(ByteBuffer* aBuffer, String imageName)
        contentPath.Append(imageName);
        contentPath.Append(".jpg");
        contentId = contentManager.CreateContent(*aBuffer, contentPath);
-       ShowIndicatorNotification(L"Download Complete");
+       ShowIndicatorNotification(L"Download Complete",contentPath);
        AppLog("Content manager update content result %s" ,GetErrorMessage(GetLastResult()));
 }
 
 void
-MainForm::ShowIndicatorNotification(const String& messageText)
+MainForm::ShowIndicatorNotification(const String& messageText, const String& contentPath)
 {
        AppLogDebug("ENTER");
 
        NotificationRequest request;
        request.SetAlertText(messageText);
        request.SetTitleText(L"");
-       request.SetAppMessage(L"AppMessage");
-
+       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";
@@ -5326,7 +5327,7 @@ MainForm::ShowIndicatorNotification(const String& messageText)
 
        Tizen::Shell::NotificationManager notiMgr;
        notiMgr.Construct();
-       notiMgr.Notify(request);
+       notiMgr.NotifyOngoingActivity(request);
 
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
        return;