diff options
author | AndrewMurrell <amurrel@purdue.edu> | 2014-05-06 22:26:49 -0400 |
---|---|---|
committer | AndrewMurrell <amurrel@purdue.edu> | 2014-05-06 22:26:49 -0400 |
commit | cc0db6ceec33742b018a989d4b9bbf046418ca9f (patch) | |
tree | 10dc54fc3d57a4e589dedf6c8f62106bc757216e /res | |
parent | a0ac4d4cf9e31bbe019d29ddb6f514a9e3edcc73 (diff) | |
parent | 44fa9b5b07062c165192a50fea4301e57d3424ba (diff) |
Merge branch 'master' of https://github.com/AndrewMurrell/minak
Conflicts:
src/us/minak/IMEView.java
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/ime.xml | 49 | ||||
-rw-r--r-- | res/values/colors.xml | 2 |
2 files changed, 6 insertions, 45 deletions
diff --git a/res/layout/ime.xml b/res/layout/ime.xml index fc9e80d..83be9d2 100644 --- a/res/layout/ime.xml +++ b/res/layout/ime.xml @@ -3,60 +3,21 @@ android:layout_width="match_parent" android:layout_height="match_parent" > - <LinearLayout - android:id="@+id/left_panel" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:orientation="vertical" > - - <Button - android:id="@+id/shift_btn" - android:text="@string/button_shift" - android:layout_width="85dp" - android:layout_height="85dp" - android:layout_marginBottom="10dp" - android:layout_marginTop="5dp" /> - </LinearLayout> - <us.minak.IMEGestureOverlayView android:id="@+id/drawing_space" - android:layout_width="wrap_content" + + android:layout_width="fill_parent" android:layout_height="200dp" android:layout_centerInParent="true" - android:layout_toLeftOf="@+id/right_panel" - android:layout_toRightOf="@+id/left_panel" + android:fadeDuration="300" android:fadeEnabled="true" android:fadeOffset="200" - android:gestureColor="#000" + + android:gestureColor="@color/gesture_color" android:gestureStrokeAngleThreshold="0.0" android:gestureStrokeLengthThreshold="0.0" android:gestureStrokeSquarenessThreshold="0.0" android:gestureStrokeType="multiple" /> - <LinearLayout - android:id="@+id/right_panel" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:orientation="vertical" > - - <Button - android:id="@+id/backspace_btn" - android:text="@string/button_backspace" - android:layout_width="85dp" - android:layout_height="85dp" - android:layout_marginBottom="5dp" - android:layout_marginTop="10dp" /> - - <Button - android:id="@+id/space_btn" - android:text="@string/button_space" - android:layout_width="85dp" - android:layout_height="85dp" - android:layout_marginBottom="10dp" - android:layout_marginTop="5dp" /> - </LinearLayout> - </us.minak.IMEView> diff --git a/res/values/colors.xml b/res/values/colors.xml index ca6e02a..9302529 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <color name="gesture_color">#FFFFFF00</color> + <color name="gesture_color">#CC5B59AB</color> </resources> |