Simplifying hideKeyboardAsync method
Bug: 246000321 Test: Presubmit Change-Id: I2851c49b61b662d4a5b7cd0a863f690fd74a8bd0 Merged-In: I2851c49b61b662d4a5b7cd0a863f690fd74a8bd0
This commit is contained in:
1 parent
b64894b095
commit
8958a7078a
7 files changed
+61
-93
No files matched your search
@@ -15,24 +15,12 @@
|
||||
*/
|
||||
package com.android.launcher3.util;
|
||||
|
||||
import static com.android.launcher3.logging.KeyboardStateManager.KeyboardState.HIDE;
|
||||
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_KEYBOARD_CLOSED;
|
||||
import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
|
||||
|
||||
import android.annotation.SuppressLint;
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.os.IBinder;
|
||||
import android.os.Message;
|
||||
import android.view.View;
|
||||
import android.view.WindowInsets;
|
||||
import android.view.WindowInsetsController;
|
||||
import android.view.inputmethod.InputMethodManager;
|
||||
|
||||
import com.android.launcher3.Utilities;
|
||||
import com.android.launcher3.views.ActivityContext;
|
||||
|
||||
/**
|
||||
* Utility class for offloading some class from UI thread
|
||||
@@ -43,54 +31,8 @@ public class UiThreadHelper {
|
||||
new MainThreadInitializedObject<>(
|
||||
c -> new Handler(UI_HELPER_EXECUTOR.getLooper(), new UiCallbacks(c)));
|
||||
|
||||
private static final int MSG_HIDE_KEYBOARD = 1;
|
||||
private static final int MSG_SET_ORIENTATION = 2;
|
||||
private static final int MSG_RUN_COMMAND = 3;
|
||||
private static final String STATS_LOGGER_KEY = "STATS_LOGGER_KEY";
|
||||
|
||||
@SuppressLint("NewApi")
|
||||
public static void hideKeyboardAsync(ActivityContext activityContext, IBinder token) {
|
||||
View root = activityContext.getDragLayer();
|
||||
|
||||
if (Utilities.ATLEAST_R) {
|
||||
Preconditions.assertUIThread();
|
||||
// Hide keyboard with WindowInsetsController if could. In case
|
||||
// hideSoftInputFromWindow may get ignored by input connection being finished
|
||||
// when the screen is off.
|
||||
//
|
||||
// In addition, inside IMF, the keyboards are closed asynchronously that launcher no
|
||||
// longer need to post to the message queue.
|
||||
final WindowInsetsController wic = root.getWindowInsetsController();
|
||||
WindowInsets insets = root.getRootWindowInsets();
|
||||
boolean isImeShown = insets != null && insets.isVisible(WindowInsets.Type.ime());
|
||||
if (wic != null && isImeShown) {
|
||||
activityContext.getStatsLogManager().keyboardStateManager().setKeyboardState(HIDE);
|
||||
// this method cannot be called cross threads
|
||||
wic.hide(WindowInsets.Type.ime());
|
||||
activityContext.getStatsLogManager().logger()
|
||||
.log(LAUNCHER_ALLAPPS_KEYBOARD_CLOSED);
|
||||
return;
|
||||
}
|
||||
}
|
||||
// Since the launcher context cannot be accessed directly from callback, adding secondary
|
||||
// message to log keyboard close event asynchronously.
|
||||
Bundle mHideKeyboardLoggerMsg = new Bundle();
|
||||
mHideKeyboardLoggerMsg.putParcelable(
|
||||
STATS_LOGGER_KEY,
|
||||
Message.obtain(
|
||||
HANDLER.get(root.getContext()),
|
||||
() -> activityContext
|
||||
.getStatsLogManager()
|
||||
.logger()
|
||||
.log(LAUNCHER_ALLAPPS_KEYBOARD_CLOSED)
|
||||
)
|
||||
);
|
||||
|
||||
Message mHideKeyboardMsg = Message.obtain(HANDLER.get(root.getContext()), MSG_HIDE_KEYBOARD,
|
||||
token);
|
||||
mHideKeyboardMsg.setData(mHideKeyboardLoggerMsg);
|
||||
mHideKeyboardMsg.sendToTarget();
|
||||
}
|
||||
private static final int MSG_SET_ORIENTATION = 1;
|
||||
private static final int MSG_RUN_COMMAND = 2;
|
||||
|
||||
public static void setOrientationAsync(Activity activity, int orientation) {
|
||||
Message.obtain(HANDLER.get(activity), MSG_SET_ORIENTATION, orientation, 0, activity)
|
||||
@@ -109,23 +51,14 @@ public class UiThreadHelper {
|
||||
private static class UiCallbacks implements Handler.Callback {
|
||||
|
||||
private final Context mContext;
|
||||
private final InputMethodManager mIMM;
|
||||
|
||||
UiCallbacks(Context context) {
|
||||
mContext = context;
|
||||
mIMM = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean handleMessage(Message message) {
|
||||
switch (message.what) {
|
||||
case MSG_HIDE_KEYBOARD:
|
||||
if (mIMM.hideSoftInputFromWindow((IBinder) message.obj, 0)) {
|
||||
// log keyboard close event only when keyboard is actually closed
|
||||
((Message) message.getData().getParcelable(STATS_LOGGER_KEY))
|
||||
.sendToTarget();
|
||||
}
|
||||
return true;
|
||||
case MSG_SET_ORIENTATION:
|
||||
((Activity) message.obj).setRequestedOrientation(message.arg1);
|
||||
return true;
|
||||
|
||||
Reference in new issue
Block a user