diff --git a/Android.mk b/Android.mk index 88586bc..d86078d 100644 --- a/Android.mk +++ b/Android.mk @@ -18,7 +18,7 @@ include $(CLEAR_VARS) ## VERSIONING ## AROMA_NAME := AROMA Installer - AROMA_VERSION := 2.70RC1 + AROMA_VERSION := 2.70RC2 AROMA_BUILD := $(shell date +%y%m%d%H) AROMA_CN := Flamboyan @@ -143,6 +143,7 @@ include $(CLEAR_VARS) LOCAL_CFLAGS += -fdata-sections -ffunction-sections LOCAL_CFLAGS += -Wl,--gc-sections -fPIC -DPIC LOCAL_CFLAGS += -D_AROMA_NODEBUG +# LOCAL_CFLAGS += -D_AROMA_VERBOSE_INFO ## SET VERSION LOCAL_CFLAGS += -DAROMA_NAME="\"$(AROMA_NAME)\"" @@ -156,6 +157,17 @@ include $(CLEAR_VARS) ## INCLUDED LIBRARIES LOCAL_STATIC_LIBRARIES := libm libc + + ifeq ($(MAKECMDGOALS),$(LOCAL_MODULE)) + $(shell rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES/$(LOCAL_MODULE)_intermediates) + endif + + ## + ## Remove Old Build + ## + ifeq ($(MAKECMDGOALS),$(LOCAL_MODULE)) + $(shell rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES/$(LOCAL_MODULE)_intermediates) + endif include $(BUILD_EXECUTABLE) diff --git a/out/out_folder.txt b/out/out_folder.txt new file mode 100644 index 0000000..6899516 --- /dev/null +++ b/out/out_folder.txt @@ -0,0 +1 @@ +Output Binary and Zip Here \ No newline at end of file diff --git a/src/aroma.h b/src/aroma.h index 0976d01..2063b74 100644 --- a/src/aroma.h +++ b/src/aroma.h @@ -957,11 +957,18 @@ byte acchkopt_itemtype(ACONTROLP ctl, int index); #else #define LOGS(...) fprintf(stdout, _AROMA_DEBUG_TAG "/s: " __VA_ARGS__) #define LOGE(...) fprintf(stdout, _AROMA_DEBUG_TAG "/e: " __VA_ARGS__) +#ifdef _AROMA_VERBOSE_INFO +#define LOGW(...) fprintf(stdout, _AROMA_DEBUG_TAG "/w: " __VA_ARGS__) +#define LOGI(...) fprintf(stdout, _AROMA_DEBUG_TAG "/i: " __VA_ARGS__) +#define LOGV(...) fprintf(stdout, _AROMA_DEBUG_TAG "/v: " __VA_ARGS__) +#define LOGD(...) fprintf(stdout, _AROMA_DEBUG_TAG "/d: " __VA_ARGS__) +#else #define LOGW(...) /**/ #define LOGI(...) /**/ #define LOGV(...) /**/ #define LOGD(...) /**/ #endif +#endif #define STRINGIFY(x) #x #define EXPAND(x) STRINGIFY(x) diff --git a/src/libs/input/input_translate/translate_touch.c b/src/libs/input/input_translate/translate_touch.c index 0d03941..1c7b741 100644 --- a/src/libs/input/input_translate/translate_touch.c +++ b/src/libs/input/input_translate/translate_touch.c @@ -75,9 +75,10 @@ byte INDR_translate_touch(AINPUTP me, INDR_DEVICEP dev, /* Get Internal Data */ INDR_INTERNALP mi = (INDR_INTERNALP) me->internal; - /* DUMP RAW EVENTS */ //ALOGRT("INDR RAW TOUCH: T=%i, C=%i, V=%i",ev->type,ev->code,ev->value); + static int MT_TRACKING_IS_UNTOUCHED = 0; + static int TOUCH_RELEASE_NEXTSYN = 0; /* Process EV_ABS Event */ if (ev->type == EV_ABS) { @@ -138,6 +139,18 @@ byte INDR_translate_touch(AINPUTP me, INDR_DEVICEP dev, break; + case ABS_MT_TRACKING_ID: + if (ev->value < 0) { + /* Screen UnTouched */ + dev->p.state |= INDR_POS_ST_RLS_NEXT; + dev->p.x = 0; + dev->p.y = 0; + TOUCH_RELEASE_NEXTSYN = 1; + MT_TRACKING_IS_UNTOUCHED = 1; + } + + break; + default: /* Unknown Event */ goto return_none; @@ -155,8 +168,10 @@ byte INDR_translate_touch(AINPUTP me, INDR_DEVICEP dev, goto return_clear_sync; } - if ((dev->p.state & (INDR_POS_ST_LASTSYNC | INDR_POS_ST_RLS_NEXT))) { + if (((dev->p.state & (INDR_POS_ST_LASTSYNC | INDR_POS_ST_RLS_NEXT)) && !MT_TRACKING_IS_UNTOUCHED) || + (MT_TRACKING_IS_UNTOUCHED && TOUCH_RELEASE_NEXTSYN == 1)) { /* Set Destination Coordinate */ + TOUCH_RELEASE_NEXTSYN = 0; dest_ev->x = dev->p.tx; dest_ev->y = dev->p.ty; @@ -331,4 +346,4 @@ byte INDR_translate_touch(AINPUTP me, INDR_DEVICEP dev, return AINPUT_EV_RET_NONE; } -#endif // __AROMA_CORE_UNIVERSAL_INPUT_DRIVER_TRANSLATE_TOUCH__ +#endif // __AROMA_CORE_UNIVERSAL_INPUT_DRIVER_TRANSLATE_TOUCH__ \ No newline at end of file