commit 14e066df1ca863667c6c6d745ad61bb07ac5082c
author Romain Guy <romainguy@google.com> Wed Jan 09 20:18:06 2013 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 09 20:18:35 2013 -0800
tree 62de69e6704a4b767fdabfbbe989c4b486ef897a
parent 91893471ba844287432db4473a15faf902889607
parent 9c5d1b17bfae81c282cec8954e66963c86c81438

Merge "Clarify javadoc and parameter names Bug #7978741"

core/java/android/widget/ArrayAdapter.java

diff --git a/core/java/android/widget/ArrayAdapter.java b/core/java/android/widget/ArrayAdapter.java
index 44f04db..97926a7 100644
--- a/core/java/android/widget/ArrayAdapter.java
+++ b/core/java/android/widget/ArrayAdapter.java
@@ -97,11 +97,11 @@
      * Constructor
      *
      * @param context The current context.
-     * @param textViewResourceId The resource ID for a layout file containing a TextView to use when
+     * @param resource The resource ID for a layout file containing a TextView to use when
      *                 instantiating views.
      */
-    public ArrayAdapter(Context context, int textViewResourceId) {
-        init(context, textViewResourceId, 0, new ArrayList<T>());
+    public ArrayAdapter(Context context, int resource) {
+        init(context, resource, 0, new ArrayList<T>());
     }
 
     /**
@@ -120,12 +120,12 @@
      * Constructor
      *
      * @param context The current context.
-     * @param textViewResourceId The resource ID for a layout file containing a TextView to use when
+     * @param resource The resource ID for a layout file containing a TextView to use when
      *                 instantiating views.
      * @param objects The objects to represent in the ListView.
      */
-    public ArrayAdapter(Context context, int textViewResourceId, T[] objects) {
-        init(context, textViewResourceId, 0, Arrays.asList(objects));
+    public ArrayAdapter(Context context, int resource, T[] objects) {
+        init(context, resource, 0, Arrays.asList(objects));
     }
 
     /**
@@ -145,12 +145,12 @@
      * Constructor
      *
      * @param context The current context.
-     * @param textViewResourceId The resource ID for a layout file containing a TextView to use when
+     * @param resource The resource ID for a layout file containing a TextView to use when
      *                 instantiating views.
      * @param objects The objects to represent in the ListView.
      */
-    public ArrayAdapter(Context context, int textViewResourceId, List<T> objects) {
-        init(context, textViewResourceId, 0, objects);
+    public ArrayAdapter(Context context, int resource, List<T> objects) {
+        init(context, resource, 0, objects);
     }
 
     /**