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

Commit 63e20850 authored by android-build SharedAccount's avatar android-build SharedAccount
Browse files

manual merge due to conflicts 

Change-Id: Id3901c3969111ea43ffdbfeadcf33491bb1c1114
parents 4d5c0747 382e70d9

include/ui/InputDispatcher.h

+3 −1
Original line number Diff line number Diff line
@@ -179,8 +179,10 @@ struct InputWindow { 
        TYPE_INPUT_METHOD       = FIRST_SYSTEM_WINDOW+11,

        TYPE_INPUT_METHOD_DIALOG= FIRST_SYSTEM_WINDOW+12,

        TYPE_WALLPAPER          = FIRST_SYSTEM_WINDOW+13,

        TYPE_STATUS_BAR_PANEL   = FIRST_SYSTEM_WINDOW+14,

        TYPE_STATUS_BAR_SUB_PANEL  = FIRST_SYSTEM_WINDOW+14,

        TYPE_SECURE_SYSTEM_OVERLAY = FIRST_SYSTEM_WINDOW+15,

        TYPE_DRAG               = FIRST_SYSTEM_WINDOW+16,

        TYPE_STATUS_BAR_PANEL   = FIRST_SYSTEM_WINDOW+17,

        LAST_SYSTEM_WINDOW      = 2999,

    };

libs/ui/Android.mk

+39 −4
Original line number Diff line number Diff line 
# Copyright (C) 2010 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



LOCAL_PATH:= $(call my-dir)



# libui is partially built for the host (used by build time keymap validation tool)

# These files are common to host and target builds.

commonSources:= \

	Input.cpp \

	Keyboard.cpp \

	KeyLayoutMap.cpp \

	KeyCharacterMap.cpp \



# For the host

# =====================================================



include $(CLEAR_VARS)



LOCAL_SRC_FILES:= $(commonSources)



LOCAL_MODULE:= libui



include $(BUILD_HOST_STATIC_LIBRARY)





# For the device

# =====================================================



include $(CLEAR_VARS)



LOCAL_SRC_FILES:= \

	$(commonSources) \

	EGLUtils.cpp \

	EventHub.cpp \

	EventRecurrence.cpp \
@@ -10,10 +49,6 @@ LOCAL_SRC_FILES:= \ 
	GraphicBufferAllocator.cpp \

	GraphicBufferMapper.cpp \

	GraphicLog.cpp \

	Keyboard.cpp \

	KeyLayoutMap.cpp \

	KeyCharacterMap.cpp \

	Input.cpp \

	InputDispatcher.cpp \

	InputManager.cpp \

	InputReader.cpp \

libs/ui/KeyCharacterMap.cpp

+1 −0
Original line number Diff line number Diff line
@@ -733,6 +733,7 @@ status_t KeyCharacterMap::Parser::parseModifier(const String8& token, int32_t* o 
            }



            combinedMeta |= metaState;

            start = cur + 1;



            if (ch == '\0') {

                break;

libs/ui/Overlay.cpp

+7 −2
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ void* Overlay::getBufferAddress(overlay_buffer_t buffer) 
}



void Overlay::destroy() {  

    if (mStatus != NO_ERROR) return;



    // Must delete the objects in reverse creation order, thus the

    //  data side must be closed first and then the destroy send to
@@ -104,9 +103,15 @@ void Overlay::destroy() { 
    if (mOverlayData) {

        overlay_data_close(mOverlayData);

        mOverlayData = NULL;

    } else {

        LOGD("Overlay::destroy mOverlayData is NULL");

    }



    if (mOverlayRef != 0) {

        mOverlayRef->mOverlayChannel->destroy();

    } else {

        LOGD("Overlay::destroy mOverlayRef is NULL");

    }

}



status_t Overlay::getStatus() const {