Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
	automated-tests/src/dali-toolkit-unmanaged/CMakeLists.txt
	automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
	automated-tests/src/dali-toolkit/utc-Dali-TextInput.cpp
	base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
	base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h
	base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
	base/dali-toolkit/internal/controls/text-input/text-input-impl.h
	base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp
	base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.h
	base/dali-toolkit/internal/controls/text-input/text-input-popup-new-impl.h
	base/dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h
	base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp
	base/dali-toolkit/internal/controls/text-view/text-view-impl.h
	base/dali-toolkit/public-api/controls/text-input/text-input.cpp
	base/dali-toolkit/public-api/controls/text-input/text-input.h
	base/dali-toolkit/public-api/controls/text-view/text-view.cpp
	base/dali-toolkit/public-api/controls/text-view/text-view.h

Change-Id: I98c12cbab5fe05cdcc60b42c4eeeb34ffc9ac7cc

diff --cc automated-tests/src/dali-toolkit/CMakeLists.txt
index 47c8ec7,7709cda..aff9f85
--- 1/automated-tests/src/dali-toolkit/CMakeLists.txt
--- 2/automated-tests/src/dali-toolkit/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit/CMakeLists.txt
@@@ -27,8 -62,11 +61,9 @@@ SET(TC_SOURCE
     utc-Dali-Ripple2DEffect.cpp
     utc-Dali-RippleEffect.cpp
     utc-Dali-ScrollViewEffect.cpp
+    utc-Dali-StyleManager.cpp
     utc-Dali-SuperBlurView.cpp
     utc-Dali-SwirlEffect.cpp
 -   utc-Dali-TextInput.cpp
 -   utc-Dali-TextView.cpp
  )
  
  # Append list of test harness files (Won't get parsed for test cases)

diff --cc automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
Simple merge

diff --cc automated-tests/src/dali-toolkit/utc-Dali-NavigationControl.cpp
Simple merge

diff --cc automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
index f059594,2f0b7fc..0b832fb
--- 1/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
--- 2/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
@@@ -420,8 -420,18 +420,8 @@@ int UtcDaliPushButtonSetLabelText(void
    application.SendNotification();
    application.Render();
  
-   pushButton.SetLabelText( STR );
 -  TextView textView;
 -
+   pushButton.SetLabel( STR );
  
 -  textView = TextView::DownCast( pushButton.GetLabel() );
 -  DALI_TEST_CHECK( STR == textView.GetText() );
 -
 -  TextView text = TextView::New( STR );
 -  pushButton.SetLabel( text );
 -
 -  textView = TextView::DownCast( pushButton.GetLabel() );
 -  DALI_TEST_CHECK( STR == textView.GetText() );
    END_TEST;
  }
  

diff --cc automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp
Simple merge

diff --cc base/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.cpp
Simple merge

diff --cc base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
index ee89ab9,450b038..525cb3f
--- 1/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
--- 2/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
+++ b/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
@@@ -258,81 -239,83 +238,81 @@@ Actor PushButton::GetBackgroundImage() 
    return mBackgroundImage;
  }
  
- void PushButton::SetPressedImage( Image image )
+ void PushButton::SetSelectedImage( Image image )
  {
-   SetPressedImage( ImageActor::New( image ) );
+   SetSelectedImage( ImageActor::New( image ) );
  }
  
- void PushButton::SetPressedImage( Actor image )
+ void PushButton::SetSelectedImage( Actor image )
  {
    Toolkit::PushButton handle( GetOwner() );
-   GetPushButtonPainter( mPainter )->SetPressedImage( handle, image );
+   GetPushButtonPainter( mPainter )->SetSelectedImage( handle, image );
  }
  
- Actor& PushButton::GetPressedImage()
+ Actor& PushButton::GetSelectedImage()
  {
-   return mPressedImage;
+   return mSelectedImage;
  }
  
- Actor PushButton::GetPressedImage() const
+ Actor PushButton::GetSelectedImage() const
  {
-   return mPressedImage;
+   return mSelectedImage;
  }
  
