Commit 78c473c9 authored by Tetsui Ohkubo's avatar Tetsui Ohkubo Committed by Commit Bot

Revert "Implement ArcImeService::EnsureCaretNotInRect."

This reverts commit 10fa9630.

Reason for revert: Split view regression http://b/138674508

Original change's description:
> Implement ArcImeService::EnsureCaretNotInRect.
> 
> It's left as unimplemented because Android WM handles insets by VK for
> most cases.
> However, Android WM can't move the SystemTray up for inline-reply in an
> Android notification because from Android WM's point of view,
> notificaiton is placed at (0, 0).
> This CL implements ArcImeService::EnsureCaretNotInRect to cover that
> case.
> This CL changes the behavior of windowed Android app with a11y keyboard.
> Before this CL, a position of a window is not changed by a11y keyboard
> visibility, but after this CL a position can be changed not to be
> covered by a11y keyboard.
> 
>       SystemTray moves up if there is a space for it.
> 
> Bug: b/114115612
> Test: manual - Focus on inline reply of an Android notificatioln and
> Change-Id: Ib666b6c269a8fc36195d30affa4c7a8a805560d7
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1631859
> Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
> Reviewed-by: Tetsui Ohkubo <tetsui@chromium.org>
> Commit-Queue: Yuichiro Hanada <yhanada@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#664583}

TBR=sadrul@chromium.org,yhanada@chromium.org,tetsui@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

BUG=b:114115612
BUG=b:138674508

Change-Id: Ic614e72899dbd9efb7317bdecd33f540e5b85452
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1777461Reviewed-by: default avatarTetsui Ohkubo <tetsui@chromium.org>
Reviewed-by: default avatarYuichiro Hanada <yhanada@chromium.org>
Commit-Queue: Tetsui Ohkubo <tetsui@chromium.org>
Cr-Commit-Position: refs/heads/master@{#692390}
parent 78591f12
...@@ -7,5 +7,4 @@ include_rules = [ ...@@ -7,5 +7,4 @@ include_rules = [
"+ui/gfx/geometry", "+ui/gfx/geometry",
# Revisit this dependency when crbug.com/890403 is resovled. # Revisit this dependency when crbug.com/890403 is resovled.
"+ui/views", "+ui/views",
"+ui/wm",
] ]
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include "ui/gfx/range/range.h" #include "ui/gfx/range/range.h"
#include "ui/views/widget/widget.h" #include "ui/views/widget/widget.h"
#include "ui/views/window/non_client_view.h" #include "ui/views/window/non_client_view.h"
#include "ui/wm/core/ime_util_chromeos.h"
namespace arc { namespace arc {
...@@ -497,13 +496,6 @@ bool ArcImeService::GetTextFromRange(const gfx::Range& range, ...@@ -497,13 +496,6 @@ bool ArcImeService::GetTextFromRange(const gfx::Range& range,
return true; return true;
} }
void ArcImeService::EnsureCaretNotInRect(const gfx::Rect& rect_in_screen) {
if (focused_arc_window_ == nullptr)
return;
aura::Window* top_level_window = focused_arc_window_->GetToplevelWindow();
wm::EnsureWindowNotInRect(top_level_window, rect_in_screen);
}
ui::TextInputMode ArcImeService::GetTextInputMode() const { ui::TextInputMode ArcImeService::GetTextInputMode() const {
return ui::TEXT_INPUT_MODE_DEFAULT; return ui::TEXT_INPUT_MODE_DEFAULT;
} }
......
...@@ -122,7 +122,6 @@ class ArcImeService : public KeyedService, ...@@ -122,7 +122,6 @@ class ArcImeService : public KeyedService,
bool GetEditableSelectionRange(gfx::Range* range) const override; bool GetEditableSelectionRange(gfx::Range* range) const override;
bool GetTextFromRange(const gfx::Range& range, bool GetTextFromRange(const gfx::Range& range,
base::string16* text) const override; base::string16* text) const override;
void EnsureCaretNotInRect(const gfx::Rect& rect) override;
// Overridden from ui::TextInputClient (with default implementation): // Overridden from ui::TextInputClient (with default implementation):
// TODO(kinaba): Support each of these methods to the extent possible in // TODO(kinaba): Support each of these methods to the extent possible in
...@@ -142,6 +141,7 @@ class ArcImeService : public KeyedService, ...@@ -142,6 +141,7 @@ class ArcImeService : public KeyedService,
bool ChangeTextDirectionAndLayoutAlignment( bool ChangeTextDirectionAndLayoutAlignment(
base::i18n::TextDirection direction) override; base::i18n::TextDirection direction) override;
void ExtendSelectionAndDelete(size_t before, size_t after) override; void ExtendSelectionAndDelete(size_t before, size_t after) override;
void EnsureCaretNotInRect(const gfx::Rect& rect) override {}
bool IsTextEditCommandEnabled(ui::TextEditCommand command) const override; bool IsTextEditCommandEnabled(ui::TextEditCommand command) const override;
void SetTextEditCommandForNextKeyEvent(ui::TextEditCommand command) override { void SetTextEditCommandForNextKeyEvent(ui::TextEditCommand command) override {
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment