summaryrefslogtreecommitdiff
path: root/res/layout
diff options
context:
space:
mode:
authorLuke Shumaker <shumakl@purdue.edu>2014-05-05 03:07:05 -0400
committerLuke Shumaker <shumakl@purdue.edu>2014-05-05 03:07:05 -0400
commit821fc55980ff7e3b0afe1baefce62515f9db6200 (patch)
tree1e619dc5b9a03d5f6260edb5d00053980320fb1f /res/layout
parent8a9dab5a8faa9659f8ba610b1b176ceb09a16640 (diff)
stuff
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/dialog_rename.xml41
-rw-r--r--res/layout/gesture_create.xml (renamed from res/layout/create_gesture.xml)36
-rw-r--r--res/layout/gestures_list.xml12
-rw-r--r--res/layout/ime.xml5
4 files changed, 25 insertions, 69 deletions
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/create_gesture.xml b/res/layout/gesture_create.xml
index 89e64c6..2864bc7 100644
--- a/res/layout/create_gesture.xml
+++ b/res/layout/gesture_create.xml
@@ -22,12 +22,12 @@
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"
@@ -35,18 +35,19 @@
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"
@@ -54,34 +55,33 @@
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"
-
- android:enabled="false"
+ android:layout_weight="1"
+ style="?android:attr/buttonBarButtonStyle" />
- android:onClick="addGesture"
- android:text="@string/button_done" />
-
<Button
+ android:onClick="cancelGesture"
+ android:text="@string/button_discard"
+
android:layout_width="0dip"
android:layout_height="wrap_content"
- android:layout_weight="1"
-
- android:onClick="cancelGesture"
- android:text="@string/button_discard" />
+ android:layout_weight="1"
+ style="?android:attr/buttonBarButtonStyle" />
</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>