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

Merge "Fix bug 3064135 - do not allow text handles on TextViews in sub windows." into gingerbread

Browse Source
This commit is contained in:
Adam Powell
2010-10-12 15:00:30 -07:00
committed by Android (Google) Code Review
parent e22eb863dc 8c8293bc4d
commit fb6431c029
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,6 +92,7 @@ import android.view.MenuItem;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewDebug; import android.view.ViewDebug;
import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams; import android.view.ViewGroup.LayoutParams;
import android.view.ViewParent; import android.view.ViewParent;
import android.view.ViewRoot; import android.view.ViewRoot;
@@ -6852,8 +6853,17 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
} }
private void prepareCursorControllers() { private void prepareCursorControllers() {
boolean windowSupportsHandles = false;
ViewGroup.LayoutParams params = getRootView().getLayoutParams();
if (params instanceof WindowManager.LayoutParams) {
WindowManager.LayoutParams windowParams = (WindowManager.LayoutParams) params;
windowSupportsHandles = windowParams.type < WindowManager.LayoutParams.FIRST_SUB_WINDOW
|| windowParams.type > WindowManager.LayoutParams.LAST_SUB_WINDOW;
}
// TODO Add an extra android:cursorController flag to disable the controller? // TODO Add an extra android:cursorController flag to disable the controller?
if (mCursorVisible && mLayout != null) { if (windowSupportsHandles && mCursorVisible && mLayout != null) {
if (mInsertionPointCursorController == null) { if (mInsertionPointCursorController == null) {
mInsertionPointCursorController = new InsertionPointCursorController(); mInsertionPointCursorController = new InsertionPointCursorController();
} }
@@ -6861,7 +6871,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
mInsertionPointCursorController = null; mInsertionPointCursorController = null;
} }
if (textCanBeSelected() && mLayout != null) { if (windowSupportsHandles && textCanBeSelected() && mLayout != null) {
if (mSelectionModifierCursorController == null) { if (mSelectionModifierCursorController == null) {
mSelectionModifierCursorController = new SelectionModifierCursorController(); mSelectionModifierCursorController = new SelectionModifierCursorController();
} }