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

Commit c43d13f4 authored by Gilles Debunne's avatar Gilles Debunne Committed by Android (Google) Code Review
Browse files

Merge "Removed XmlAdapters from frameworks." into honeycomb

parents df22d839 06335497

api/current.xml

+1 −1
Original line number Diff line number Diff line
@@ -258107,7 +258107,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="arg0" type="T">

<parameter name="t" type="T">

</parameter>

</method>

</interface>

core/java/android/widget/AbsListView.java

+0 −10
Original line number Diff line number Diff line
@@ -738,16 +738,6 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
        boolean smoothScrollbar = a.getBoolean(R.styleable.AbsListView_smoothScrollbar, true);

        setSmoothScrollbarEnabled(smoothScrollbar);



        final int adapterId = a.getResourceId(R.styleable.AbsListView_adapter, 0);

        if (adapterId != 0) {

            final Context c = context;

            post(new Runnable() {

                public void run() {

                    setAdapter(Adapters.loadAdapter(c, adapterId));

                }

            });

        }



        setChoiceMode(a.getInt(R.styleable.AbsListView_choiceMode, CHOICE_MODE_NONE));

        setFastScrollAlwaysVisible(

                a.getBoolean(R.styleable.AbsListView_fastScrollAlwaysVisible, false));

core/java/android/widget/Adapters.java

deleted100644 → 0
+0 −1235

File deleted.

Preview size limit exceeded, changes collapsed.

core/res/res/values/attrs.xml

+0 −71
Original line number Diff line number Diff line
@@ -2047,9 +2047,6 @@ 
             will use only the number of items in the adapter and the number of items visible

             on screen to determine the scrollbar's properties. -->

        <attr name="smoothScrollbar" format="boolean" />

        <!-- A reference to an XML description of the adapter to attach to the list.

             XXX Should remove? -->

        <attr name="adapter" format="reference" />

        <!-- Defines the choice behavior for the view. By default, lists do not have

             any choice behavior. By setting the choiceMode to singleChoice, the list

             allows up to one item to be in a chosen state. By setting the choiceMode to
@@ -4578,74 +4575,6 @@ 
        <attr name="settingsActivity" />

    </declare-styleable>



    <!-- =============================== -->

    <!-- Adapters attributes             -->

    <!-- =============================== -->

    <eat-comment />



    <!-- Adapter used to bind cursors.

         @hide XXX should remove? -->

    <declare-styleable name="CursorAdapter">

        <!-- URI to get the cursor from. Optional. -->

        <attr name="uri" format="string" />

        <!-- Selection statement for the query. Optional. -->

        <attr name="selection" format="string" />

        <!-- Sort order statement for the query. Optional. -->

        <attr name="sortOrder" format="string" />

        <!-- Layout resource used to display each row from the cursor. Mandatory. -->

        <attr name="layout" />

    </declare-styleable>



    <!-- Attributes used in bind items for XML cursor adapters.

         @hide XXX should remove? -->

    <declare-styleable name="CursorAdapter_BindItem">

        <!-- The name of the column to bind from. Mandatory. -->

        <attr name="from" format="string" />

        <!-- The resource id of the view to bind to. Mandatory. -->

        <attr name="to" format="reference" />

        <!-- The type of binding. If this value is not specified, the type will be

             inferred from the type of the "to" target view. Mandatory.



             The type can be one of:

             <ul>

             <li>string, The content of the column is interpreted as a string.</li>

             <li>image, The content of the column is interpreted as a blob describing an image.</li>

             <li>image-uri, The content of the column is interpreted as a URI to an image.</li>

             <li>drawable, The content of the column is interpreted as a resource id to a drawable.</li>

             <li>A fully qualified class name, corresponding to an implementation of

                 android.widget.Adapters.CursorBinder.</li>

             </ul>

         -->

        <attr name="as" format="string" />

    </declare-styleable>



    <!-- Attributes used in select items for XML cursor adapters.

         @hide XXX should remove? -->

    <declare-styleable name="CursorAdapter_SelectItem">

        <!-- The name of the column to select. Mandatory. -->

        <attr name="column" format="string" />

    </declare-styleable>



    <!-- Attributes used to map values to new values in XML cursor adapters' bind items.

         @hide XXX should remove? -->

    <declare-styleable name="CursorAdapter_MapItem">

        <!-- The original value from the column. Mandatory. -->

        <attr name="fromValue" format="string" />

        <!-- The new value from the column. Mandatory. -->

        <attr name="toValue" format="string" />

    </declare-styleable>



    <!-- Attributes used to map values to new values in XML cursor adapters' bind items.

         @hide XXX should remove? -->

    <declare-styleable name="CursorAdapter_TransformItem">

        <!-- The transformation expression. Mandatory if "withClass" is not specified. -->

        <attr name="withExpression" format="string" />

        <!-- The transformation class, an implementation of

             android.widget.Adapters.CursorTransformation. Mandatory if "withExpression"

             is not specified. -->

        <attr name="withClass" format="string" />

    </declare-styleable>



    <!-- Attributes used to style the Action Bar. -->

    <declare-styleable name="ActionBar">

        <!-- The type of navigation to use. -->