diff options
| author | Asmita Poddar <asmitapoddar@google.com> | 2023-03-03 18:24:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-03 18:24:45 +0000 |
| commit | 92bf4e3de2c0305a8e59f120b4b48469ba1fec52 (patch) | |
| tree | 803fe9d899d0836053bee1bf7f125a151478f522 | |
| parent | 83510f4413ac8e17fe43062d0398802354ec9e13 (diff) | |
| parent | 64c5f0af1df5b70c39010fec9ed566f5430056e3 (diff) | |
| download | layoutlib-92bf4e3de2c0305a8e59f120b4b48469ba1fec52.tar.gz | |
Add support for InputManagerGlobal am: 64c5f0af1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/layoutlib/+/21706120
Change-Id: I41024d276465a60831d674557c22be48d84fe062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | bridge/src/com/android/layoutlib/bridge/Bridge.java | 5 | ||||
| -rw-r--r-- | create/src/com/android/tools/layoutlib/create/CreateInfo.java | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/bridge/src/com/android/layoutlib/bridge/Bridge.java b/bridge/src/com/android/layoutlib/bridge/Bridge.java index 6e8e34301e..3c62193dad 100644 --- a/bridge/src/com/android/layoutlib/bridge/Bridge.java +++ b/bridge/src/com/android/layoutlib/bridge/Bridge.java @@ -48,6 +48,7 @@ import android.graphics.Typeface; import android.graphics.fonts.SystemFonts_Delegate; import android.hardware.input.IInputManager; import android.hardware.input.InputManager; +import android.hardware.input.InputManagerGlobal; import android.icu.util.ULocale; import android.os.Looper; import android.os.Looper_Accessor; @@ -760,8 +761,8 @@ public final class Bridge extends com.android.ide.common.rendering.api.Bridge { for (InputDevice device : devices) { idToDevice.append(device.getId(), device); } - InputManager.sInstance = new InputManager(new IInputManager.Default() { - @Override + InputManagerGlobal.sInstance = new InputManagerGlobal(new IInputManager.Default() { + @Override public int[] getInputDeviceIds() { return ids; } diff --git a/create/src/com/android/tools/layoutlib/create/CreateInfo.java b/create/src/com/android/tools/layoutlib/create/CreateInfo.java index 8d93de1338..fb50c46ff1 100644 --- a/create/src/com/android/tools/layoutlib/create/CreateInfo.java +++ b/create/src/com/android/tools/layoutlib/create/CreateInfo.java @@ -327,7 +327,7 @@ public final class CreateInfo implements ICreateInfo { "android.graphics.drawable.AnimatedVectorDrawable$VectorDrawableAnimatorRT#mPendingAnimationActions", "android.graphics.drawable.AnimatedVectorDrawable#mAnimatorSet", "android.graphics.drawable.DrawableInflater#mRes", - "android.hardware.input.InputManager#sInstance", + "android.hardware.input.InputManagerGlobal#sInstance", "android.view.Choreographer#mCallbackQueues", // required for tests only "android.view.Choreographer$CallbackQueue#mHead", // required for tests only "android.view.ViewRootImpl#mTmpFrames", @@ -344,7 +344,7 @@ public final class CreateInfo implements ICreateInfo { "android.graphics.Bitmap#setNinePatchChunk", "android.graphics.Path#nInit", "android.graphics.Typeface$Builder#createAssetUid", - "android.hardware.input.InputManager#<init>", + "android.hardware.input.InputManagerGlobal#<init>", "android.media.ImageReader#nativeClassInit", "android.view.Choreographer#doFrame", "android.view.Choreographer#postCallbackDelayedInternal", |