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

Commit 98318de9 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: I24262cbc14d409c00273de0024a672394a959e5f
parent 99dbf914

include/input/Flags.h→include/ftl/Flags.h

+2 −5
Original line number Diff line number Diff line
@@ -22,11 +22,10 @@ 
#include <string>

#include <type_traits>



#include "NamedEnum.h"

#include <ftl/NamedEnum.h>

#include "utils/BitSet.h"



#ifndef __UI_INPUT_FLAGS_H

#define __UI_INPUT_FLAGS_H

#pragma once



namespace android {
@@ -279,5 +278,3 @@ Flags<F> operator|(F lhs, F rhs) { 


} // namespace flag_operators

} // namespace android
 


#endif // __UI_INPUT_FLAGS_H

include/input/NamedEnum.h→include/ftl/NamedEnum.h

+1 −4
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ 
#include <optional>

#include <string>



#ifndef __UI_INPUT_NAMEDENUM_H

#define __UI_INPUT_NAMEDENUM_H

#pragma once



namespace android {
@@ -124,5 +123,3 @@ public: 
};



} // namespace android
 


#endif // __UI_INPUT_NAMEDENUM_H
 
 No newline at end of file

include/input/DisplayViewport.h

+2 −1
Original line number Diff line number Diff line
@@ -18,8 +18,9 @@ 
#define _LIBINPUT_DISPLAY_VIEWPORT_H



#include <android-base/stringprintf.h>

#include <ftl/NamedEnum.h>

#include <gui/constants.h>

#include <input/Input.h>

#include <input/NamedEnum.h>



#include <cinttypes>

#include <optional>

include/input/Input.h

+0 −15
Original line number Diff line number Diff line
@@ -105,15 +105,6 @@ constexpr int32_t VERIFIED_MOTION_EVENT_FLAGS = 
 */

constexpr int32_t AMOTION_EVENT_FLAG_CANCELED = 0x20;



enum {

    /* Used when a motion event is not associated with any display.

     * Typically used for non-pointer events. */

    ADISPLAY_ID_NONE = -1,



    /* The default display id. */

    ADISPLAY_ID_DEFAULT = 0,

};



enum {

    /*

     * Indicates that an input device has switches.
@@ -338,12 +329,6 @@ private: 
 */

constexpr float AMOTION_EVENT_INVALID_CURSOR_POSITION = std::numeric_limits<float>::quiet_NaN();



/**

 * Invalid value for display size. Used when display size isn't available for an event or doesn't

 * matter. This is just a constant 0 so that it has no effect if unused.

 */

constexpr int32_t AMOTION_EVENT_INVALID_DISPLAY_SIZE = 0;



/*

 * Pointer coordinate data.

 */

libs/ftl/Android.bp

+10 −0
Original line number Diff line number Diff line
@@ -15,7 +15,9 @@ cc_test { 
    },

    srcs: [

        "cast_test.cpp",

        "Flags_test.cpp",

        "future_test.cpp",

        "NamedEnum_test.cpp",

        "small_map_test.cpp",

        "small_vector_test.cpp",

        "static_vector_test.cpp",
@@ -27,4 +29,12 @@ cc_test { 
        "-Wextra",

        "-Wpedantic",

    ],



    header_libs: [

        "libbase_headers",

    ],



    shared_libs: [

        "libbase",

    ],

}