Merge "Change MatchSystemLanguageDirection is true." into devel/master

diff --combined automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
index 9f77f91,918e9cc..6028e02
--- 1/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
--- 2/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
+++ b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
@@@ -112,8 -112,7 +112,8 @@@ void CreateTextModel( const std::string
                                         logicalModel->mFontDescriptionRuns,
                                         logicalModel->mEmbeddedItems,
                                         logicalModel->mAnchors,
 -                                       logicalModel->mUnderlinedCharacterRuns);
 +                                       logicalModel->mUnderlinedCharacterRuns,
 +                                       logicalModel->mBackgroundColorRuns);
  
    Length textSize = 0u;
    const uint8_t* utf8 = NULL;
@@@ -383,6 -382,9 +383,9 @@@ void ConfigureTextLabel( ControllerPtr 
  
    // Enable the text elide.
    controller->SetTextElideEnabled( true );
+ 
+   // Disable match system language direction
+   controller->SetMatchSystemLanguageDirection(false);
  }
  
  void ConfigureTextField( ControllerPtr controller )
@@@ -412,6 -414,9 +415,9 @@@
  
    // Disable the text elide.
    controller->SetTextElideEnabled( false );
+ 
+   // Disable match system language direction
+   controller->SetMatchSystemLanguageDirection(false);
  }
  
  void ConfigureTextEditor( ControllerPtr controller )
@@@ -441,6 -446,9 +447,9 @@@
  
    // Disable the text elide.
    controller->SetTextElideEnabled( false );
+ 
+   // Disable match system language direction
+   controller->SetMatchSystemLanguageDirection(false);
  }
  
  } // namespace Text

diff --combined dali-toolkit/internal/text/text-model.cpp
index 26a9be8,8565eb3..3868979
--- 1/dali-toolkit/internal/text/text-model.cpp
--- 2/dali-toolkit/internal/text/text-model.cpp
+++ b/dali-toolkit/internal/text/text-model.cpp
@@@ -18,12 -18,20 +18,20 @@@
  // CLASS HEADER
  #include <dali-toolkit/internal/text/text-model.h>
  
+ // EXTERNAL INCLUDES
+ #include <dali/devel-api/adaptor-framework/environment-variable.h>
+ 
  namespace Dali
  {
  namespace Toolkit
  {
  namespace Text
  {
+ namespace
+ {
+ const char* DALI_ENV_MATCH_SYSTEM_LANGUAGE_DIRECTION("DALI_MATCH_SYSTEM_LANGUAGE_DIRECTION");
+ }
+ 
  ModelPtr Model::New()
  {
    return ModelPtr(new Model());
@@@ -119,11 -127,6 +127,11 @@@ const ColorIndex* const Model::GetBackg
    return mVisualModel->mBackgroundColorIndices.Begin();
  }
  
 +bool const Model::IsMarkupBackgroundColorSet() const
 +{
 +  return (mVisualModel->mBackgroundColorIndices.Count() > 0);
 +}
 +
  const Vector4& Model::GetDefaultColor() const
  {
    return mVisualModel->mTextColor;
@@@ -221,10 -224,14 +229,14 @@@ Model::Model(
    mAlignmentOffset(0.0f),
    mElideEnabled(false),
    mIgnoreSpacesAfterText(true),
-   mMatchSystemLanguageDirection(false)
+   mMatchSystemLanguageDirection(true)
  {
    mLogicalModel = LogicalModel::New();
    mVisualModel  = VisualModel::New();
+ 
+   // Check environment variable for DALI_MATCH_SYSTEM_LANGUAGE_DIRECTION
+   auto match                    = Dali::EnvironmentVariable::GetEnvironmentVariable(DALI_ENV_MATCH_SYSTEM_LANGUAGE_DIRECTION);
+   mMatchSystemLanguageDirection = match ? (std::atoi(match) == 0 ? false : true) : mMatchSystemLanguageDirection;
  }
  
  Model::~Model()