[NextBrowser] Applied new IME UI(Dynamic UI) repositioned new IME.

Change-Id: I2b0ee3b250475faa0c56e9c725f2c940d1d516f6
Signed-off-by: Tarun Verma <tarun1.verma@samsung.com>

diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index b964ee77b8932aece51e29b09a3fef1bee80d857..32b17e320fa3d30db923b1fc5894e32205749d52 100644 (file)
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -3566,6 +3566,9 @@ source_set("browser") {
       "devtools/protocol/webrtc_internals_handler.cc",
       "devtools/protocol/webrtc_internals_handler.h",
     ]
+    if(is_samsung_next_browser){
+      defines += [ "SAMSUNG_NEXT_BROWSER" ]
+    }
   }
 }
 

diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_common_helper_efl.cc b/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_common_helper_efl.cc
index 46f99f50e2b4e797149d93a9befb0c2a9c59d7fc..aadbbea9c082a80f956e93fcd5b8ea9bf0182426 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_common_helper_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_common_helper_efl.cc
@@ -780,8 +780,11 @@ ui::ImeStyle RWHVAuraCommonHelperEfl::GetImeStyle() {
       return ime_style;
     }
   }
-
+#if defined(SAMSUNG_NEXT_BROWSER)
+  return ui::ImeStyle::IME_STYLE_DYNAMIC;
+#else
   return ui::ImeStyle::IME_STYLE_FULL;
+#endif  // SAMSUNG_NEXT_BROWSER
 }
 #endif  // IS_TIZEN_TV
 

diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_aura_helper_efl.cc b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_aura_helper_efl.cc
index a514778c70ad3a6f24ab27f40f2f0c78e34b6016..e4416054df292607062e1ff2afe7993e92fa9966 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_aura_helper_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_aura_helper_efl.cc
@@ -172,7 +172,11 @@ void WebContentsViewAuraHelperEfl::OnOverscrolled(
 ui::ImeStyle WebContentsViewAuraHelperEfl::GetImeStyle() const {
   if (webview_delegate_)
     return webview_delegate_->GetImeStyle();
+#if defined(SAMSUNG_NEXT_BROWSER)
+  return ui::ImeStyle::IME_STYLE_DYNAMIC;
+#else
   return ui::ImeStyle::IME_STYLE_FULL;
+#endif  // SAMSUNG_NEXT_BROWSER
 }
 
 bool WebContentsViewAuraHelperEfl::UseKeyPadWithoutUserAction() const {

diff --git a/tizen_src/chromium_impl/ui/ozone/platform/efl/BUILD.gn b/tizen_src/chromium_impl/ui/ozone/platform/efl/BUILD.gn
index d13450c5646cd4a90ffbf84ba079892a181eafba..f1c2e84976d5818601df42f50c9209d90af32a34 100644 (file)
--- a/tizen_src/chromium_impl/ui/ozone/platform/efl/BUILD.gn
+++ b/tizen_src/chromium_impl/ui/ozone/platform/efl/BUILD.gn
@@ -134,4 +134,10 @@ source_set("efl") {
   }
 
   defines = [ "OZONE_IMPLEMENTATION" ]
+
+  if (tizen_product_tv) {
+    if (is_samsung_next_browser){
+      defines += [ "SAMSUNG_NEXT_BROWSER" ]
+    }
+  }
 }

diff --git a/tizen_src/chromium_impl/ui/ozone/platform/efl/efl_input_method_context.cc b/tizen_src/chromium_impl/ui/ozone/platform/efl/efl_input_method_context.cc
index 2933d15e778f86d878719aef2d29d6f8efff63db..f7968d5b0d7bd9d4ef6adf02c031bf443df7b5f5 100644 (file)
--- a/tizen_src/chromium_impl/ui/ozone/platform/efl/efl_input_method_context.cc
+++ b/tizen_src/chromium_impl/ui/ozone/platform/efl/efl_input_method_context.cc
@@ -56,9 +56,12 @@ void EflInputMethodContext::UpdateFocus(
     TextInputType old_type,
     const TextInputClientAttributes& new_client_attributes,
     TextInputClient::FocusReason reason) {
-  if (im_context_)
+  if (im_context_) {
     im_context_->UpdateInputMethodState(new_client_attributes);
-
+#if defined(SAMSUNG_NEXT_BROWSER)
+    im_context_->SetIMEPositionAlign(500, 550, IME_ALIGN_TOP_LEFT);
+#endif
+  }
   if (old_type != TEXT_INPUT_TYPE_NONE &&
       new_client_attributes.input_type == TEXT_INPUT_TYPE_NONE) {
     Blur();

diff --git a/tizen_src/ewk/efl_integration/BUILD.gn b/tizen_src/ewk/efl_integration/BUILD.gn
index 0e8a720d793b2255578c5a813a166b782a15b8b5..4d2d0b141f2f4f1cb9b2ba3348319582a5ae7281 100644 (file)
--- a/tizen_src/ewk/efl_integration/BUILD.gn
+++ b/tizen_src/ewk/efl_integration/BUILD.gn
@@ -157,6 +157,7 @@ shared_library("chromium-ewk") {
 
   if (is_samsung_next_browser) {
     ldflags += [ "-Wl,-rpath=$app_samsung_next_browser_root_dir/lib" ]
+    defines += [ "SAMSUNG_NEXT_BROWSER" ]
   }
 
   if (is_tizen) {

diff --git a/tizen_src/ewk/efl_integration/private/ewk_settings_private.h b/tizen_src/ewk/efl_integration/private/ewk_settings_private.h
index bef023f49ea61a80ff9efa2fd0b41d1e5dc23101..0b9cda04256e14da6cbaba3f007c925f6ed552f3 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/ewk_settings_private.h
+++ b/tizen_src/ewk/efl_integration/private/ewk_settings_private.h
@@ -141,7 +141,11 @@ class Ewk_Settings {
     bool m_createSelectMenuByClient = false;
     bool m_clipboardEnabled = false;
     bool m_imeHandleKeyEventEnabled = true;
+#if defined(SAMSUNG_NEXT_BROWSER)
+    Ewk_Ime_Style m_ime_style = IME_STYLE_DYNAMIC;
+#else
     Ewk_Ime_Style m_ime_style = IME_STYLE_FULL;
+#endif  // SAMSUNG_NEXT_BROWSER
 };
 
 #endif // ewk_settings_private_h

diff --git a/ui/base/ime/BUILD.gn b/ui/base/ime/BUILD.gn
index c4f67f14e97e51104b79d232d6b2bcf3ff1ec390..f870011cd7565ae01dccbc54f6dff1ab22cdef43 100644 (file)
--- a/ui/base/ime/BUILD.gn
+++ b/ui/base/ime/BUILD.gn
@@ -4,6 +4,7 @@
 
 import("//build/config/chromeos/ui_mode.gni")
 import("//build/config/ui.gni")
+import("//tizen_src/build/config/tizen_features.gni")
 
 source_set("text_input_types") {
   sources = [
@@ -85,6 +86,12 @@ component("ime") {
 
   defines = [ "IS_UI_BASE_IME_IMPL" ]
 
+  if (tizen_product_tv){
+    if(is_samsung_next_browser){
+      defines += [ "SAMSUNG_NEXT_BROWSER" ]
+      }
+  }
+
   public_deps = [
     ":ime_types",
     ":text_input_types",

diff --git a/ui/base/ime/linux/linux_input_method_context.h b/ui/base/ime/linux/linux_input_method_context.h
index cbe9e15e41c68beeebab08a9637714a329047b44..08c577a18af829dde6e3a175c2308d27bd0a9c3f 100644 (file)
--- a/ui/base/ime/linux/linux_input_method_context.h
+++ b/ui/base/ime/linux/linux_input_method_context.h
@@ -48,7 +48,11 @@ class COMPONENT_EXPORT(UI_BASE_IME_LINUX) LinuxInputMethodContext {
 #if BUILDFLAG(IS_TIZEN_TV)
     int password_input_minlength = -1;
     int input_maxlength = -1;
+#if defined(SAMSUNG_NEXT_BROWSER)
+    ImeStyle ime_style = ImeStyle::IME_STYLE_DYNAMIC;
+#else
     ImeStyle ime_style = ImeStyle::IME_STYLE_FULL;
+#endif  // SAMSUNG_NEXT_BROWSER
 #endif  // IS_TIZEN_TV
 #endif  // IS_EFL
   };

diff --git a/ui/base/ime/text_input_client.cc b/ui/base/ime/text_input_client.cc
index b49e5c49b1175c2b2ec3d851aa1854ea60b5c3f2..7aaddbdc39eabb3eead443964c1ff0e18cccbf2f 100644 (file)
--- a/ui/base/ime/text_input_client.cc
+++ b/ui/base/ime/text_input_client.cc
@@ -28,7 +28,11 @@ int TextInputClient::GetInputMaxLength() const {
 }
 
 ImeStyle TextInputClient::GetImeStyle() const {
+#if defined(SAMSUNG_NEXT_BROWSER)
+  return ImeStyle::IME_STYLE_DYNAMIC;
+#else
   return ImeStyle::IME_STYLE_FULL;
+#endif  // SAMSUNG_NEXT_BROWSER
 }
 #endif  // IS_TIZEN_TV
 #endif  // IS_EFL