Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16f1d2ca authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am 36001a9f: Merge "Support chorded fallback keys. (DO NOT MERGE)" into honeycomb-mr2 

* commit '36001a9f':
  Support chorded fallback keys. (DO NOT MERGE)
parents 32b7bcc8 36001a9f

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+11 −6
Original line number Diff line number Diff line
@@ -643,11 +643,16 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
     * Create (if necessary) and launch the recent apps dialog

     */

    void showRecentAppsDialog() {

        mHandler.post(new Runnable() {

            @Override

            public void run() {

                if (mRecentAppsDialog == null) {

                    mRecentAppsDialog = new RecentApplicationsDialog(mContext);

                }

                mRecentAppsDialog.show();

            }

        });

    }



    /** {@inheritDoc} */

    public void init(Context context, IWindowManager windowManager,
@@ -1427,7 +1432,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            }

            return false;

        } else if (keyCode == KeyEvent.KEYCODE_APP_SWITCH) {

            if (!down) {

            if (down && repeatCount == 0) {

                showRecentAppsDialog();

            }

            return true;

services/input/InputDispatcher.cpp

+179 −86

File changed.

Preview size limit exceeded, changes collapsed.

services/input/InputDispatcher.h

+42 −13

File changed.

Preview size limit exceeded, changes collapsed.

services/jni/com_android_server_InputManager.cpp

+6 −2
Original line number Diff line number Diff line
@@ -795,7 +795,9 @@ bool NativeInputManager::dispatchUnhandledKey(const sp<InputWindowHandle>& input 
            jobject fallbackKeyEventObj = env->CallObjectMethod(mCallbacksObj,

                    gCallbacksClassInfo.dispatchUnhandledKey,

                    inputWindowHandleObj, keyEventObj, policyFlags);

            checkAndClearExceptionFromCallback(env, "dispatchUnhandledKey");

            if (checkAndClearExceptionFromCallback(env, "dispatchUnhandledKey")) {

                fallbackKeyEventObj = NULL;

            }

            android_view_KeyEvent_recycle(env, keyEventObj);

            env->DeleteLocalRef(keyEventObj);
@@ -826,7 +828,9 @@ bool NativeInputManager::checkInjectEventsPermissionNonReentrant( 
    JNIEnv* env = jniEnv();

    jboolean result = env->CallBooleanMethod(mCallbacksObj,

            gCallbacksClassInfo.checkInjectEventsPermission, injectorPid, injectorUid);

    checkAndClearExceptionFromCallback(env, "checkInjectEventsPermission");

    if (checkAndClearExceptionFromCallback(env, "checkInjectEventsPermission")) {

        result = false;

    }

    return result;

}