Merge "[dali-toolkit] fix set max character length when text already set" into devel...

author joogab yun <joogab.yun@samsung.com>

Thu, 15 Apr 2021 05:09:23 +0000 (05:09 +0000)

committer Gerrit Code Review <gerrit@review>

Thu, 15 Apr 2021 05:09:23 +0000 (05:09 +0000)
author joogab yun <joogab.yun@samsung.com>
Thu, 15 Apr 2021 05:09:23 +0000 (05:09 +0000)
committer Gerrit Code Review <gerrit@review>
Thu, 15 Apr 2021 05:09:23 +0000 (05:09 +0000)
diff --cc automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
Simple merge
diff --cc dali-toolkit/internal/text/text-controller-text-updater.cpp
Simple merge
author	joogab yun <joogab.yun@samsung.com>
	Thu, 15 Apr 2021 05:09:23 +0000 (05:09 +0000)
committer	Gerrit Code Review <gerrit@review>
	Thu, 15 Apr 2021 05:09:23 +0000 (05:09 +0000)
		1	2
automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/text-controller-text-updater.cpp	patch \|	diff1 \|	diff2 \|	blob \| history