- void PushButton::SetDimmedBackgroundImage( Image image )
+ void PushButton::SetDisabledBackgroundImage( Image image )
  {
-   SetDimmedBackgroundImage( ImageActor::New( image ) );
+   SetDisabledBackgroundImage( ImageActor::New( image ) );
  }
  
- void PushButton::SetDimmedBackgroundImage( Actor image )
+ void PushButton::SetDisabledBackgroundImage( Actor image )
  {
    Toolkit::PushButton handle( GetOwner() );
-   GetPushButtonPainter( mPainter )->SetDimmedBackgroundImage( handle, image );
+   GetPushButtonPainter( mPainter )->SetDisabledBackgroundImage( handle, image );
  }
  
- Actor& PushButton::GetDimmedBackgroundImage()
+ Actor& PushButton::GetDisabledBackgroundImage()
  {
-   return mDimmedBackgroundImage;
+   return mDisabledBackgroundImage;
  }
  
- Actor PushButton::GetDimmedBackgroundImage() const
+ Actor PushButton::GetDisabledBackgroundImage() const
  {
-   return mDimmedBackgroundImage;
+   return mDisabledBackgroundImage;
  }
  
- void PushButton::SetDimmedImage( Image image )
+ void PushButton::SetDisabledImage( Image image )
  {
-   SetDimmedImage( ImageActor::New( image ) );
+   SetDisabledImage( ImageActor::New( image ) );
  }
  
- void PushButton::SetDimmedImage( Actor image )
+ void PushButton::SetDisabledImage( Actor image )
  {
    Toolkit::PushButton handle( GetOwner() );
-   GetPushButtonPainter( mPainter )->SetDimmedImage( handle, image );
+   GetPushButtonPainter( mPainter )->SetDisabledImage( handle, image );
  }
  
- Actor& PushButton::GetDimmedImage()
+ Actor& PushButton::GetDisabledImage()
  {
-   return mDimmedImage;
+   return mDisabledImage;
  }
  
- Actor PushButton::GetDimmedImage() const
+ Actor PushButton::GetDisabledImage() const
  {
-   return mDimmedImage;
+   return mDisabledImage;
  }
  
- void PushButton::SetLabelText( const std::string& text )
+ void PushButton::SetLabel( const std::string& label )
  {
 -  Toolkit::TextView textView ( Toolkit::TextView::New( label ) );
 -  textView.SetWidthExceedPolicy( Toolkit::TextView::ShrinkToFit ); // Make sure our text always fits inside the button
 -  SetLabel( textView );
 +  // TODO
  }
  
- void PushButton::SetLabelText( Actor text )
+ void PushButton::SetLabel( Actor label )
  {
    Toolkit::PushButton handle( GetOwner() );
-   GetPushButtonPainter( mPainter )->SetLabelText( handle, text );
+   GetPushButtonPainter( mPainter )->SetLabel( handle, label );
  }
  
- Actor& PushButton::GetLabel()
+ Actor PushButton::GetLabel() const
  {
    return mLabel;
  }

diff --cc base/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
Simple merge

diff --cc base/dali-toolkit/internal/controls/buttons/radio-button-impl.h
Simple merge

diff --cc base/dali-toolkit/internal/controls/popup/popup-impl.cpp
Simple merge

diff --cc base/dali-toolkit/internal/controls/popup/popup-impl.h
Simple merge

diff --cc base/dali-toolkit/internal/file.list
index 6371962,1966d8d..a6cb7ca
--- 1/base/dali-toolkit/internal/file.list
--- 2/base/dali-toolkit/internal/file.list
+++ b/base/dali-toolkit/internal/file.list
@@@ -32,10 -31,27 +31,9 @@@ toolkit_base_src_files = 
     $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp \
     $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp \
     $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp \
