diff --git a/app/src/main/java/com/osfans/trime/ime/core/Trime.java b/app/src/main/java/com/osfans/trime/ime/core/Trime.java index 95141a0eb9..674430c651 100644 --- a/app/src/main/java/com/osfans/trime/ime/core/Trime.java +++ b/app/src/main/java/com/osfans/trime/ime/core/Trime.java @@ -330,6 +330,7 @@ public void selectLiquidKeyboard(final int tabIndex) { mTabRoot.setBackground(mCandidateRoot.getBackground()); mTabRoot.move(tabView.getHightlightLeft(), tabView.getHightlightRight()); } + showLiquidKeyboardToolbar(); } else { symbolKeyboardType = SymbolKeyboardType.NO_KEY; // 设置液体键盘处于隐藏状态 @@ -1109,8 +1110,7 @@ public int updateComposing() { Timber.d("updateComposing() SymbolKeyboardType=%s", symbolKeyboardType.toString()); if (symbolKeyboardType != SymbolKeyboardType.NO_KEY && symbolKeyboardType != SymbolKeyboardType.CANDIDATE) { - mComposition.setWindow(); - showCompositionView(false); + showLiquidKeyboardToolbar(); } else { mComposition.setVisibility(View.VISIBLE); startNum = mComposition.setWindow(minPopupSize, minPopupCheckSize, Integer.MAX_VALUE); @@ -1133,6 +1133,11 @@ public int updateComposing() { return startNum; } + private void showLiquidKeyboardToolbar() { + mComposition.changeToLiquidKeyboardToolbar(); + showCompositionView(false); + } + public void showDialogAboveInputView(@NonNull final Dialog dialog) { final IBinder token = inputRootBinding.inputRoot.getWindowToken(); final Window window = dialog.getWindow(); diff --git a/app/src/main/java/com/osfans/trime/ime/text/Composition.java b/app/src/main/java/com/osfans/trime/ime/text/Composition.java index 58fc7112f3..98a37a7a13 100644 --- a/app/src/main/java/com/osfans/trime/ime/text/Composition.java +++ b/app/src/main/java/com/osfans/trime/ime/text/Composition.java @@ -581,7 +581,7 @@ else if (m.containsKey("candidate")) { } /** 设置悬浮窗, 用于liquidKeyboard的悬浮窗工具栏 */ - public void setWindow() { + public void changeToLiquidKeyboardToolbar() { if (getVisibility() != View.VISIBLE) return; if (liquid_keyboard_window_comp.isEmpty()) { this.setVisibility(GONE);