From 3d3aa4bc98ccaabcc71f3360c8bd53eea64cd093 Mon Sep 17 00:00:00 2001
From: juloo <juloo.dsi@gmail.com>
Date: Sun, 2 Aug 2015 23:36:22 +0200
Subject: [PATCH] Nothing

---
 res/layout/input.xml                    | 4 ----
 srcs/juloo.keyboard2/Keyboard2View.java | 6 +++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/res/layout/input.xml b/res/layout/input.xml
index 2024057..c3fe863 100644
--- a/res/layout/input.xml
+++ b/res/layout/input.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <juloo.keyboard2.Keyboard2View xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/keyboard2"
-	android:layout_alignParentBottom="true"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
 	android:background="@color/bg"
 />
diff --git a/srcs/juloo.keyboard2/Keyboard2View.java b/srcs/juloo.keyboard2/Keyboard2View.java
index c2d9f85..705394d 100644
--- a/srcs/juloo.keyboard2/Keyboard2View.java
+++ b/srcs/juloo.keyboard2/Keyboard2View.java
@@ -39,14 +39,12 @@ public class Keyboard2View extends View
 	public Keyboard2View(Context context, AttributeSet attrs)
 	{
 		super(context, attrs);
-		DisplayMetrics dm = context.getResources().getDisplayMetrics();
 		_verticalMargin = getResources().getDimension(R.dimen.vertical_margin);
 		_horizontalMargin = getResources().getDimension(R.dimen.horizontal_margin);
 		_keyHeight = getResources().getDimension(R.dimen.key_height);
 		_keyPadding = getResources().getDimension(R.dimen.key_padding);
 		_keyBgPadding = getResources().getDimension(R.dimen.key_bg_padding);
 		_keyRound = getResources().getDimension(R.dimen.key_round);
-		_keyWidth = (dm.widthPixels - (_horizontalMargin * 2)) / KEY_PER_ROW;
 		_keyBgPaint.setColor(getResources().getColor(R.color.key_bg));
 		_keyDownBgPaint.setColor(getResources().getColor(R.color.key_down_bg));
 		_keyLabelPaint.setColor(getResources().getColor(R.color.key_label));
@@ -203,6 +201,7 @@ public class Keyboard2View extends View
 	@Override
 	public void			onMeasure(int wSpec, int hSpec)
 	{
+		DisplayMetrics		dm = getContext().getResources().getDisplayMetrics();
 		int					height;
 
 		if (_keyboard.getRows() == null)
@@ -210,7 +209,8 @@ public class Keyboard2View extends View
 		else
 			height = (int)(_keyHeight * ((float)_keyboard.getRows().size())
 				+ (_verticalMargin * 2));
-		setMeasuredDimension(MeasureSpec.getSize(wSpec), height);
+		setMeasuredDimension(dm.widthPixels, height);
+		_keyWidth = (getWidth() - (_horizontalMargin * 2)) / KEY_PER_ROW;
 	}
 
 	@Override