commit 1232b1336a362554bd63f1a5dc8e280e32f9c7c6
author Asmita Poddar <asmitapoddar@google.com> Fri Mar 24 16:56:22 2023 +0000
committer Asmita Poddar <asmitapoddar@google.com> Wed Apr 12 13:12:22 2023 +0000
tree 4847c00381a21d6cfa520d73261b0efdd19d6100
parent d4aa7bb81a31d9478ef9b5259041d78d8f3a2e55

Remove InputManager#getInstance

Replace all instances of InputManager with instances of InputManagerGlobal.

Bug: b/267758905
Test: Pre-submit
Change-Id: I4d08ec51b544c2043e3b30aea98a4147f49056aa

bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java

diff --git a/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java b/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
index 3bef2fb..a0cf2b2 100644
--- a/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
+++ b/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
@@ -175,6 +175,7 @@
     private final ActivityManager mActivityManager;
     private final ConnectivityManager mConnectivityManager;
     private final AudioManager mAudioManager;
+    private final InputManager mInputManager;
     private final HashMap<View, Integer> mScrollYPos = new HashMap<>();
     private final HashMap<View, Integer> mScrollXPos = new HashMap<>();
 
@@ -267,6 +268,7 @@
         mActivityManager = ActivityManager_Accessor.getActivityManagerInstance(this);
         mConnectivityManager = new ConnectivityManager(this, null);
         mAudioManager = new AudioManager(this);
+        mInputManager = new InputManager(this);
 
         if (mLayoutlibCallback.isResourceNamespacingRequired()) {
             if (mLayoutlibCallback.hasAndroidXAppCompat()) {
@@ -686,7 +688,7 @@
                 return mAudioManager;
 
             case INPUT_SERVICE:
-                return InputManager.getInstance(this);
+                return mInputManager;
 
             case TEXT_CLASSIFICATION_SERVICE:
             case CONTENT_CAPTURE_MANAGER_SERVICE: