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

Merge "Make getFallbackAction return false when there is none." into honeycomb

Browse Source
This commit is contained in:
Jeff Brown
2011-01-14 17:59:56 -08:00
committed by Android (Google) Code Review
parent 06bc9721d8 fca66d3b71
commit 77c3e4b9fd
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ui/KeyCharacterMap.cpp
View File

@@ -185,10 +185,12 @@ bool KeyCharacterMap::getFallbackAction(int32_t keyCode, int32_t metaState,
const Key* key; const Key* key;
const Behavior* behavior; const Behavior* behavior;
if (getKeyBehavior(keyCode, metaState, &key, &behavior)) { if (getKeyBehavior(keyCode, metaState, &key, &behavior)) {
if (behavior->fallbackKeyCode) {
outFallbackAction->keyCode = behavior->fallbackKeyCode; outFallbackAction->keyCode = behavior->fallbackKeyCode;
outFallbackAction->metaState = metaState & ~behavior->metaState; outFallbackAction->metaState = metaState & ~behavior->metaState;
result = true; result = true;
} }
}
#if DEBUG_MAPPING #if DEBUG_MAPPING
LOGD("getFallbackKeyCode: keyCode=%d, metaState=0x%08x ~ Result %s, " LOGD("getFallbackKeyCode: keyCode=%d, metaState=0x%08x ~ Result %s, "
"fallback keyCode=%d, fallback metaState=0x%08x.", "fallback keyCode=%d, fallback metaState=0x%08x.",