From 821fc55980ff7e3b0afe1baefce62515f9db6200 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Mon, 5 May 2014 03:07:05 -0400
Subject: stuff

---
 res/layout/create_gesture.xml | 88 -------------------------------------------
 res/layout/dialog_rename.xml  | 41 --------------------
 res/layout/gesture_create.xml | 88 +++++++++++++++++++++++++++++++++++++++++++
 res/layout/gestures_list.xml  | 12 +++---
 res/layout/ime.xml            |  5 +--
 5 files changed, 95 insertions(+), 139 deletions(-)
 delete mode 100644 res/layout/create_gesture.xml
 delete mode 100644 res/layout/dialog_rename.xml
 create mode 100644 res/layout/gesture_create.xml

(limited to 'res')

diff --git a/res/layout/create_gesture.xml b/res/layout/create_gesture.xml
deleted file mode 100644
index 89e64c6..0000000
--- a/res/layout/create_gesture.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-
-        android:orientation="horizontal">
-    
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="6dip"
-            
-            android:text="@string/prompt_gesture_name"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-        
-        <EditText
-            android:id="@+id/gesture_name"
-            android:layout_width="0dip"
-            android:layout_weight="1.0"
-            android:layout_height="wrap_content"
-
-            android:maxLength="40"
-            android:singleLine="true" />
-
-    </LinearLayout>
-    
-    <android.gesture.GestureOverlayView
-        android:id="@+id/gestures_overlay"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1.0"
-
-        android:gestureStrokeType="multiple" />
-
-    <LinearLayout
-        style="@android:style/ButtonBar"
-
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-
-        android:orientation="horizontal">
-
-        <Button
-            android:id="@+id/done"
-                
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-
-            android:enabled="false"
-
-            android:onClick="addGesture"
-            android:text="@string/button_done" />
-    
-        <Button
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            
-            android:onClick="cancelGesture"
-            android:text="@string/button_discard" />
-    
-    </LinearLayout>
-    
-</LinearLayout>
diff --git a/res/layout/dialog_rename.xml b/res/layout/dialog_rename.xml
deleted file mode 100644
index 49df806..0000000
--- a/res/layout/dialog_rename.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="20dip"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/label"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:text="@string/gestures_rename_label"
-        android:gravity="left"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <EditText
-        android:id="@+id/name"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:scrollHorizontally="true"
-        android:autoText="false"
-        android:capitalize="none"
-        android:gravity="fill_horizontal"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-</LinearLayout>
diff --git a/res/layout/gesture_create.xml b/res/layout/gesture_create.xml
new file mode 100644
index 0000000..2864bc7
--- /dev/null
+++ b/res/layout/gesture_create.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    
+    android:orientation="vertical">
+
+    <!-- The "Name" bar at the top -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+    	<!-- The prompt -->
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="6dip"
+            
+            android:text="@string/prompt_gesture_name"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+        <!-- The input -->
+        <EditText
+            android:id="@+id/gesture_name"
+            android:layout_width="0dip"
+            android:layout_weight="1.0"
+            android:layout_height="wrap_content"
+            android:inputType="text"
+
+            android:maxLength="40"
+            android:singleLine="true" />
+
+    </LinearLayout>
+    <!-- The gesture input -->
+    <android.gesture.GestureOverlayView
+        android:id="@+id/gestures_overlay"
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1.0"
+
+        android:gestureStrokeType="multiple" />
+	<!-- The "add" and "cancel" buttons -->
+    <LinearLayout
+        style="@android:style/ButtonBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/done"
+            android:onClick="addGesture"
+            android:text="@string/button_done" 
+            
+            android:enabled="false"
+            
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+			android:layout_weight="1"
+            style="?android:attr/buttonBarButtonStyle" />
+
+        <Button
+            android:onClick="cancelGesture"
+            android:text="@string/button_discard"
+            
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+			android:layout_weight="1"
+            style="?android:attr/buttonBarButtonStyle" />
+    
+    </LinearLayout>
+    
+</LinearLayout>
diff --git a/res/layout/gestures_list.xml b/res/layout/gestures_list.xml
index d0b5e3d..bdbe1f5 100644
--- a/res/layout/gestures_list.xml
+++ b/res/layout/gestures_list.xml
@@ -50,24 +50,22 @@
         <Button
             android:id="@+id/addButton"
             android:onClick="addGesture"
+			android:text="@string/button_add" 
 
             android:layout_width="0dip"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-
-            android:enabled="false"
-            android:text="@string/button_add" />
+            style="?android:attr/buttonBarButtonStyle" />
 
         <Button
             android:id="@+id/reloadButton"
             android:onClick="reloadGestures"
+            android:text="@string/button_reload" 
 
             android:layout_width="0dip"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-
-            android:enabled="false"
-            android:text="@string/button_reload" />
+			android:layout_weight="1"
+            style="?android:attr/buttonBarButtonStyle" />
 
     </LinearLayout>
 
diff --git a/res/layout/ime.xml b/res/layout/ime.xml
index c5e78ef..34bbd6d 100644
--- a/res/layout/ime.xml
+++ b/res/layout/ime.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     
-    <us.minak.DrawingSpaceView
+    <us.minak.IMEGestureOverlayView
         android:id="@+id/drawing_space"
         android:layout_width="wrap_content"
         android:layout_height="200dp"
@@ -15,7 +15,6 @@
         android:gestureStrokeAngleThreshold="0.0"
         android:gestureStrokeLengthThreshold="0.0"
         android:gestureStrokeSquarenessThreshold="0.0"
-        android:gestureStrokeType="multiple">
-	</us.minak.DrawingSpaceView>
+        android:gestureStrokeType="multiple" />
 
 </us.minak.IMEView>
-- 
cgit v1.2.3-54-g00ecf