From: David Steele <david.steele@samsung.com>
Date: Fri, 30 Oct 2020 13:19:09 +0000 (+0000)
Subject: Merge changes I2df640e0,Ia1188305,I7fae506e,I7967a7cc,Ib0fdcdf4, ... into devel/master
X-Git-Tag: dali_2.0.0~6
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=ed11499452da1ccd5fdfa36324881dc66a5281bc

Merge changes I2df640e0,Ia1188305,I7fae506e,I7967a7cc,Ib0fdcdf4, ... into devel/master

* changes:
  [AT-SPI] MERGING MARKER
  [AT-SPI] Correct VISIBLE and SHOWING states
  [AT-SPI] Windows fixes
  [AT-SPI] Fixed uint underflow risk
  [AT-SPI] Guard added for potential null pointer dereference
  [AT-SPI] Implemented reading popup description
  [AT-SPI] Improving utc coverage ToggleButton tests
  [AT-SPI] More coverage
  [AT-SPI] Improving utc coverage
  [AT-SPI] Set both ScreenReaderEnabled and IsEnabled in TestEnableSC
  [AT-SPI] Rewritten UtcDaliControlAccessibilityModal
  [AT-SPI] Pass correct object to dynamic_cast
  [AT-SPI] UTC correction
  [AT-SPI] More UTC fixes
  [AT-SPI] Execute tct under dbus-launch
  [AT-SPI] UTC fixes
  [AT-SPI] Add TestDBusWrapper and bypass compilation problems
  [AT-SPI] Implement accessibility for Popup
  [AT-SPI] Fix cmake cmp0004 error
  [AT-SPI] Catch exception by reference
  [AT-SPI] Migrate Accessibility tests to dali-toolkit-internal
  [AT-SPI] Add notification for a11y name/description change
  [AT-SPI] TextController: emit characters before delete
  [AT-SPI] EmitStateChanged for togglable PushButton
  [AT-SPI] Add FOCUSABLE state to TextField and TextEditor
  [AT-SPI] Add Pause and Resume signals
  [AT-SPI] Let MarkFilter find the closest mark
  [AT-SPI] Emit ObjectPropertyChangeEvent::VALUE
  [AT-SPI] Implement proper accessibility for Slider
  [AT-SPI] Try auto-scrolling in GrabHighlight
  [AT-SPI] Override IsScrollable for Scrollable
  [AT-SPI] Support reading states and tooltips of ToggleButton
  [AT-SPI] Support gaining keyboard focus in TextField, TextEditor
  [AT-SPI] Allow two finger pan gesture
  [AT-SPI] Move setting highlightability property for controls to inheriting classes
  [AT-SPI] Make Accessible::GetName() fall back to actor name
  [AT-SPI] Fix role setting
  [AT-SPI] Squashed implementation
---

ed11499452da1ccd5fdfa36324881dc66a5281bc
diff --cc dali-toolkit/internal/text/text-controller.cpp
index 6fe0d0c,3035062..aed8d32
mode 100755,100644..100644
--- a/dali-toolkit/internal/text/text-controller.cpp
+++ b/dali-toolkit/internal/text/text-controller.cpp
diff --cc dali-toolkit/internal/text/text-controller.h
index 6bd8706,f600f84..d627324
mode 100755,100644..100644
--- a/dali-toolkit/internal/text/text-controller.h
+++ b/dali-toolkit/internal/text/text-controller.h