Merge branch 'devel/master' into tizen 59/131859/1
authorJinho, Lee <jeano.lee@samsung.com>
Wed, 31 May 2017 02:30:55 +0000 (11:30 +0900)
committerJinho, Lee <jeano.lee@samsung.com>
Wed, 31 May 2017 02:31:13 +0000 (11:31 +0900)
Change-Id: Icf648f8ecba282bd38c6aac8b10e49ac83cdbe5b

dali-toolkit/images/selection-popup-bg#.png [new file with mode: 0755]
dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp

diff --git a/dali-toolkit/images/selection-popup-bg#.png b/dali-toolkit/images/selection-popup-bg#.png
new file mode 100755 (executable)
index 0000000..3eac19f
Binary files /dev/null and b/dali-toolkit/images/selection-popup-bg#.png differ
index 15e5366..cbd831d 100644 (file)
@@ -117,7 +117,7 @@ KeyboardFocusManager::KeyboardFocusManager()
   mCurrentFocusActor(),
   mFocusIndicatorActor(),
   mFocusGroupLoopEnabled( false ),
-  mIsFocusIndicatorEnabled( false ),
+  mIsFocusIndicatorEnabled( true ),
   mIsWaitingKeyboardFocusChangeCommit( false ),
   mFocusHistory(),
   mSlotDelegate( this ),