Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cosmetic changes around TextView."

Browse Source
This commit is contained in:
Gilles Debunne
2010-07-13 15:58:43 -07:00
committed by Android (Google) Code Review
parent f5574e0f8c 2d0e87b644
commit 8bfc798dc2
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/text/Selection.java
View File

@@ -417,8 +417,8 @@ public class Selection {
}
}
private static final class START implements NoCopySpan { };
private static final class END implements NoCopySpan { };
private static final class START implements NoCopySpan { }
private static final class END implements NoCopySpan { }
/*
* Public constants

4
core/java/android/view/AbsSavedState.java
View File

@@ -54,7 +54,7 @@ public abstract class AbsSavedState implements Parcelable {
*/
protected AbsSavedState(Parcel source) {
// FIXME need class loader
Parcelable superState = (Parcelable) source.readParcelable(null);
Parcelable superState = source.readParcelable(null);
mSuperState = superState != null ? superState : EMPTY_STATE;
}
@@ -75,7 +75,7 @@ public abstract class AbsSavedState implements Parcelable {
= new Parcelable.Creator<AbsSavedState>() {
public AbsSavedState createFromParcel(Parcel in) {
Parcelable superState = (Parcelable) in.readParcelable(null);
Parcelable superState = in.readParcelable(null);
if (superState != null) {
throw new IllegalStateException("superState must be null");
}

2
core/java/android/view/MotionEvent.java
View File

@@ -722,7 +722,7 @@ public final class MotionEvent implements Parcelable {
*
* @param pointerId The identifier of the pointer to be found.
* @return Returns either the index of the pointer (for use with
* {@link #getX(int) et al.), or -1 if there is no data available for
* {@link #getX(int)} et al.), or -1 if there is no data available for
* that pointer identifier.
*/
public final int findPointerIndex(int pointerId) {

4
core/java/android/widget/TextView.java
View File

@@ -7709,14 +7709,14 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
mOffsetX = (bounds.left + bounds.right) / 2.0f - x;
mOffsetY = bounds.top - mCursorControllerVerticalOffset - y;
mOnDownTimerStart = System.currentTimeMillis();
mOnDownTimerStart = event.getEventTime();
}
}
break;
}
case MotionEvent.ACTION_UP : {
int time = (int) (System.currentTimeMillis() - mOnDownTimerStart);
int time = (int) (event.getEventTime() - mOnDownTimerStart);
if (time <= ViewConfiguration.getTapTimeout()) {
// A tap on the controller is not grabbed, move the cursor instead