From: GiWoong Kim <giwoong.kim@samsung.com>
Date: Wed, 2 Oct 2013 08:32:21 +0000 (+0900)
Subject: hwkey: added some logs in skin
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~706^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F44%2F10644%2F1;p=sdk%2Femulator%2Fqemu.git

hwkey: added some logs in skin

Change-Id: I84b241e1ed4df65cf2d164669cdbe48cb2284590
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
---

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/HWKey.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/HWKey.java
index 32b18c08e2..257f476f0e 100644
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/HWKey.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/HWKey.java
@@ -1,7 +1,7 @@
 /**
+ * Hardware Key
  *
- *
- * Copyright (C) 2011 - 2012 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (C) 2011 - 2013 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Contact:
  * GiWoong Kim <giwoong.kim@samsung.com>
@@ -32,14 +32,35 @@ import org.tizen.emulator.skin.util.SkinRegion;
 import org.tizen.emulator.skin.util.SkinUtil;
 
 public class HWKey {
+	private String name;
 	private int keyCode;
 	private SkinRegion region;
 	private String tooltip;
 
+	/**
+	 *  Constructor
+	 */
 	public HWKey() {
+		this.name = "unknown";
 		this.keyCode = SkinUtil.UNKNOWN_KEYCODE;
 	}
 
+	public HWKey(String name, int keyCode, SkinRegion region, String tooltip) {
+		this.name = name;
+		this.keyCode = keyCode;
+		this.region = region;
+		this.tooltip = tooltip;
+	}
+
+	/* name */
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
 	/* keycode */
 	public int getKeyCode() {
 		return keyCode;
diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/ProfileSpecificSkinComposer.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/ProfileSpecificSkinComposer.java
index 4d2c90ca03..95c6caf6fb 100644
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/ProfileSpecificSkinComposer.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/ProfileSpecificSkinComposer.java
@@ -418,8 +418,6 @@ public class ProfileSpecificSkinComposer implements ISkinComposer {
 			@Override
 			public void mouseUp(MouseEvent e) {
 				if (e.button == 1) { /* left button */
-					logger.info("mouseUp in Skin");
-
 					isGrabbedShell = false;
 					grabPosition.x = grabPosition.y = 0;
 
@@ -428,10 +426,13 @@ public class ProfileSpecificSkinComposer implements ISkinComposer {
 					/* HW key handling */
 					HWKey pressedHWKey = currentState.getCurrentPressedHWKey();
 					if (pressedHWKey == null) {
+						logger.info("mouseUp in Skin");
 						return;
 					}
 
 					if (pressedHWKey.getKeyCode() != SkinUtil.UNKNOWN_KEYCODE) {
+						logger.info(pressedHWKey.getName() + " key is released");
+
 						/* send event */
 						KeyEventData keyEventData = new KeyEventData(
 								KeyEventType.RELEASED.value(), pressedHWKey.getKeyCode(), 0, 0);
@@ -456,8 +457,6 @@ public class ProfileSpecificSkinComposer implements ISkinComposer {
 			@Override
 			public void mouseDown(MouseEvent e) {
 				if (1 == e.button) { /* left button */
-					logger.info("mouseDown in Skin");
-
 					isGrabbedShell = true;
 					grabPosition.x = e.x;
 					grabPosition.y = e.y;
@@ -466,10 +465,13 @@ public class ProfileSpecificSkinComposer implements ISkinComposer {
 					final HWKey hwKey = SkinUtil.getHWKey(e.x, e.y,
 							currentState.getCurrentRotationId(), currentState.getCurrentScale());
 					if (hwKey == null) {
+						logger.info("mouseDown in Skin");
 						return;
 					}
 
 					if (hwKey.getKeyCode() != SkinUtil.UNKNOWN_KEYCODE) {
+						logger.info(hwKey.getName() + " key is pressed");
+
 						/* send event */
 						KeyEventData keyEventData = new KeyEventData(
 								KeyEventType.PRESSED.value(), hwKey.getKeyCode(), 0, 0);
diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java
index e040f3cb7f..6d267216a3 100644
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java
@@ -163,21 +163,23 @@ public class SkinUtil {
 			return null;
 		}
 
-		for (KeyMapType keyMap : keyMapList) {
-			RegionType region = keyMap.getRegion();
+		for (KeyMapType keyEntry : keyMapList) {
+			RegionType region = keyEntry.getRegion();
 
 			int scaledX = (int) (region.getLeft() * convertedScale);
 			int scaledY = (int) (region.getTop() * convertedScale);
 			int scaledWidth = (int) (region.getWidth() * convertedScale);
 			int scaledHeight = (int) (region.getHeight() * convertedScale);
 
-			if (isInGeometry(currentX, currentY, scaledX, scaledY, scaledWidth, scaledHeight)) {
-				EventInfoType eventInfo = keyMap.getEventInfo();
+			if (isInGeometry(currentX, currentY,
+					scaledX, scaledY, scaledWidth, scaledHeight)) {
+				EventInfoType eventInfo = keyEntry.getEventInfo();
 
-				HWKey hwKey = new HWKey();
-				hwKey.setKeyCode(eventInfo.getKeyCode());
-				hwKey.setRegion(new SkinRegion(scaledX, scaledY, scaledWidth, scaledHeight));
-				hwKey.setTooltip(keyMap.getTooltip());
+				HWKey hwKey = new HWKey(
+						keyEntry.getEventInfo().getKeyName(),
+						eventInfo.getKeyCode(),
+						new SkinRegion(scaledX, scaledY, scaledWidth, scaledHeight),
+						keyEntry.getTooltip());
 
 				return hwKey;
 			}