Merge "[Tizen] Support CMYK jpg image load" into tizen_6.0

diff --git a/dali/internal/accessibility/common/accessibility-adaptor-impl.cpp b/dali/internal/accessibility/common/accessibility-adaptor-impl.cpp
index 6315ad7..68e32cf 100644 (file)
--- a/dali/internal/accessibility/common/accessibility-adaptor-impl.cpp
+++ b/dali/internal/accessibility/common/accessibility-adaptor-impl.cpp
@@ -52,7 +52,7 @@ Debug::Filter* gAccessibilityAdaptorLogFilter = Debug::Filter::New(Debug::NoLogg
 
 AccessibilityAdaptor::AccessibilityAdaptor()
 : mReadPosition(),
-  mFocusedActorPosition(),
+  mFocusedActorPosition(-1.0f, -1.0f),
   mActionHandler( NULL ),
   mIsEnabled( false ),
   mIsForced( false )
@@ -76,6 +76,8 @@ void AccessibilityAdaptor::EnableAccessibility()
   {
     mIsEnabled = true;
 
+    SetFocusedActorPosition(Dali::Vector2(-1.0f, -1.0f));
+
     if( mActionHandler )
     {
       mActionHandler->ChangeAccessibilityStatus();

diff --git a/dali/internal/window-system/common/event-handler.cpp b/dali/internal/window-system/common/event-handler.cpp
index be17141..820b2a0 100755 (executable)
--- a/dali/internal/window-system/common/event-handler.cpp
+++ b/dali/internal/window-system/common/event-handler.cpp
@@ -195,7 +195,7 @@ void EventHandler::OnFocusChanged( bool focusIn )
       AccessibilityAdaptor* accessibilityAdaptor( &AccessibilityAdaptor::GetImplementation( mAccessibilityAdaptor ) );
       if ( accessibilityAdaptor )
       {
-        DALI_LOG_INFO( gSelectionEventLogFilter, Debug::General, "OnFocusChanged: EnableAccessibility \n" );
+        DALI_LOG_ERROR("(Focus gained): EnableAccessibility \n");
         accessibilityAdaptor->EnableAccessibility();
       }
     }
@@ -218,7 +218,7 @@ void EventHandler::OnFocusChanged( bool focusIn )
       AccessibilityAdaptor* accessibilityAdaptor( &AccessibilityAdaptor::GetImplementation( mAccessibilityAdaptor ) );
       if ( accessibilityAdaptor && accessibilityAdaptor->IsEnabled() )
       {
-        DALI_LOG_INFO( gSelectionEventLogFilter, Debug::General, "OnFocusChanged: DisableAccessibility \n" );
+        DALI_LOG_ERROR("(Focus lost): DisableAccessibility \n");
         accessibilityAdaptor->DisableAccessibility();
       }
     }
@@ -300,6 +300,7 @@ void EventHandler::OnAccessibilityNotification( const WindowBase::AccessibilityI
 
   if( info.gestureValue == 15 ) // ONE_FINGER_SINGLE_TAP
   {
+    DALI_LOG_ERROR("[FYI] Native window resource ID : %s, Touched window resource ID : %d \n", mWindowBase->GetNativeWindowResourceId().c_str(), info.resourceId);
     if( std::to_string( info.resourceId ) == mWindowBase->GetNativeWindowResourceId() )
     {
       if( !accessibilityAdaptor->IsEnabled() )
@@ -621,15 +622,6 @@ void EventHandler::OnAccessibilityQuickpanelChanged( const unsigned char& info )
       accessibilityAdaptor->EnableAccessibility();
     }
   }
-  else
-  {
-    DALI_LOG_INFO( gSelectionEventLogFilter, Debug::General, "OnAccessibilityQuickpanelChanged: Nothing shows -> EnableAccessibility \n" );
-    if( !accessibilityAdaptor->IsForcedEnable() )
-    {
-      // dali app should be enabled.
-      accessibilityAdaptor->EnableAccessibility();
-    }
-  }
 
 #endif
 }