kopia lustrzana https://github.com/ryukoposting/Signal-Android
Fix situation where two keyboards could be showing.
rodzic
6b55cd0128
commit
f5777d58fc
|
@ -108,7 +108,7 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateKeyboardState() {
|
private void updateKeyboardState() {
|
||||||
if (viewInset == 0 && Build.VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) viewInset = getViewInset();
|
if (viewInset == 0 && Build.VERSION.SDK_INT >= 21) viewInset = getViewInset();
|
||||||
|
|
||||||
getWindowVisibleDisplayFrame(rect);
|
getWindowVisibleDisplayFrame(rect);
|
||||||
|
|
||||||
|
@ -137,6 +137,7 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
|
||||||
if (Build.VERSION.SDK_INT >= 23 && getRootWindowInsets() != null) {
|
if (Build.VERSION.SDK_INT >= 23 && getRootWindowInsets() != null) {
|
||||||
int bottomInset;
|
int bottomInset;
|
||||||
WindowInsets windowInsets = getRootWindowInsets();
|
WindowInsets windowInsets = getRootWindowInsets();
|
||||||
|
|
||||||
if (Build.VERSION.SDK_INT >= 30) {
|
if (Build.VERSION.SDK_INT >= 30) {
|
||||||
bottomInset = windowInsets.getInsets(WindowInsets.Type.navigationBars()).bottom;
|
bottomInset = windowInsets.getInsets(WindowInsets.Type.navigationBars()).bottom;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -1169,6 +1169,9 @@ public class ConversationParentFragment extends Fragment
|
||||||
@Override
|
@Override
|
||||||
public void onKeyboardShown() {
|
public void onKeyboardShown() {
|
||||||
inputPanel.onKeyboardShown();
|
inputPanel.onKeyboardShown();
|
||||||
|
if (emojiDrawerStub.resolved() && emojiDrawerStub.get().isShowing()) {
|
||||||
|
emojiDrawerStub.get().hide(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Subscribe(threadMode = ThreadMode.MAIN)
|
@Subscribe(threadMode = ThreadMode.MAIN)
|
||||||
|
|
Ładowanie…
Reference in New Issue