Merge branch 'master' into zvision

Conflicts:
	video/avi_decoder.cpp

1 files changed, 19 insertions, 6 deletions

diff --git a/backends/platform/tizen/form.cpp b/backends/platform/tizen/form.cpp
index 5050699ca9..10d51cc610 100644
--- a/backends/platform/tizen/form.cpp
+++ b/backends/platform/tizen/form.cpp
@@ -52,7 +52,7 @@ TizenAppForm::TizenAppForm() :
 	_eventQueueLock(NULL),
 	_state(kInitState),
 	_buttonState(kLeftButton),
-	_shortcut(kShowKeypad) {
+	_shortcut(kEscapeKey) {
 }
 
 result TizenAppForm::Construct() {
@@ -157,6 +157,8 @@ result TizenAppForm::OnInitializing(void) {
 	AddOrientationEventListener(*this);
 	AddTouchEventListener(*this);
 	SetMultipointTouchEnabled(true);
+	SetFormBackEventListener(this);
+	SetFormMenuEventListener(this);
 
 	// set focus to enable receiving key events
 	SetEnabled(true);
@@ -316,16 +318,16 @@ void TizenAppForm::invokeShortcut() {
 	case kControlMouse:
 		setButtonShortcut();
 		break;
-
+		
 	case kEscapeKey:
 		pushKey(Common::KEYCODE_ESCAPE);
 		break;
-
+		
 	case kGameMenu:
 		_buttonState = kLeftButton;
 		pushKey(Common::KEYCODE_F5);
 		break;
-
+		
 	case kShowKeypad:
 		showKeypad();
 		break;
@@ -354,8 +356,6 @@ void TizenAppForm::OnTouchDoublePressed(const Control &source,
 	if (_buttonState != kMoveOnly) {
 		pushEvent(_buttonState == kLeftButton ? Common::EVENT_LBUTTONDOWN : Common::EVENT_RBUTTONDOWN,
 							currentPosition);
-		pushEvent(_buttonState == kLeftButton ? Common::EVENT_LBUTTONDOWN : Common::EVENT_RBUTTONDOWN,
-							currentPosition);
 	}
 }
 
@@ -417,3 +417,16 @@ void TizenAppForm::OnTouchReleased(const Control &source,
 	}
 }
 
+void TizenAppForm::OnFormBackRequested(Form &source) {
+	logEntered();
+	if (_state == kActiveState) {
+		invokeShortcut();
+	}
+}
+
+void TizenAppForm::OnFormMenuRequested(Form &source) {
+	logEntered();
+	if (_state == kActiveState) {
+		setShortcut();
+	}
+}