[Tizen] Add a flag to check whether it is forced to enable

[platform/core/uifw/dali-adaptor.git] / dali / internal / window-system / common / event-handler.cpp

diff --git a/dali/internal/window-system/common/event-handler.cpp b/dali/internal/window-system/common/event-handler.cpp
index f412ce1..f1b5eba 100755 (executable)
--- a/dali/internal/window-system/common/event-handler.cpp
+++ b/dali/internal/window-system/common/event-handler.cpp
@@ -531,23 +531,18 @@ void EventHandler::OnAccessibilityQuickpanelChanged( const unsigned char& info )
     return;
   }
 
-  // Both QuickPanel and Apps are shown
-  if( ( info & ( 1 << QUICKPANEL_TYPE_SYSTEM_DEFAULT ) ) && ( info & ( 1 << QUICKPANEL_TYPE_APPS_MENU ) ) )
+  if( ( ( info & ( 1 << QUICKPANEL_TYPE_SYSTEM_DEFAULT ) ) && ( info & ( 1 << QUICKPANEL_TYPE_APPS_MENU ) ) ) || // Both QuickPanel and Apps are shown
+      ( info & ( 1 << QUICKPANEL_TYPE_SYSTEM_DEFAULT ) ) ) // QuickPanel is shown
   {
     // dali apps should be disabled.
     accessibilityAdaptor->DisableAccessibility();
   }
-  // Only Apps menu (dali application) is shown
-  else if( info & ( 1 << QUICKPANEL_TYPE_APPS_MENU ) )
+  else if( info & ( 1 << QUICKPANEL_TYPE_APPS_MENU ) ) // Only Apps menu (dali application) is shown
   {
-    // dali app should be enabled.
-    accessibilityAdaptor->EnableAccessibility();
-  }
-  // QuickPanel is shown
-  else if( info & ( 1 << QUICKPANEL_TYPE_SYSTEM_DEFAULT ) )
-  {
-    // dali app should be disabled.
-    accessibilityAdaptor->DisableAccessibility();
+    if( !accessibilityAdaptor->IsForcedEnable() ) // It is not in case of that an application controls the accessibility status itself
+    {
+      accessibilityAdaptor->DisableAccessibility();
+    }
   }
   else
   {
@@ -555,7 +550,6 @@ void EventHandler::OnAccessibilityQuickpanelChanged( const unsigned char& info )
     accessibilityAdaptor->EnableAccessibility();
   }
 
-
 #endif
 }