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

Commit 27113f86 authored by Gilles Debunne's avatar Gilles Debunne
Browse files

Merge conflict due to wrong import paths.

Change-Id: I3bba20b26036de53b29bb0b30885fe33832ba3e3
parent 6c32677d
Loading
Loading
Loading
Loading
+10 −6
Original line number Diff line number Diff line
@@ -18,8 +18,11 @@ package android.widget;

import com.android.internal.util.FastMath;
import com.android.internal.widget.EditableInputConnection;
import com.example.android.apis.text.Marquee;

import org.xmlpull.v1.XmlPullParserException;

import android.content.ClipboardManager;
import android.content.ClippedData;
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.res.ColorStateList;
@@ -41,10 +44,7 @@ import android.os.Parcel;
import android.os.Parcelable;
import android.os.ResultReceiver;
import android.os.SystemClock;
import android.provider.Mtp.Object;
import android.provider.Settings.System;
import android.text.BoringLayout;
import android.text.ClipboardManager;
import android.text.DynamicLayout;
import android.text.Editable;
import android.text.GetChars;
@@ -85,6 +85,7 @@ import android.util.AttributeSet;
import android.util.FloatMath;
import android.util.Log;
import android.util.TypedValue;
import android.view.ActionMode;
import android.view.ContextMenu;
import android.view.Gravity;
import android.view.HapticFeedbackConstants;
@@ -96,10 +97,9 @@ import android.view.MotionEvent;
import android.view.View;
import android.view.ViewConfiguration;
import android.view.ViewDebug;
import android.view.ViewGroup.LayoutParams;
import android.view.ViewRoot;
import android.view.ViewTreeObserver;
import android.view.View.MeasureSpec;
import android.view.ViewGroup.LayoutParams;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityManager;
import android.view.animation.AnimationUtils;
@@ -112,6 +112,10 @@ import android.view.inputmethod.InputConnection;
import android.view.inputmethod.InputMethodManager;
import android.widget.RemoteViews.RemoteView;

import java.io.IOException;
import java.lang.ref.WeakReference;
import java.util.ArrayList;

/**
 * Displays text to the user and optionally allows them to edit it.  A TextView
 * is a complete text editor, however the basic class is configured to not