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

Commit b6b00b33 authored by chaviw's avatar chaviw
Browse files

Renamed and moved InputWindow and related files 

In preparation for the hierarchy listener interface, moved the
InputWindow structs into libgui and have libinput dependant on libgui.
Also renamed InputWindow to exclude Input since it will be used for more
generic purposes.

Test: Builds and flashes
Bug: 188792659
Change-Id: Ib0a32c9920dc8110ceee4d6617ac030eb5cc0d99
Merged-In: Ib0a32c9920dc8110ceee4d6617ac030eb5cc0d99
parent 5144a83c

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ filegroup { 
        ":framework_native_aidl",

        ":gatekeeper_aidl",

        ":gsiservice_aidl",

        ":guiconstants_aidl",

        ":idmap2_aidl",

        ":idmap2_core_aidl",

        ":incidentcompanion_aidl",

core/java/android/view/InputWindowHandle.java

+1 −1
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ import static android.view.Display.INVALID_DISPLAY; 


import android.annotation.Nullable;

import android.graphics.Region;

import android.gui.TouchOcclusionMode;

import android.os.IBinder;

import android.os.TouchOcclusionMode;



import java.lang.ref.WeakReference;

core/jni/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ cc_library_shared { 
                "libbinderthreadstateutils",

                "libdmabufinfo",

                "libgif",

                "libgui_window_info_static",

                "libseccomp_policy",

                "libgrallocusage",

                "libscrypt_static",
@@ -370,6 +371,7 @@ cc_library_shared { 
                "libinput",

                "libbinderthreadstateutils",

                "libsqlite",

                "libgui_window_info_static",

            ],

            shared_libs: [

                // libbinder needs to be shared since it has global state

core/jni/android_hardware_input_InputApplicationHandle.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


#include <string>



#include <input/InputApplication.h>

#include <gui/InputApplication.h>



#include <nativehelper/JNIHelp.h>

#include "jni.h"

core/jni/android_hardware_input_InputWindowHandle.cpp

+7 −4
Original line number Diff line number Diff line
@@ -26,14 +26,17 @@ 
#include <ui/Region.h>

#include <utils/threads.h>



#include <gui/WindowInfo.h>

#include "android_hardware_input_InputApplicationHandle.h"

#include "android_util_Binder.h"

#include "core_jni_helpers.h"

#include "input/InputWindow.h"

#include "jni.h"



namespace android {



using gui::TouchOcclusionMode;

using gui::WindowInfo;



struct WeakRefHandleField {

    jfieldID ctrl;

    jmethodID get;
@@ -115,9 +118,9 @@ bool NativeInputWindowHandle::updateInfo() { 


    mInfo.name = getStringField(env, obj, gInputWindowHandleClassInfo.name, "<null>");



    mInfo.flags = Flags<InputWindowInfo::Flag>(

    mInfo.flags = Flags<WindowInfo::Flag>(

            env->GetIntField(obj, gInputWindowHandleClassInfo.layoutParamsFlags));

    mInfo.type = static_cast<InputWindowInfo::Type>(

    mInfo.type = static_cast<WindowInfo::Type>(

            env->GetIntField(obj, gInputWindowHandleClassInfo.layoutParamsType));

    mInfo.dispatchingTimeout = std::chrono::milliseconds(

            env->GetLongField(obj, gInputWindowHandleClassInfo.dispatchingTimeoutMillis));
@@ -159,7 +162,7 @@ bool NativeInputWindowHandle::updateInfo() { 
    mInfo.ownerUid = env->GetIntField(obj,

            gInputWindowHandleClassInfo.ownerUid);

    mInfo.packageName = getStringField(env, obj, gInputWindowHandleClassInfo.packageName, "<null>");

    mInfo.inputFeatures = static_cast<InputWindowInfo::Feature>(

    mInfo.inputFeatures = static_cast<WindowInfo::Feature>(

            env->GetIntField(obj, gInputWindowHandleClassInfo.inputFeatures));

    mInfo.displayId = env->GetIntField(obj,

            gInputWindowHandleClassInfo.displayId);