touch_event_blocked() checks touch event blocking during lcd_on/off_procedure().
For relocating lcd_on/off_procedure(), touch_event_blocked() is also relocated.
This functions are added below display-misc.
- int display_misc_set_touch_event_blocked(bool blocked);
- bool display_misc_is_touch_event_blocked(void);
-> This replaces touch_event_blocked()
Change-Id: Icaa609ad4a4e168663dd85556dea2c448b5747bd
Signed-off-by: Yunhee Seo <yuni.seo@samsung.com>
*/
static bool lcdon_broadcast = true;
-static bool touch_blocked = false;
-
/* default transition, action fuctions */
static int default_action(int timeout);
return UNKNOWN_STR;
}
-bool touch_event_blocked(void)
-{
- return touch_blocked;
-}
-
void lcd_on_procedure(int state, enum device_flags flag)
{
unsigned long flags = NORMAL_MODE;
touchled_control_backlight(TOUCHLED_DIRECT_ON);
- touch_blocked = false;
+ display_misc_set_touch_event_blocked(false);
}
inline void lcd_off_procedure(enum device_flags flag)
/* operation */
- touch_blocked = true;
+ display_misc_set_touch_event_blocked(true);
set_setting_pmstate(S_LCDOFF);
#include "display-backlight.h"
#include "display-ops.h"
#include "display-config.h"
+#include "display-misc.h"
#include "display-state-transition.h"
#include "shared/common.h"
#include "shared/devices.h"
ignore = false;
break;
case EV_ABS:
- if (touch_event_blocked()
+ if (display_misc_is_touch_event_blocked()
&& !g_display_plugin.config->touch_wakeup
&& pinput->value == KEY_BEING_PRESSED)
return;
*/
static bool lcdon_broadcast = true;
-static bool touch_blocked = false;
-
/* default transition, action fuctions */
static int default_action(int timeout);
return UNKNOWN_STR;
}
-bool touch_event_blocked(void)
-{
- return touch_blocked;
-}
-
void lcd_on_procedure(int state, enum device_flags flag)
{
unsigned long flags = NORMAL_MODE;
touchled_control_backlight(TOUCHLED_DIRECT_ON);
- touch_blocked = false;
+ display_misc_set_touch_event_blocked(false);
}
inline void lcd_off_procedure(enum device_flags flag)
/* operation */
- touch_blocked = true;
+ display_misc_set_touch_event_blocked(true);
set_setting_pmstate(S_LCDOFF);
#include "display-backlight.h"
#include "display-ops.h"
#include "display-config.h"
+#include "display-misc.h"
#include "display-state-transition.h"
#include "shared/common.h"
#include "shared/devices.h"
ignore = false;
break;
case EV_ABS:
- if (touch_event_blocked()
+ if (display_misc_is_touch_event_blocked()
&& !g_display_plugin.config->touch_wakeup
&& pinput->value == KEY_BEING_PRESSED)
return;
*/
static bool lcdon_broadcast = true;
-static bool touch_blocked = false;
-
/* default transition, action fuctions */
static int default_action(int timeout);
return UNKNOWN_STR;
}
-bool touch_event_blocked(void)
-{
- return touch_blocked;
-}
-
void lcd_on_procedure(int state, enum device_flags flag)
{
unsigned long flags = NORMAL_MODE;
touchled_control_backlight(TOUCHLED_DIRECT_ON);
- touch_blocked = false;
+ display_misc_set_touch_event_blocked(false);
}
inline void lcd_off_procedure(enum device_flags flag)
/* operation */
- touch_blocked = true;
+ display_misc_set_touch_event_blocked(true);
set_setting_pmstate(S_LCDOFF);
#include "display-backlight.h"
#include "display-ops.h"
#include "display-config.h"
+#include "display-misc.h"
#include "display-state-transition.h"
#include "shared/common.h"
#include "shared/devices.h"
ignore = false;
break;
case EV_ABS:
- if (touch_event_blocked()
+ if (display_misc_is_touch_event_blocked()
&& !g_display_plugin.config->touch_wakeup
&& pinput->value == KEY_BEING_PRESSED)
return;
*/
static bool lcdon_broadcast = true;
-static bool touch_blocked = false;
-
/* default transition, action fuctions */
static int default_trans(int evt);
static int default_action(int timeout);
return 0;
}
-bool touch_event_blocked(void)
-{
- return touch_blocked;
-}
-
static gboolean late_transit_on(void *data)
{
if (!transit_timer)
lcdon_broadcast = true;
}
- touch_blocked = false;
+ display_misc_set_touch_event_blocked(false);
}
inline void lcd_off_procedure(enum device_flags flag)
/* operation */
- touch_blocked = true;
+ display_misc_set_touch_event_blocked(true);
if (flags & AMBIENT_MODE) {
if (ambient_get_state() == true)
#include "display-panel.h"
#include "display-backlight.h"
#include "display-config.h"
+#include "display-misc.h"
#include "display-state-transition.h"
#include "shared/common.h"
#include "shared/devices.h"
ignore = false;
break;
case EV_ABS:
- if (touch_event_blocked() && !ambient_get_state()
+ if (display_misc_is_touch_event_blocked() && !ambient_get_state()
&& !g_display_plugin.config->touch_wakeup
&& pinput->value == KEY_BEING_PRESSED)
return;
void lcd_on_direct(enum device_flags flags);
void lcd_on_procedure(int state, enum device_flags flag);
void lcd_off_procedure(enum device_flags flag);
-bool touch_event_blocked(void);
void broadcast_lcd_off_late(enum device_flags flags);
/* auto-brightness.c */
#include "poll.h"
static bool stay_touchscreen_off = false;
+static bool touch_event_blocked = false;
/* FIXME: This fucntion should be relocated under the battery module */
bool display_misc_is_low_battery_state(int val)
*on = stay_touchscreen_off;
}
+int display_misc_set_touch_event_blocked(bool blocked)
+{
+ touch_event_blocked = blocked;
+ return 0;
+}
+
+bool display_misc_is_touch_event_blocked(void)
+{
+ return touch_event_blocked;
+}
+
/* FIXME: This fucntion should be relocated under the battery module or redefined */
static int changed_battery_health(void *data)
{
void display_misc_register_battery_health_notifier(void);
void display_misc_unregister_battery_health_notifier(void);
void display_misc_save_display_log(const char *path);
+int display_misc_set_touch_event_blocked(bool blocked);
+bool display_misc_is_touch_event_blocked(void);
#endif /* __DISPLAY_MISC_H__ */
\ No newline at end of file