From 327fbd2c8fa294b919475feb4c74a74ee1981e02 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Mon, 17 Jan 2011 14:38:50 -0800
Subject: Fix a bunch of API review bugs.

3362464 API REVIEW: android.content potpourri
3362445 API REVIEW: Fragment transaction stuff
3362428 API REVIEW: Fragment stuff
3362418 API REVIEW: Loader stuff
3362414 API REVIEW: android.content.pm.ActivityInfo

Change-Id: I6475421a4735759b458acb67df4380cc6234f147
---
 core/java/android/widget/TextView.java | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'core/java/android/widget/TextView.java')

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 623cd4180c3d..de886d8019de 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -7942,7 +7942,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
                     for (int i=0; i<urls.length; i++) {
                         Uri uri = Uri.parse(urls[0].getURL());
                         if (clip == null) {
-                            clip = ClipData.newRawUri(null, null, uri);
+                            clip = ClipData.newRawUri(null, uri);
                         } else {
                             clip.addItem(new ClipData.Item(uri));
                         }
@@ -7976,15 +7976,13 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
                 return true;
 
             case ID_CUT:
-                setPrimaryClip(ClipData.newPlainText(null, null,
-                        mTransformed.subSequence(min, max)));
+                setPrimaryClip(ClipData.newPlainText(null, mTransformed.subSequence(min, max)));
                 ((Editable) mText).delete(min, max);
                 stopSelectionActionMode();
                 return true;
 
             case ID_COPY:
-                setPrimaryClip(ClipData.newPlainText(null, null,
-                        mTransformed.subSequence(min, max)));
+                setPrimaryClip(ClipData.newPlainText(null, mTransformed.subSequence(min, max)));
                 stopSelectionActionMode();
                 return true;
         }
@@ -8105,7 +8103,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
                 final int start = getSelectionStart();
                 final int end = getSelectionEnd();
                 CharSequence selectedText = mTransformed.subSequence(start, end);
-                ClipData data = ClipData.newPlainText(null, null, selectedText);
+                ClipData data = ClipData.newPlainText(null, selectedText);
                 DragLocalState localState = new DragLocalState(this, start, end);
                 startDrag(data, getTextThumbnailBuilder(selectedText), localState, 0);
                 stopSelectionActionMode();
@@ -8257,7 +8255,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
         if (clip != null) {
             boolean didfirst = false;
             for (int i=0; i<clip.getItemCount(); i++) {
-                CharSequence paste = clip.getItem(i).coerceToText(getContext());
+                CharSequence paste = clip.getItemAt(i).coerceToText(getContext());
                 if (paste != null) {
                     if (!didfirst) {
                         long minMax = prepareSpacesAroundPaste(min, max, paste);
@@ -9300,7 +9298,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
         ClipData clipData = event.getClipData();
         final int itemCount = clipData.getItemCount();
         for (int i=0; i < itemCount; i++) {
-            Item item = clipData.getItem(i);
+            Item item = clipData.getItemAt(i);
             content.append(item.coerceToText(TextView.this.mContext));
         }
 
-- 
cgit v1.2.3