Skip to content

Commit 2469061

Browse files
authored
Revert "[Android] Add a way to disable interactions on the SurfaceView" (#2472)
Revert "[Android] Add a way to disable interactions on the SurfaceView (#2410)" This reverts commit 3e7873e.
1 parent 9732095 commit 2469061

File tree

1 file changed

+0
-25
lines changed

1 file changed

+0
-25
lines changed

core/platform/android/java/src/dev/axmol/lib/AxmolGLSurfaceView.java

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ public class AxmolGLSurfaceView extends GLSurfaceView {
6464

6565
private boolean mSoftKeyboardShown = false;
6666
private boolean mMultipleTouchEnabled = true;
67-
private boolean mInteractive = true;
6867

6968
private CountDownLatch mNativePauseComplete;
7069

@@ -84,14 +83,6 @@ public void setMultipleTouchEnabled(boolean multipleTouchEnabled) {
8483
this.mMultipleTouchEnabled = multipleTouchEnabled;
8584
}
8685

87-
public boolean isInteractive() {
88-
return mInteractive;
89-
}
90-
91-
public void setInteractive(boolean interactive) {
92-
this.mInteractive = interactive;
93-
}
94-
9586
// ===========================================================
9687
// Constructors
9788
// ===========================================================
@@ -223,10 +214,6 @@ public boolean onTouchEvent(final MotionEvent pMotionEvent) {
223214

224215
switch (pMotionEvent.getAction() & MotionEvent.ACTION_MASK) {
225216
case MotionEvent.ACTION_POINTER_DOWN:
226-
if (!mInteractive) {
227-
break;
228-
}
229-
230217
final int indexPointerDown = pMotionEvent.getAction() >> MotionEvent.ACTION_POINTER_INDEX_SHIFT;
231218
if (!mMultipleTouchEnabled && indexPointerDown != 0) {
232219
break;
@@ -244,10 +231,6 @@ public void run() {
244231
break;
245232

246233
case MotionEvent.ACTION_DOWN:
247-
if (!mInteractive) {
248-
break;
249-
}
250-
251234
// there are only one finger on the screen
252235
final int idDown = pMotionEvent.getPointerId(0);
253236
final float xDown = xs[0];
@@ -368,10 +351,6 @@ protected void onSizeChanged(final int pNewSurfaceWidth, final int pNewSurfaceHe
368351

369352
@Override
370353
public boolean onKeyDown(final int pKeyCode, final KeyEvent pKeyEvent) {
371-
if (!mInteractive) {
372-
return false;
373-
}
374-
375354
switch (pKeyCode) {
376355
case KeyEvent.KEYCODE_BACK:
377356
case KeyEvent.KEYCODE_MENU:
@@ -396,10 +375,6 @@ public void run() {
396375

397376
@Override
398377
public boolean onKeyUp(final int keyCode, KeyEvent event) {
399-
if (!mInteractive) {
400-
return false;
401-
}
402-
403378
switch (keyCode) {
404379
case KeyEvent.KEYCODE_BACK:
405380
case KeyEvent.KEYCODE_MENU:

0 commit comments

Comments
 (0)