Merge changes I17acf67f,If2410a4d into devel/master

* changes:
  Image class Usage Removal
  Remove ResourceImage Usage

diff --combined dali-toolkit/internal/controls/image-view/image-view-impl.cpp
index 6a63c80,e4dc770..7f92138
--- 1/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
--- 2/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@@ -19,7 -19,6 +19,6 @@@
  #include "image-view-impl.h"
  
  // EXTERNAL INCLUDES
- #include <dali/public-api/images/resource-image.h>
  #include <dali/public-api/object/type-registry.h>
  #include <dali/public-api/object/type-registry-helper.h>
  #include <dali/devel-api/scripting/scripting.h>
@@@ -54,6 -53,7 +53,6 @@@ BaseHandle Create(
  
  // Setup properties, signals and actions using the type-registry.
  DALI_TYPE_REGISTRATION_BEGIN( Toolkit::ImageView, Toolkit::Control, Create );
 -DALI_PROPERTY_REGISTRATION( Toolkit, ImageView, "reservedProperty01", STRING, RESERVED_PROPERTY_01 )
  DALI_PROPERTY_REGISTRATION( Toolkit, ImageView, "image", MAP, IMAGE )
  DALI_PROPERTY_REGISTRATION( Toolkit, ImageView, "preMultipliedAlpha", BOOLEAN, PRE_MULTIPLIED_ALPHA )
  

diff --combined dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
index e7e026e,f4af0d0..d7699bd
--- 1/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
--- 2/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
@@@ -23,7 -23,6 +23,6 @@@
  #include <dali/public-api/adaptor-framework/key.h>
  #include <dali/devel-api/adaptor-framework/key-devel.h>
  #include <dali/public-api/common/stage.h>
- #include <dali/public-api/images/resource-image.h>
  #include <dali/devel-api/object/property-helper-devel.h>
  #include <dali/devel-api/actors/actor-devel.h>
  #include <dali/public-api/object/type-registry-helper.h>
@@@ -91,6 -90,8 +90,6 @@@ DALI_PROPERTY_REGISTRATION( Toolkit, Te
  DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "verticalAlignment",                    STRING,    VERTICAL_ALIGNMENT                   )
  DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "textColor",                            VECTOR4,   TEXT_COLOR                           )
  DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "placeholderTextColor",                 VECTOR4,   PLACEHOLDER_TEXT_COLOR               )
 -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "reservedProperty01",                   STRING,    RESERVED_PROPERTY_01                 )
 -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "reservedProperty02",                   STRING,    RESERVED_PROPERTY_02                 )
  DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "primaryCursorColor",                   VECTOR4,   PRIMARY_CURSOR_COLOR                 )
  DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "secondaryCursorColor",                 VECTOR4,   SECONDARY_CURSOR_COLOR               )
  DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "enableCursorBlink",                    BOOLEAN,   ENABLE_CURSOR_BLINK                  )

diff --combined dali-toolkit/public-api/controls/control.h
index dee50ce,1413bac..b8b5621
--- 1/dali-toolkit/public-api/controls/control.h
--- 2/dali-toolkit/public-api/controls/control.h
+++ b/dali-toolkit/public-api/controls/control.h
@@@ -2,7 -2,7 +2,7 @@@
  #define DALI_TOOLKIT_CONTROL_H
  
  /*
-  * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+  * Copyright (c) 2020 Samsung Electronics Co., Ltd.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@@ -26,7 -26,6 +26,6 @@@
  #include <dali/public-api/events/pinch-gesture-detector.h>
  #include <dali/public-api/events/tap-gesture-detector.h>
  #include <dali/public-api/events/tap-gesture-detector.h>
- #include <dali/public-api/images/image.h>
  
  // INTERNAL INCLUDES
  #include <dali-toolkit/public-api/visuals/visual-properties.h>
@@@ -107,6 -106,9 +106,6 @@@ public
         */
        STYLE_NAME = PROPERTY_START_INDEX,
  
 -      RESERVED_PROPERTY_01, ///< Reserved index for a removed property.
 -      RESERVED_PROPERTY_02, ///< Reserved index for a removed property.
 -
        /**
         * @brief Receives key events to the control.
         * @details Name "keyInputFocus", type Property::BOOLEAN.