diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-21 02:05:18 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-21 02:05:18 +0000 |
| commit | 95bea9bd3e78a5755ca6ba53aa15df00a6a61719 (patch) | |
| tree | 906203a25e387b62b0e2ecc649f1d19323beca55 | |
| parent | ba031bc9620935158c21d77f13d956c3a2880940 (diff) | |
| parent | 5e5a2aff8d5d4ce6dd8fb755d16087b3a098b4d1 (diff) | |
| download | layoutlib-95bea9bd3e78a5755ca6ba53aa15df00a6a61719.tar.gz | |
Snap for 6516196 from 5e5a2aff8d5d4ce6dd8fb755d16087b3a098b4d1 to rvc-d1-release
Change-Id: Ia880ae6dc8184d8f96359146b4d625467df6b63f
4 files changed, 0 insertions, 23 deletions
diff --git a/bridge/tests/src/com/android/layoutlib/bridge/intensive/setup/LayoutLibTestCallback.java b/bridge/tests/src/com/android/layoutlib/bridge/intensive/setup/LayoutLibTestCallback.java index bbe9d3c895..a6389acfde 100644 --- a/bridge/tests/src/com/android/layoutlib/bridge/intensive/setup/LayoutLibTestCallback.java +++ b/bridge/tests/src/com/android/layoutlib/bridge/intensive/setup/LayoutLibTestCallback.java @@ -108,13 +108,6 @@ public class LayoutLibTestCallback extends LayoutlibCallback { return viewConstructor.newInstance(constructorArgs); } - @NonNull - @Override - public String getNamespace() { - return String.format(SdkConstants.NS_CUSTOM_RESOURCES_S, - PACKAGE_NAME); - } - @Override public ResourceReference resolveResourceId(int id) { return mProjectResources.get(id); diff --git a/remote/client/src/com/android/layoutlib/bridge/remote/client/adapters/RemoteLayoutlibCallbackAdapter.java b/remote/client/src/com/android/layoutlib/bridge/remote/client/adapters/RemoteLayoutlibCallbackAdapter.java index f796f3d958..01efd1224d 100644 --- a/remote/client/src/com/android/layoutlib/bridge/remote/client/adapters/RemoteLayoutlibCallbackAdapter.java +++ b/remote/client/src/com/android/layoutlib/bridge/remote/client/adapters/RemoteLayoutlibCallbackAdapter.java @@ -56,11 +56,6 @@ public class RemoteLayoutlibCallbackAdapter implements RemoteLayoutlibCallback { } @Override - public String getNamespace() { - return mDelegate.getNamespace(); - } - - @Override public ResourceReference resolveResourceId(int id) { return mDelegate.resolveResourceId(id); } diff --git a/remote/common/src/com/android/layout/remote/api/RemoteLayoutlibCallback.java b/remote/common/src/com/android/layout/remote/api/RemoteLayoutlibCallback.java index c8d2ded0c5..d68934ae65 100644 --- a/remote/common/src/com/android/layout/remote/api/RemoteLayoutlibCallback.java +++ b/remote/common/src/com/android/layout/remote/api/RemoteLayoutlibCallback.java @@ -34,8 +34,6 @@ public interface RemoteLayoutlibCallback extends Remote { Object loadView(String name, Class[] constructorSignature, Object[] constructorArgs) throws Exception; - String getNamespace() throws RemoteException; - ResourceReference resolveResourceId(int id) throws RemoteException; int getOrGenerateResourceId(ResourceReference resource) throws RemoteException; diff --git a/remote/server/src/com/android/layoutlib/bridge/remote/server/adapters/RemoteLayoutlibCallbackAdapter.java b/remote/server/src/com/android/layoutlib/bridge/remote/server/adapters/RemoteLayoutlibCallbackAdapter.java index 51772e7b02..719de4dcd3 100644 --- a/remote/server/src/com/android/layoutlib/bridge/remote/server/adapters/RemoteLayoutlibCallbackAdapter.java +++ b/remote/server/src/com/android/layoutlib/bridge/remote/server/adapters/RemoteLayoutlibCallbackAdapter.java @@ -157,15 +157,6 @@ public class RemoteLayoutlibCallbackAdapter extends LayoutlibCallback { } @Override - public String getNamespace() { - try { - return mDelegate.getNamespace(); - } catch (RemoteException e) { - throw new RuntimeException(e); - } - } - - @Override public ResourceReference resolveResourceId(int id) { try { return mDelegate.resolveResourceId(id); |