Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53a6b1bd authored by George Mount's avatar George Mount
Browse files

Change "generated" to "databinding"

parent a02e4c6c

tools/data-binding/compiler/src/main/java/android/databinding/tool/LayoutBinder.java

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public class LayoutBinder { 
        mBundle = layoutBundle;

        mProjectPackage = resourceBundle.getAppPackage();

        mModulePackage = layoutBundle.getModulePackage();

        mPackage = layoutBundle.getModulePackage() + ".generated";

        mPackage = layoutBundle.getModulePackage() + ".databinding";

        mBaseClassName = ParserHelper.INSTANCE$.toClassName(layoutBundle.getFileName()) + "Binding";

        // copy over data.

        for (Map.Entry<String, String> variable : mBundle.getVariables().entrySet()) {

tools/data-binding/compiler/src/main/java/android/databinding/tool/store/LayoutFileParser.java

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ public class LayoutFileParser { 
                // if user is binding something there, there MUST be a layout file to be

                // generated.

                String layoutName = includeValue.substring(LAYOUT_PREFIX.length());

                className = pkg + ".generated." +

                className = pkg + ".databinding." +

                        ParserHelper.INSTANCE$.toClassName(layoutName) + "Binding";

                includedLayoutName = layoutName;

            } else {

tools/data-binding/extensions/baseAdapters/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ android.libraryVariants.all { variant -> 
    def packageName = "com.android.databinding.library.baseAdapters"

    def appPkgAsClass = packageName.replace('.', '/')

    task.exclude("android/databinding/layouts/*.*")

    task.exclude("$appPkgAsClass/generated/*")

    task.exclude("$appPkgAsClass/databinding/*")

    task.exclude("$appPkgAsClass/BR.*")

    artifacts.add('jarArchives', task);

}

tools/data-binding/gradlePlugin/src/main/kotlin/plugin.kt

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ class DataBinderPlugin : Plugin<Project> { 
            val excludePattern = "android/databinding/layouts/*.*"

            val appPkgAsClass = packageName.replace('.', '/')

            packageTask.exclude(excludePattern)

            packageTask.exclude("$appPkgAsClass/generated/*")

            packageTask.exclude("$appPkgAsClass/databinding/*")

            packageTask.exclude("$appPkgAsClass/BR.*")

            packageTask.exclude(xmlProcessor.getInfoClassFullName().replace('.', '/') + ".class")

            log("excludes ${packageTask.getExcludes()}")

tools/data-binding/integration-tests/IndependentLibrary/app/src/main/java/android/databinding/test/independentlibrary/LibraryActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.app.Activity; 
import android.os.Bundle;



import android.databinding.test.independentlibrary.vo.MyBindableObject;

import android.databinding.test.independentlibrary.generated.LibraryLayoutBinding;

import android.databinding.test.independentlibrary.databinding.LibraryLayoutBinding;

public class LibraryActivity extends Activity {

    public static final String FIELD_VALUE = "BAR";

    @Override