[TBT][cbhm/camera/notification][Non-ACR][Fixed M2 RC1 6.0 TM1 issues]

- TSIX-6147 Fixed image orientation wrong display
- TSIX-6236 Fixed notification title issue
- TSIX-6192 cbhm count button text changed

Change-Id: I62deb5e538c089ff92677b6063c8d3c55d62100a
Signed-off-by: Nibha Sharma <nibha.sharma@samsung.com>

diff --git a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk
index bae0e02e00413f7fdbd6c9c976044c91263bb294..febe0f09ea758596affa0f77686697db2148bd1a 100755 (executable)
Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk differ

diff --git a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk
index 1a55198d1f47489746782a4e8f4c9db2efed13ae..065d09674799b7e14e048cbdd655d4769f99170d 100755 (executable)
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk differ

diff --git a/tbtcoreapp/inc/utils/ui-utils.h b/tbtcoreapp/inc/utils/ui-utils.h
old mode 100644 (file)
new mode 100755 (executable)
index fce5fbe..6d97fe3
--- a/tbtcoreapp/inc/utils/ui-utils.h
+++ b/tbtcoreapp/inc/utils/ui-utils.h
@@ -120,6 +120,16 @@ Evas_Object *ui_utils_icon_create(Evas_Object *parent, const char *icon_name);
  */
 Evas_Object *ui_utils_create_image(Evas_Object *parent, const char *file_path);
 
