Revert "[4.0] Support custom fonts registration"

This reverts commit e671199f1ebb4418bcaeb76adba35551df5d1b68.

Change-Id: I7f34e1a3bd4b25d981de141aa64759a6aba73421

diff --git a/automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp b/automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp
index a143f7e90842b975e26512f585f34eda1bd8acde..e8348f13e2e2ddb302f5c93a507552c13e95d7b4 100644 (file)
--- a/automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp
+++ b/automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp
@@ -1313,8 +1313,7 @@ int UtcDaliStyleManagerConfigSectionTest(void)
     "  \"config\":\n"
     "  {\n"
     "    \"alwaysShowFocus\":false,\n"
-    "    \"clearFocusOnEscape\":false,\n"
-    "    \"customFontDirectory\":\"" DALI_STYLE_DIR "\"\n"
+    "    \"clearFocusOnEscape\":false\n"
     "  },\n"
     "  \"styles\":\n"
     "  {\n"
@@ -1332,12 +1331,9 @@ int UtcDaliStyleManagerConfigSectionTest(void)
   DALI_TEST_CHECK( !alwaysShowFocus );
   bool clearFocusOnEscape = config["clearFocusOnEscape"].Get<bool>();
   DALI_TEST_CHECK( !clearFocusOnEscape );
-  std::string customFontDirectory = config["customFontDirectory"].Get<std::string>();
-  DALI_TEST_EQUALS( customFontDirectory, DALI_STYLE_DIR, TEST_LOCATION );
 
   // For coverage
   Toolkit::TextEditor editor = Toolkit::TextEditor::New();
-  editor.SetProperty( TextEditor::Property::TEXT, "Test" );
   editor.SetKeyboardFocusable( true );
   Stage::GetCurrent().Add( editor );
 

diff --git a/dali-toolkit/internal/text/multi-language-support-impl.cpp b/dali-toolkit/internal/text/multi-language-support-impl.cpp
index d32809c16f8711d2c1c8528ffd70dc53fee7865c..e88a28617efb61a2bc88be28cd0440695eb0040b 100644 (file)
--- a/dali-toolkit/internal/text/multi-language-support-impl.cpp
+++ b/dali-toolkit/internal/text/multi-language-support-impl.cpp
@@ -25,7 +25,6 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/multi-language-helper-functions.h>
-#include <dali-toolkit/devel-api/styling/style-manager-devel.h>
 
 namespace Dali
 {
@@ -107,20 +106,6 @@ MultilanguageSupport::MultilanguageSupport()
   // Initializes the valid fonts cache to NULL (no valid fonts).
   // Reserves space to cache the valid fonts and access them with the script as an index.
   mValidFontsPerScriptCache.Resize( TextAbstraction::UNKNOWN, NULL );
-
-  // Add custom font directory
-  Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get();
-  if( styleManager )
-  {
-    std::string path;
-    Property::Map config = Toolkit::DevelStyleManager::GetConfigurations( styleManager );
-    if( config["customFontDirectory"].Get( path ) )
-    {
-      TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-      fontClient.AddCustomFontDirectory( path.c_str() );
-    }
-  }
-
 }
 
 MultilanguageSupport::~MultilanguageSupport()