Refactor: Keyboard2View: Take layout id attr

Removes EmojiBottomRow.

2 files changed, 6 insertions, 15 deletions

diff --git a/srcs/juloo.keyboard2/EmojiBottomRow.java b/srcs/juloo.keyboard2/EmojiBottomRow.java
deleted file mode 100644
index 737367c..0000000
--- a/srcs/juloo.keyboard2/EmojiBottomRow.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package juloo.keyboard2;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-public class EmojiBottomRow extends Keyboard2View
-{
-  public EmojiBottomRow(Context context, AttributeSet attrs)
-  {
-    super(context, attrs);
-    KeyboardData kw = KeyboardData.load(getResources(), R.xml.emoji_bottom_row);
-    setKeyboard(kw);
-  }
-}
diff --git a/srcs/juloo.keyboard2/Keyboard2View.java b/srcs/juloo.keyboard2/Keyboard2View.java
index 205bbae..f9712e1 100644
--- a/srcs/juloo.keyboard2/Keyboard2View.java
+++ b/srcs/juloo.keyboard2/Keyboard2View.java
@@ -54,7 +54,12 @@ public class Keyboard2View extends View
     _pointers = new Pointers(this, _config);
     refresh_navigation_bar(context);
     setOnTouchListener(this);
-    reset();
+    int layout_id = (attrs == null) ? 0 :
+      attrs.getAttributeResourceValue(null, "layout", 0);
+    if (layout_id == 0)
+      reset();
+    else
+      setKeyboard(KeyboardData.load(getResources(), layout_id));
   }
 
   private Window getParentWindow(Context context)