-    $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.cpp \
     $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp \
     $(toolkit_base_src_dir)/controls/table-view/table-view-impl.cpp \
 -   $(toolkit_base_src_dir)/controls/text-input/text-input-decorator-impl.cpp \
 -   $(toolkit_base_src_dir)/controls/text-input/text-input-handles-impl.cpp \
 -   $(toolkit_base_src_dir)/controls/text-input/text-input-text-highlight-impl.cpp \
 -   $(toolkit_base_src_dir)/controls/text-input/text-input-impl.cpp \
 -   $(toolkit_base_src_dir)/controls/text-input/text-input-popup-impl.cpp \
 -   $(toolkit_base_src_dir)/controls/text-view/relayout-utilities.cpp   \
 -   $(toolkit_base_src_dir)/controls/text-view/split-by-new-line-char-policies.cpp   \
 -   $(toolkit_base_src_dir)/controls/text-view/split-by-word-policies.cpp   \
 -   $(toolkit_base_src_dir)/controls/text-view/split-by-char-policies.cpp   \
 -   $(toolkit_base_src_dir)/controls/text-view/text-actor-cache.cpp   \
 -   $(toolkit_base_src_dir)/controls/text-view/text-processor.cpp   \
 -   $(toolkit_base_src_dir)/controls/text-view/text-processor-bidirectional-info.cpp  \
 -   $(toolkit_base_src_dir)/controls/text-view/text-view-impl.cpp   \
 -   $(toolkit_base_src_dir)/controls/text-view/text-view-character-processor.cpp  \
 -   $(toolkit_base_src_dir)/controls/text-view/text-view-paragraph-processor.cpp  \
 -   $(toolkit_base_src_dir)/controls/text-view/text-view-processor.cpp  \
 -   $(toolkit_base_src_dir)/controls/text-view/text-view-processor-dbg.cpp  \
 -   $(toolkit_base_src_dir)/controls/text-view/text-view-processor-helper-functions.cpp  \
 -   $(toolkit_base_src_dir)/controls/text-view/text-view-word-processor.cpp  \
 +   $(toolkit_base_src_dir)/controls/text-controls/text-label-impl.cpp \
     $(toolkit_base_src_dir)/focus-manager/focus-manager-impl.cpp \
     $(toolkit_base_src_dir)/focus-manager/keyboard-focus-manager-impl.cpp \
     $(toolkit_base_src_dir)/focus-manager/keyinput-focus-manager-impl.cpp \

diff --cc base/dali-toolkit/public-api/controls/popup/popup.cpp
Simple merge

diff --cc base/dali-toolkit/public-api/controls/popup/popup.h
Simple merge

diff --cc base/dali-toolkit/public-api/file.list
index 1b3f5d3,9537d61..b2c438d
--- 1/base/dali-toolkit/public-api/file.list
--- 2/base/dali-toolkit/public-api/file.list
+++ b/base/dali-toolkit/public-api/file.list
@@@ -36,20 -35,10 +35,19 @@@ public_api_base_src_files = 
    $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect.cpp \
    $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.cpp \
    $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.cpp \
-   $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-slide-effect.cpp \
    $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect.cpp \
    $(public_api_base_src_dir)/controls/table-view/table-view.cpp \
 -  $(public_api_base_src_dir)/controls/text-input/text-input.cpp \
 -  $(public_api_base_src_dir)/controls/text-view/text-view.cpp \
 +  $(public_api_base_src_dir)/controls/text-controls/text-label.cpp \
 +  $(public_api_base_src_dir)/text/character-set-conversion.cpp \
 +  $(public_api_base_src_dir)/text/logical-model.cpp \
 +  $(public_api_base_src_dir)/text/multi-language-support.cpp \
 +  $(public_api_base_src_dir)/text/text-controller.cpp \
 +  $(public_api_base_src_dir)/text/text-view.cpp \
 +  $(public_api_base_src_dir)/text/text-view-interface.cpp \
 +  $(public_api_base_src_dir)/text/visual-model.cpp \
 +  $(public_api_base_src_dir)/text/rendering/text-renderer.cpp \
 +  $(public_api_base_src_dir)/text/rendering/basic/text-basic-renderer.cpp \
 +  $(public_api_base_src_dir)/text/rendering/shaders/text-basic-shader.cpp \
    $(public_api_base_src_dir)/focus-manager/focus-manager.cpp \
    $(public_api_base_src_dir)/focus-manager/keyboard-focus-manager.cpp \
    $(public_api_base_src_dir)/focus-manager/keyinput-focus-manager.cpp \

diff --cc optional/dali-toolkit/dali-toolkit.h
Simple merge

diff --cc packaging/dali-toolkit.spec
Simple merge