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

Commit 49f8a826 authored by George Mount's avatar George Mount
Browse files

Made expressions prefix with "@"

parent 99dfc75d

tools/data-binding/TestApp/src/main/res/layout-land/multi_res_layout.xml

+7 −7
Original line number Diff line number Diff line
@@ -20,22 +20,22 @@ 
    <variable name="objectInLand" type="com.android.databinding.testapp.vo.NotBindableVo"/>

    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"

              android:id="@+id/objectInLandTextView"

              android:text="{objectInLand.stringValue}"/>

              android:text="@{objectInLand.stringValue}"/>

    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"

              android:id="@+id/objectInDefaultTextView"

              android:text="{objectInDefault.stringValue}"/>

              android:text="@{objectInDefault.stringValue}"/>

    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"

              android:id="@+id/objectInDefaultTextView2"

              android:text="{objectInDefault.stringValue}"/>

              android:text="@{objectInDefault.stringValue}"/>



    <include layout="@layout/included_layout" android:id="@+id/includedLayoutConflict"

             bind:innerObject="{objectInLand}"

             bind:innerValue="{`modified ` + objectInLand.intValue}"

             bind:innerObject="@{objectInLand}"

             bind:innerValue="@{`modified ` + objectInLand.intValue}"

            />

    <include layout="@layout/basic_binding" android:id="@+id/includedLayoutShared"

             bind:a="{objectInDefault.stringValue}"

             bind:a="@{objectInDefault.stringValue}"

            />

    <include layout="@layout/conditional_binding" android:id="@+id/includedLayoutLand"

             bind:obj2="{objectInDefault}"

             bind:obj2="@{objectInDefault}"

            />

</LinearLayout>
 
 No newline at end of file

tools/data-binding/TestApp/src/main/res/layout/abs_list_view_adapter_test.xml

+3 −3
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@ 
          android:id="@+id/view"

          android:layout_width="match_parent"

          android:layout_height="match_parent"

          android:listSelector="{obj.listSelector}"

          android:scrollingCache="{obj.scrollingCache}"

          android:smoothScrollbar="{obj.smoothScrollbar}"

          android:listSelector="@{obj.listSelector}"

          android:scrollingCache="@{obj.scrollingCache}"

          android:smoothScrollbar="@{obj.smoothScrollbar}"

        >

    <variable name="obj" type="com.android.databinding.testapp.vo.AbsListViewBindingObject"/>

</ListView>
 
 No newline at end of file

tools/data-binding/TestApp/src/main/res/layout/abs_seek_bar_adapter_test.xml

+1 −1
Original line number Diff line number Diff line
@@ -6,5 +6,5 @@ 
    <variable name="obj" type="com.android.databinding.testapp.vo.AbsSeekBarBindingObject"/>

    <SeekBar android:layout_width="match_parent" android:layout_height="match_parent"

             android:id="@+id/view"

             android:thumbTint="{obj.thumbTint}"/>

             android:thumbTint="@{obj.thumbTint}"/>

</LinearLayout>
 
 No newline at end of file

tools/data-binding/TestApp/src/main/res/layout/abs_spinner_adapter_test.xml

+1 −1
Original line number Diff line number Diff line
@@ -6,5 +6,5 @@ 
    <variable name="obj" type="com.android.databinding.testapp.vo.AbsSpinnerBindingObject"/>

    <Spinner android:layout_width="match_parent" android:layout_height="match_parent"

             android:id="@+id/view"

            android:entries="{obj.entries}"/>

            android:entries="@{obj.entries}"/>

</LinearLayout>
 
 No newline at end of file

tools/data-binding/TestApp/src/main/res/layout/auto_complete_text_view_adapter_test.xml

+2 −2
Original line number Diff line number Diff line
@@ -6,6 +6,6 @@ 
    <variable name="obj" type="com.android.databinding.testapp.vo.AutoCompleteTextViewBindingObject"/>

    <AutoCompleteTextView android:layout_width="match_parent" android:layout_height="match_parent"

                          android:id="@+id/view"

                          android:completionThreshold="{obj.completionThreshold}"

                          android:popupBackground="{obj.popupBackground}"/>

                          android:completionThreshold="@{obj.completionThreshold}"

                          android:popupBackground="@{obj.popupBackground}"/>

</LinearLayout>
 
 No newline at end of file