Bring all instance BindingAdapters into Component.

This also uses a non-arbitrary ordering for name clashes.

Bug 24407912

Change-Id: Ibd96adfb979af86370889acb7b60c1b6953b190d

2 files changed, 62 insertions, 0 deletions

diff --git a/integration-tests/TestApp/app/src/main/java/android/databinding/testapp/adapter/NameClashAdapter.java b/integration-tests/TestApp/app/src/main/java/android/databinding/testapp/adapter/NameClashAdapter.java
new file mode 100644
index 00000000..9435698b
--- /dev/null
+++ b/integration-tests/TestApp/app/src/main/java/android/databinding/testapp/adapter/NameClashAdapter.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.databinding.testapp.adapter;
+
+import android.databinding.BindingAdapter;
+import android.view.View;
+
+public class NameClashAdapter {
+    @BindingAdapter("gabble-babble")
+    public void setGabbleBabble(View view, String value) {
+    }
+
+    public static class MyAdapter {
+        @BindingAdapter({"gabble-babble-flabble", "booble-beeble-bee"})
+        public void setGabbleBabbleFlabble(View view, String value, String value2) {
+        }
+    }
+}
diff --git a/integration-tests/TestApp/app/src/main/java/android/databinding/testapp/adapter2/NameClashAdapter.java b/integration-tests/TestApp/app/src/main/java/android/databinding/testapp/adapter2/NameClashAdapter.java
new file mode 100644
index 00000000..53eb77b2
--- /dev/null
+++ b/integration-tests/TestApp/app/src/main/java/android/databinding/testapp/adapter2/NameClashAdapter.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.databinding.testapp.adapter2;
+
+import android.databinding.BindingAdapter;
+import android.view.View;
+
+public class NameClashAdapter {
+    @BindingAdapter("gooble-flooble")
+    public void setGoogleFlooble(View view, String value) {
+    }
+
+    public static class MyAdapter {
+        @BindingAdapter({"gooble-flooble-booble", "rumple-bumple-bum"})
+        public void setGoogleFloobleBooble(View view, String value, String value2) {
+        }
+    }
+}