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

Merge "Remove the dependency on IWindowManager from IMMS"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-10-08 04:08:14 +00:00
committed by Android (Google) Code Review
parent c927d14cda 24ab9e18a7
commit 65ff129f27
3 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
View File

@@ -126,7 +126,6 @@ import android.util.SparseArray;
import android.util.SparseBooleanArray;
import android.util.proto.ProtoOutputStream;
import android.view.DisplayInfo;
import android.view.IWindowManager;
import android.view.InputChannel;
import android.view.InputDevice;
import android.view.MotionEvent;
@@ -289,7 +288,6 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
private final Handler mHandler;
final InputMethodSettings mSettings;
final SettingsObserver mSettingsObserver;
final IWindowManager mIWindowManager;
private final SparseBooleanArray mLoggedDeniedGetInputMethodWindowVisibleHeightForUid =
new SparseBooleanArray(0);
final WindowManagerInternal mWindowManagerInternal;
@@ -1715,8 +1713,6 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
mHandler = Handler.createAsync(thread.getLooper(), this);
// Note: SettingsObserver doesn't register observers in its constructor.
mSettingsObserver = new SettingsObserver(mHandler);
mIWindowManager = IWindowManager.Stub.asInterface(
ServiceManager.getService(Context.WINDOW_SERVICE));
mWindowManagerInternal = LocalServices.getService(WindowManagerInternal.class);
mActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class);
mPackageManagerInternal = LocalServices.getService(PackageManagerInternal.class);
@@ -3160,19 +3156,16 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
mImeSwitcherNotification.setContentTitle(title)
.setContentText(summary)
.setContentIntent(mImeSwitchPendingIntent);
try {
// TODO(b/120076400): Figure out what is the best behavior
if ((mNotificationManager != null)
&& !mIWindowManager.hasNavigationBar(DEFAULT_DISPLAY)) {
if (DEBUG) {
Slog.d(TAG, "--- show notification: label = " + summary);
}
mNotificationManager.notifyAsUser(null,
SystemMessage.NOTE_SELECT_INPUT_METHOD,
mImeSwitcherNotification.build(), UserHandle.ALL);
mNotificationShown = true;
// TODO(b/120076400): Figure out what is the best behavior
if ((mNotificationManager != null)
&& !mWindowManagerInternal.hasNavigationBar(DEFAULT_DISPLAY)) {
if (DEBUG) {
Slog.d(TAG, "--- show notification: label = " + summary);
}
} catch (RemoteException e) {
mNotificationManager.notifyAsUser(null,
SystemMessage.NOTE_SELECT_INPUT_METHOD,
mImeSwitcherNotification.build(), UserHandle.ALL);
mNotificationShown = true;
}
} else {
if (mNotificationShown && mNotificationManager != null) {

9
services/core/java/com/android/server/wm/WindowManagerInternal.java
View File

@@ -602,6 +602,15 @@ public abstract class WindowManagerInternal {
public abstract void updateInputMethodTargetWindow(@NonNull IBinder imeToken,
@NonNull IBinder imeTargetWindowToken);
/**
* Returns the presence of a software navigation bar on the specified display.
*
* @param displayId the id of display to check if there is a software navigation bar.
* @return {@code true} if there is a software navigation. {@code false} otherwise, including
* the case when the specified display does not exist.
*/
public abstract boolean hasNavigationBar(int displayId);
/**
* Returns true when the hardware keyboard is available.
*/

5
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -7910,6 +7910,11 @@ public class WindowManagerService extends IWindowManager.Stub
}
}
@Override
public boolean hasNavigationBar(int displayId) {
return WindowManagerService.this.hasNavigationBar(displayId);
}
@Override
public boolean isHardKeyboardAvailable() {
synchronized (mGlobalLock) {