merge from open-source master

Change-Id: If51f538438a5da22d4f04cb6d251603b4abd08f0
This commit is contained in:
The Android Open Source Project
2010-06-02 07:45:47 -07:00

View File

@@ -2614,7 +2614,7 @@ class EmulatorView extends View implements GestureDetector.OnGestureListener {
public EmulatorView(Context context) { public EmulatorView(Context context) {
super(context); super(context);
commonConstructor(); commonConstructor(context);
} }
public void register(TermKeyListener listener) { public void register(TermKeyListener listener) {
@@ -2784,17 +2784,17 @@ class EmulatorView extends View implements GestureDetector.OnGestureListener {
context.obtainStyledAttributes(android.R.styleable.View); context.obtainStyledAttributes(android.R.styleable.View);
initializeScrollbars(a); initializeScrollbars(a);
a.recycle(); a.recycle();
commonConstructor(); commonConstructor(context);
} }
private void commonConstructor() { private void commonConstructor(Context context) {
mTextRenderer = null; mTextRenderer = null;
mCursorPaint = new Paint(); mCursorPaint = new Paint();
mCursorPaint.setARGB(255,128,128,128); mCursorPaint.setARGB(255,128,128,128);
mBackgroundPaint = new Paint(); mBackgroundPaint = new Paint();
mTopRow = 0; mTopRow = 0;
mLeftColumn = 0; mLeftColumn = 0;
mGestureDetector = new GestureDetector(this); mGestureDetector = new GestureDetector(context, this, null);
mGestureDetector.setIsLongpressEnabled(false); mGestureDetector.setIsLongpressEnabled(false);
setVerticalScrollBarEnabled(true); setVerticalScrollBarEnabled(true);
} }