From 03cc0a54297a758f0ba0f1a7ba8aed0040413a5c Mon Sep 17 00:00:00 2001
From: jaguillo
Date: Sun, 11 Oct 2015 15:30:39 +0200
Subject: Key to switch to numeric pane

---
 srcs/juloo.keyboard2/Keyboard2View.java | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'srcs/juloo.keyboard2/Keyboard2View.java')

diff --git a/srcs/juloo.keyboard2/Keyboard2View.java b/srcs/juloo.keyboard2/Keyboard2View.java
index b10c1fb..5d21759 100644
--- a/srcs/juloo.keyboard2/Keyboard2View.java
+++ b/srcs/juloo.keyboard2/Keyboard2View.java
@@ -102,15 +102,12 @@ public class Keyboard2View extends View
 		_marginBottom = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, prefs.getInt("margin_bottom", (int)_marginBottom), getResources().getDisplayMetrics());
 		_keyHeight = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, prefs.getInt("key_height", (int)_keyHeight), getResources().getDisplayMetrics());
 		_horizontalMargin = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, prefs.getInt("horizontal_margin", (int)_horizontalMargin), getResources().getDisplayMetrics());
+		reset();
+	}
 
-		String				keyboardLayout = prefs.getString("keyboard_layout", null);
-		int					xmlRes = 0;
-
-		if (keyboardLayout != null)
-			xmlRes = ime.getResources().getIdentifier(keyboardLayout, "xml", ime.getPackageName());
-		if (xmlRes == 0)
-			xmlRes = R.xml.azerty;
-		_keyboard = new KeyboardData(ime.getResources().getXml(xmlRes));
+	public void			setKeyboard(KeyboardData keyboard)
+	{
+		_keyboard = keyboard;
 		reset();
 	}
 
-- 
cgit v1.2.3