From: Masayuki Sasaki <masayuki.sasaki@mail.toyota-td.jp>
Date: Tue, 8 Apr 2014 01:55:01 +0000 (+0900)
Subject: bug fix: TIVI-3001 - Apps gesture switching fails to work in ICO Homescreen
X-Git-Tag: accepted/tizen/ivi/20140410.192440^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen_ivi_release;p=profile%2Fivi%2Fico-uxf-homescreen.git

bug fix: TIVI-3001 - Apps gesture switching fails to work in ICO Homescreen

Change-Id: I65183eb6ec2c22d631917012d636013fc8377d71
Signed-off-by: Masayuki Sasaki <masayuki.sasaki@mail.toyota-td.jp>
---

diff --git a/lib/system-controller/CicoSCWlWinMgrIF.cpp b/lib/system-controller/CicoSCWlWinMgrIF.cpp
index 177a1f4..88771f2 100644
--- a/lib/system-controller/CicoSCWlWinMgrIF.cpp
+++ b/lib/system-controller/CicoSCWlWinMgrIF.cpp
@@ -904,6 +904,16 @@ CicoSCWlWinMgrIF::wlIviAppNativeShellInfoCB(void *data,
         return;
     }
 
+    // if same pid and same title, skip
+    tp = m_wait_surface_creation;
+    while (tp)  {
+        if ((tp->pid == pid) && (strcmp(tp->title, title) == 0))    {
+            ICO_TRA("CicoSCWlWinMgrIF::wlIviAppNativeShellInfoCB: Leave(same title)");
+            return;
+        }
+        tp = tp->next;
+    }
+
     // get native surface info
     tp = m_free_surface_creation;
     if (tp)  {
diff --git a/packaging/ico-uxf-homescreen.changes b/packaging/ico-uxf-homescreen.changes
index fb44569..cbbef6f 100644
--- a/packaging/ico-uxf-homescreen.changes
+++ b/packaging/ico-uxf-homescreen.changes
@@ -1,3 +1,15 @@
+* Tue Apr 08 2014 Shibata Makoto <shibata@mac.tec.toyota.co.jp> accepted/tizen/ivi/panda/20140403.020026@294446b
+- 0.9.22 release
+-- bug fix: TIVI-3007 - Home button doesn't response after some operations.
+-- bug fix: Two or more Display(s) cannot be used.
+-- bug fix: SystemController sometimes crashes at the time of deletion of Surface.
+-- bug fix: defaultApps.info file overlaps in the definition of a spec file.
+-- cleanup debug log messages.
+-- Adjusted a gesture operation domain.
+-- bug fix: A lot of Surface will be temporarily made from the application which changes the title name of Surface like MiniBrowser.
+-- bug fix: TIVI-3018 - unable to launch smartdevicelink-sample-hmi(SDL) in ico homescreen.
+-- bug fix: TIVI-3001 - Apps gesture switching fails to work in ICO Homescreen.
+
 * Fri Mar 28 2014 Shibata Makoto <shibata@mac.tec.toyota.co.jp> accepted/tizen/ivi/panda/20140326.234210@52d43be
 - bug fix(StatusBar): Clock is not displayed at the time of the first start
 - bug fix(StatusBar): Adjustment of the clock image interval
diff --git a/src/homescreen/CicoHSAppHistoryExt.cpp b/src/homescreen/CicoHSAppHistoryExt.cpp
index 61565ad..74042a3 100644
--- a/src/homescreen/CicoHSAppHistoryExt.cpp
+++ b/src/homescreen/CicoHSAppHistoryExt.cpp
@@ -373,7 +373,11 @@ void CicoHSAppHistoryExt::activeApp(const string& appid)
  */
 void CicoHSAppHistoryExt::activeApp(const char* appid)
 {
+    if (strcmp(appid, ICO_HS_PROC_DEFAULT_HOMESCREEN) == 0) {
+        return;
+    }
     ICO_DBG("start %s", appid);
+
     if (true == m_waitSelApp.empty()) {
         moveHistoryHead(appid);
         ICO_DBG("end current none");
@@ -385,7 +389,7 @@ void CicoHSAppHistoryExt::activeApp(const char* appid)
         ICO_DBG("end touch operate app");
         return;
     }
-    ICO_DBG("end  no match select app(%s)", m_waitSelApp.c_str());
+    ICO_DBG("end no match select app(%s)", m_waitSelApp.c_str());
     if (true == moveHistoryHead(appid)) {
         m_waitSelApp.clear();
     }
diff --git a/src/homescreen/CicoHSSwipeTouch.cpp b/src/homescreen/CicoHSSwipeTouch.cpp
index 5e83791..8232668 100644
--- a/src/homescreen/CicoHSSwipeTouch.cpp
+++ b/src/homescreen/CicoHSSwipeTouch.cpp
@@ -184,7 +184,7 @@ CicoHSSwipeTouch::TouchUpSwipe(void *data, Evas *evas, Evas_Object *obj, void *e
 
     /* check swipe left to right or right to left   */
     if (sub > ICO_HS_SWIPE_TOUCH_SWIPE_THREASHOLD_DISTANCE) {
-        if (touch_state_b_x < ICO_HS_SWIPE_TOUCH_SWIPE_THREASHOLD_DISTANCE) {
+        if (touch_state_b_x < ICO_HS_SWIPE_TOUCH_SWIPE_WIDTH)   {
             /* get current application  */
             curapp = app_history->getSwipeCurrentAppid();
 
@@ -277,8 +277,7 @@ CicoHSSwipeTouch::TouchUpSwipe(void *data, Evas *evas, Evas_Object *obj, void *e
         }
     }
     else if (sub < (-1 * ICO_HS_SWIPE_TOUCH_SWIPE_THREASHOLD_DISTANCE)) {
-        if (touch_state_b_x >
-            (full_width - ICO_HS_SWIPE_TOUCH_SWIPE_THREASHOLD_DISTANCE))    {
+        if (touch_state_b_x >= (full_width - ICO_HS_SWIPE_TOUCH_SWIPE_WIDTH))   {
             /* get current application  */
             curapp = app_history->getSwipeCurrentAppid();
 
diff --git a/src/homescreen/CicoHSSwipeTouch.h b/src/homescreen/CicoHSSwipeTouch.h
index b484fc1..4f5a0bc 100644
--- a/src/homescreen/CicoHSSwipeTouch.h
+++ b/src/homescreen/CicoHSSwipeTouch.h
@@ -23,8 +23,8 @@
 #include "CicoHSControlBarWindow.h"
 #include "CicoHSAppHistoryExt.h"
 
-#define ICO_HS_SWIPE_TOUCH_SWIPE_WIDTH  80
-#define ICO_HS_SWIPE_TOUCH_SWIPE_HEIGHT 80
+#define ICO_HS_SWIPE_TOUCH_SWIPE_WIDTH  100
+#define ICO_HS_SWIPE_TOUCH_SWIPE_HEIGHT 100
 #define ICO_HS_SWIPE_TOUCH_DISTANCE_TOP     200
 #define ICO_HS_SWIPE_TOUCH_DISTANCE_BOTTOM  128
 #define ICO_HS_SWIPE_TOUCH_SWIPE_THREASHOLD_DISTANCE 60