kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #103 from bubba169/master

Browse Source 
Fix volume and back keys on android
This commit is contained in:
Joshua Granick
2014-03-14 11:03:07 -07:00
parent 4daa21ecdf 1e77247b38
commit 94a0199cfb
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/src/common/Display.cpp
View File

@@ -1674,7 +1674,7 @@ void Stage::HandleEvent(Event &inEvent)
mFocusObject->OnKey(inEvent);
#ifdef ANDROID
// Non-cancelled back key ...
if (inEvent.result==0 && inEvent.code==27 && inEvent.type == etKeyUp)
if (inEvent.result==0 && inEvent.value==27 && inEvent.type == etKeyUp)
{
StopAnimation();
}

7
templates/android/template/src/org/haxe/lime/MainView.java
View File

@@ -593,8 +593,15 @@ class MainView extends GLSurfaceView {
case KeyEvent.KEYCODE_MENU: return 0x01000012; /* Fake MENU */
case KeyEvent.KEYCODE_DEL: return 8;
// These will be ignored by the app and passed to the default handler
case KeyEvent.KEYCODE_VOLUME_UP:
case KeyEvent.KEYCODE_VOLUME_DOWN:
case KeyEvent.KEYCODE_VOLUME_MUTE:
return 0;
}
if (inCode >= 7 && inCode <= 16) {
return inCode + 41; // 1-9