+/*
+ * @brief Add naviframe widget
+ * @since_tizen 2.3
+ * @param[in]   parent      Parent widget
+ * @param[in]   back_cb     Hardware back button callback
+ * @param[in]   cb_data     Data to pass to back_cb
+ * @return Naviframe on success, otherwise NULL
+ */
+Evas_Object *ui_utils_create_image_camera(Evas_Object *parent, const char *file_path);
+
 /*
  * @brief Add naviframe widget
  * @since_tizen 2.3

diff --git a/tbtcoreapp/src/model/tbt-list.c b/tbtcoreapp/src/model/tbt-list.c
index 5513ab0824d5893f83f11d22291b7f75db8a73f4..b4015cf381b4f231d4622c5743ee3aedc1610b82 100755 (executable)
--- a/tbtcoreapp/src/model/tbt-list.c
+++ b/tbtcoreapp/src/model/tbt-list.c
@@ -2865,7 +2865,7 @@ static tbt_info tbtapps[] =
                        .parent = "CBHM",
                        .apptype = TBT_APP_CBHM_COUNT_GET,
                        .icon_name = "dummy",
-                       .info = "1.Type text in the Editor  <br/>2.Copy text to ClipBoard  <br/>3.Repeat the previous two steps  <br/>4.Click Get Count button  <br/>5.The number of items in ClipBoard should be displayed.  <br/>6. You can cross check it by Clicking Show ClipBoard button",
+                       .info = "1.Type text in the Editor  <br/>2.Copy text to ClipBoard  <br/>3.Repeat the previous two steps  <br/>4.Click Show Count button  <br/>5.The number of items in ClipBoard should be displayed.  <br/>6. You can cross check it by Clicking Show ClipBoard button",
                        .result = 0
                },
        #endif

diff --git a/tbtcoreapp/src/utils/ui-utils.c b/tbtcoreapp/src/utils/ui-utils.c
old mode 100644 (file)
new mode 100755 (executable)
index 3449518..17d2e5c
--- a/tbtcoreapp/src/utils/ui-utils.c
+++ b/tbtcoreapp/src/utils/ui-utils.c
@@ -179,6 +179,39 @@ Evas_Object *ui_utils_create_image(Evas_Object *parent, const char *file_path)
        return image;
 }
 
+ /**
+ * @function            ui_utils_create_image_camera
+ * @since_tizen         2.3
+ * @description         Ui Utils Create Image
+ * @parameter           Evas_Object*: Evas Object Pointer, const char*: Const char Pointer
+ * @return              Evas_Object*
+ */
+Evas_Object *ui_utils_create_image_camera(Evas_Object *parent, const char *file_path)
+{
+    RETVM_IF(NULL == parent, NULL, "create_image_camera parent is NULL");
+
+    Evas_Object *image = NULL;
+    image = elm_image_add(parent);
+    RETVM_IF(NULL == image, NULL, "elm_image_add is NULL");
+    elm_image_preload_disabled_set(image, EINA_TRUE);
+    bool result = (EINA_TRUE == elm_image_file_set(image, file_path, NULL));
+    if(!result)
+    {
+                ERR("error with elm_image_file_set, image name %s", file_path);
+                evas_object_del(image);
+                return NULL;
+    }
+        elm_image_orient_set(image,ELM_IMAGE_ORIENT_90);
+        elm_image_no_scale_set(image, EINA_FALSE);
+        elm_image_resizable_set(image, EINA_TRUE, EINA_TRUE);
+        elm_image_smooth_set(image, EINA_FALSE);
+        elm_image_aspect_fixed_set(image, EINA_TRUE);
+        elm_image_editable_set(image, EINA_FALSE);
+        evas_object_show(image);
+
+         return image;
+}
+
 
 /**
  * @function           ui_utils_navi_add

diff --git a/tbtcoreapp/src/view/tbt-camera-view.c b/tbtcoreapp/src/view/tbt-camera-view.c
old mode 100644 (file)
new mode 100755 (executable)
index a2d70a8..eaf49b3
--- a/tbtcoreapp/src/view/tbt-camera-view.c
+++ b/tbtcoreapp/src/view/tbt-camera-view.c
@@ -353,7 +353,6 @@ static void start_camera(camera_view *this)
                camera_state_e state;
                result = camera_get_state(this->camera, &state);
                RETM_IF(result != CAMERA_ERROR_NONE, "camera_get_state fail > Error = %s", get_camera_error(result));
-
                if (state != CAMERA_STATE_PREVIEW && this->view->tbt_info->apptype != TBT_APP_CAMERA_RECORD)
                {
                        result = camera_start_preview(this->camera);
@@ -909,15 +908,26 @@ static void _camera_capture_completed_cb(void *data)
        view = (camera_view*) data;
        RETM_IF(NULL == view, "view is NULL");
 
+    int angle =0;
+    camera_attr_get_lens_orientation(view->camera,&angle );
+    DBG("angle %ddegree",angle);
+
        result = camera_start_preview(view->camera);
        RETM_IF(result != CAMERA_ERROR_NONE, "camera_start_preview fail > Error = %s", get_camera_error(result));
 
        if ((view->view->tbt_info->apptype == TBT_APP_CAMERA_CAPTURE)
                || (view->view->tbt_info->apptype == TBT_APP_CAMERA_HDR_CAPTURE))
        {
-               view->image = ui_utils_create_image(view->view->layout, view->file_path);
-               RETM_IF(NULL == view->image, "ui_utils_create_image fail > Error = %s", view->file_path);
-
+               if(angle == 0) //Emulator check
+               {
+                       view->image = ui_utils_create_image(view->view->layout, view->file_path);
+                       RETM_IF(NULL == view->image, "ui_utils_create_image fail > Error = %s", view->file_path);
+               }
+               else
+               {
+                       view->image = ui_utils_create_image_camera(view->view->layout, view->file_path);
+                       RETM_IF(NULL == view->image, "ui_utils_create_image_camera fail > Error = %s", view->file_path);
+               }
                elm_object_part_content_set(view->view->layout, "video_view", view->image);
        }
 }

diff --git a/tbtcoreapp/src/view/tbt-notification-view.c b/tbtcoreapp/src/view/tbt-notification-view.c
index 738fbf83ab2ef1c73605d43982d394cea20c8c8e..8ed02336f56382c2593dc6cba5b27ef9f448379b 100644 (file)
--- a/tbtcoreapp/src/view/tbt-notification-view.c
+++ b/tbtcoreapp/src/view/tbt-notification-view.c
@@ -126,7 +126,7 @@ notification_view *notification_view_add(Evas_Object *navi, tbt_info *tbt_info,
 
        if(this->view->tbt_info->apptype == TBT_APP_NOTIFICATION_TITLE)
        {
-               ret = notification_set_text(g_NotificationHandle,NOTIFICATION_TEXT_TYPE_TITLE, "IDS_APP_BODY_IM_TITLE", "I'm Title", NOTIFICATION_VARIABLE_TYPE_NONE);
+               ret = notification_set_text(g_NotificationHandle,NOTIFICATION_TEXT_TYPE_TITLE, "I'm Title",NULL, NOTIFICATION_VARIABLE_TYPE_NONE);
                RETVM_IF(ret != NOTIFICATION_ERROR_NONE, NULL, "package_manager_set_event_cb failed : %s", get_notification_error(ret));        
 
                ret = notification_post(g_NotificationHandle);