Expansion of vibrate options
Improve location / timing of vibration
Split out vibrate settings for buttons, keyboard, and long actions
Change-Id: I282825cc5f3e44ed6dcabe65dc1f4cb21b407b67
diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml
index fb615c1..e4bfd69 100644
--- a/gui/devices/1920x1200/res/ui.xml
+++ b/gui/devices/1920x1200/res/ui.xml
@@ -2430,6 +2430,24 @@
<object type="button">
<highlight color="%highlight_color%" />
+ <placement x="%col2_x%" y="%row2_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text>Restore Defaults</text>
+ <image resource="main_button" />
+ <action function="restoredefaultsettings"></action>
+ </object>
+
+ <object type="button">
+ <highlight color="%highlight_color%" />
+ <placement x="%col3_x%" y="%row2_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text>Vibration Duration</text>
+ <image resource="main_button" />
+ <action function="page">Vibrate</action>
+ </object>
+
+ <object type="button">
+ <highlight color="%highlight_color%" />
<placement x="%col4_x%" y="%row2_y%" />
<font resource="font" color="%button_text_color%" />
<text>Screen</text>
@@ -2437,15 +2455,6 @@
<action function="page">screen</action>
</object>
- <object type="button">
- <highlight color="%highlight_color%" />
- <placement x="%col_center_x%" y="%slider_y%" />
- <font resource="font" color="%button_text_color%" />
- <text>Restore Defaults</text>
- <image resource="main_button" />
- <action function="restoredefaultsettings"></action>
- </object>
-
<object type="action">
<touch key="home" />
<action function="page">main</action>
@@ -2652,6 +2661,52 @@
<object type="template" name="footer" />
</page>
+ <page name="Vibrate">
+ <object type="template" name="header" />
+
+ <object type="text" color="%text_color%">
+ <font resource="font" />
+ <placement x="%center_x%" y="%row1_text_y%" placement="5" />
+ <text>Vibration Settings :</text>
+ </object>
+
+ <object type="slidervalue">
+ <placement x="slidervalue_x" y="%row3_text_y%" w="%slidervalue_w%" />
+ <font resource="font" color="%text_color%" />
+ <text>Button Vibration:</text>
+ <data variable="tw_button_vibrate" min="0" max="300" />
+ <colors line="%slidervalue_line_clr%" slider="%slidervalue_slider_clr%" />
+ </object>
+
+ <object type="slidervalue">
+ <placement x="slidervalue_x" y="%row7_text_y%" w="%slidervalue_w%" />
+ <font resource="font" color="%text_color%" />
+ <text>Keyboard Vibration:</text>
+ <data variable="tw_keyboard_vibrate" min="0" max="300" />
+ <colors line="%slidervalue_line_clr%" slider="%slidervalue_slider_clr%" />
+ </object>
+
+ <object type="slidervalue">
+ <placement x="slidervalue_x" y="%row11_text_y%" w="%slidervalue_w%" />
+ <font resource="font" color="%text_color%" />
+ <text>Action Vibration:</text>
+ <data variable="tw_action_vibrate" min="0" max="500" />
+ <colors line="%slidervalue_line_clr%" slider="%slidervalue_slider_clr%" />
+ </object>
+
+ <object type="action">
+ <touch key="home" />
+ <action function="page">main</action>
+ </object>
+
+ <object type="action">
+ <touch key="back" />
+ <action function="page">settings</action>
+ </object>
+
+ <object type="template" name="footer" />
+ </page>
+
<page name="advanced">
<object type="template" name="header" />