|
@@ -110,10 +110,8 @@ public class BaseActivity extends Activity {
|
|
|
return super.onKeyDown(keyCode, event);
|
|
|
} else {
|
|
|
if (isLockKey) {
|
|
|
- Log.d(TAG, "onKeyDown: 1");
|
|
|
return true;
|
|
|
} else {
|
|
|
- Log.d(TAG, "onKeyDown: 2");
|
|
|
return super.onKeyDown(keyCode, event);
|
|
|
}
|
|
|
}
|
|
@@ -123,11 +121,9 @@ public class BaseActivity extends Activity {
|
|
|
public boolean onKeyUp(int keyCode, KeyEvent event) {
|
|
|
Log.d(TAG, "onKeyUp: ");
|
|
|
if (mBaseIntentFrom > 0) {
|
|
|
- Log.d(TAG, "onKeyUp: mBaseIntentFrom > 0");
|
|
|
return super.onKeyUp(keyCode, event);
|
|
|
} else {
|
|
|
if (!isLockKey) {
|
|
|
- Log.d(TAG, "onKeyUp: maybeFinish");
|
|
|
maybeFinish();
|
|
|
}
|
|
|
return true;
|
|
@@ -136,8 +132,8 @@ public class BaseActivity extends Activity {
|
|
|
|
|
|
@Override
|
|
|
public boolean onTouchEvent(MotionEvent event) {
|
|
|
+ Log.d(TAG, "onTouchEvent: ");
|
|
|
if (isLockKey) {
|
|
|
- Log.d(TAG, "onTouchEvent: Lock");
|
|
|
return true;
|
|
|
} else {
|
|
|
switch (event.getAction()) {
|
|
@@ -148,7 +144,6 @@ public class BaseActivity extends Activity {
|
|
|
break;
|
|
|
case MotionEvent.ACTION_UP:
|
|
|
if (event.getRawX() - mStartRawX > 60) {
|
|
|
- Log.d(TAG, "onTouchEvent: maybeFinish");
|
|
|
maybeFinish();
|
|
|
}
|
|
|
mStartRawX = 0;
|