Merge "Move TextSelectionPopup from public to devel" into tizen

diff --combined dali-toolkit/dali-toolkit.h
index cc1a464,9cef6c3..5fc233b
--- 1/dali-toolkit/dali-toolkit.h
--- 2/dali-toolkit/dali-toolkit.h
+++ b/dali-toolkit/dali-toolkit.h
@@@ -30,6 -30,7 +30,6 @@@
  #include <dali-toolkit/public-api/controls/control.h>
  #include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
  #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
 -#include <dali-toolkit/public-api/controls/image-view/masked-image-view.h>
  #include <dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h>
  #include <dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout.h>
  #include <dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h>
@@@ -43,7 -44,6 +43,6 @@@
  #include <dali-toolkit/public-api/controls/table-view/table-view.h>
  #include <dali-toolkit/public-api/controls/text-controls/text-field.h>
  #include <dali-toolkit/public-api/controls/text-controls/text-label.h>
- #include <dali-toolkit/public-api/controls/text-controls/text-selection-popup.h>
  #include <dali-toolkit/public-api/focus-manager/focus-manager.h>
  #include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
  #include <dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h>

diff --combined dali-toolkit/public-api/file.list
index fcd4635,3bd88d8..d64c5d2
--- 1/dali-toolkit/public-api/file.list
--- 2/dali-toolkit/public-api/file.list
+++ b/dali-toolkit/public-api/file.list
@@@ -22,8 -22,8 +22,7 @@@ public_api_src_files = 
    $(public_api_src_dir)/controls/table-view/table-view.cpp \
    $(public_api_src_dir)/controls/text-controls/text-label.cpp \
    $(public_api_src_dir)/controls/text-controls/text-field.cpp \
-   $(public_api_src_dir)/controls/text-controls/text-selection-popup.cpp \
    $(public_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.cpp \
 -  $(public_api_src_dir)/controls/image-view/masked-image-view.cpp \
    $(public_api_src_dir)/focus-manager/focus-manager.cpp \
    $(public_api_src_dir)/focus-manager/keyboard-focus-manager.cpp \
    $(public_api_src_dir)/focus-manager/keyinput-focus-manager.cpp \
@@@ -55,6 -55,9 +54,6 @@@ public_api_default_controls_header_file
  public_api_gaussian_blur_view_header_files = \
    $(public_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.h
  
 -public_api_image_view_header_files = \
 -  $(public_api_src_dir)/controls/image-view/masked-image-view.h
 -
  public_api_item_view_header_files = \
    $(public_api_src_dir)/controls/scrollable/item-view/default-item-layout.h \
    $(public_api_src_dir)/controls/scrollable/item-view/item-factory.h \
@@@ -79,8 -82,7 +78,7 @@@ public_api_table_view_header_files = 
  
  public_api_text_controls_header_files = \
    $(public_api_src_dir)/controls/text-controls/text-label.h \
-   $(public_api_src_dir)/controls/text-controls/text-field.h \
-   $(public_api_src_dir)/controls/text-controls/text-selection-popup.h
+   $(public_api_src_dir)/controls/text-controls/text-field.h 
  
  public_api_focus_manager_header_files = \
    $(public_api_src_dir)/focus-manager/focus-manager.h \