Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide the keyboard when remote input hides." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-15 16:35:20 +00:00
committed by Android (Google) Code Review
parent 6a84070852 b13ce85b5b
commit 7900e98494
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputController.java
View File

@@ -131,7 +131,7 @@ public class RemoteInputController {
*/ */
public void removeRemoteInput(NotificationEntry entry, Object token) { public void removeRemoteInput(NotificationEntry entry, Object token) {
Objects.requireNonNull(entry); Objects.requireNonNull(entry);
if (entry.mRemoteEditImeVisible) return; if (entry.mRemoteEditImeVisible && entry.mRemoteEditImeAnimatingAway) return;
// If the view is being removed, this may be called even though we're not active // If the view is being removed, this may be called even though we're not active
if (!isRemoteInputActive(entry)) return; if (!isRemoteInputActive(entry)) return;

1
packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java
View File

@@ -183,6 +183,7 @@ public final class NotificationEntry extends ListEntry {
private boolean mIsMarkedForUserTriggeredMovement; private boolean mIsMarkedForUserTriggeredMovement;
private boolean mIsAlerting; private boolean mIsAlerting;
public boolean mRemoteEditImeAnimatingAway;
public boolean mRemoteEditImeVisible; public boolean mRemoteEditImeVisible;
private boolean mExpandAnimationRunning; private boolean mExpandAnimationRunning;

2
packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
View File

@@ -272,6 +272,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
public void onEnd(@NonNull WindowInsetsAnimation animation) { public void onEnd(@NonNull WindowInsetsAnimation animation) {
super.onEnd(animation); super.onEnd(animation);
if (animation.getTypeMask() == WindowInsets.Type.ime()) { if (animation.getTypeMask() == WindowInsets.Type.ime()) {
mEntry.mRemoteEditImeAnimatingAway = false;
mEntry.mRemoteEditImeVisible = mEntry.mRemoteEditImeVisible =
mEditText.getRootWindowInsets().isVisible(WindowInsets.Type.ime()); mEditText.getRootWindowInsets().isVisible(WindowInsets.Type.ime());
if (!mEntry.mRemoteEditImeVisible && !mEditText.mShowImeOnInputConnection) { if (!mEntry.mRemoteEditImeVisible && !mEditText.mShowImeOnInputConnection) {
@@ -392,6 +393,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
mSendButton.setVisibility(INVISIBLE); mSendButton.setVisibility(INVISIBLE);
mProgressBar.setVisibility(VISIBLE); mProgressBar.setVisibility(VISIBLE);
mEntry.lastRemoteInputSent = SystemClock.elapsedRealtime(); mEntry.lastRemoteInputSent = SystemClock.elapsedRealtime();
mEntry.mRemoteEditImeAnimatingAway = true;
mController.addSpinning(mEntry.getKey(), mToken); mController.addSpinning(mEntry.getKey(), mToken);
mController.removeRemoteInput(mEntry, mToken); mController.removeRemoteInput(mEntry, mToken);
mEditText.mShowImeOnInputConnection = false; mEditText.mShowImeOnInputConnection = false;