PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expansion of vibrate options" into android-4.4

Browse Source
This commit is contained in:
Ethan Yonker
2014-02-07 19:39:13 +01:00
committed by Gerrit Code Review
parent 50b24dd57c 03db326c64
commit 75de542490
19 changed files with 804 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data.cpp
+3 -1
View File
@@ -583,7 +583,9 @@ void DataManager::SetDefaultValues()
mConstValues.insert(make_pair(TW_VERSION_VAR, TW_VERSION_STR));
mValues.insert(make_pair("tw_storage_path", make_pair("/", 1)));
mValues.insert(make_pair("tw_vibrate", make_pair("80", 1)));
mValues.insert(make_pair("tw_button_vibrate", make_pair("80", 1)));
mValues.insert(make_pair("tw_keyboard_vibrate", make_pair("40", 1)));
mValues.insert(make_pair("tw_action_vibrate", make_pair("160", 1)));
#ifdef TW_FORCE_CPUINFO_FOR_DEVICE_ID
printf("TW_FORCE_CPUINFO_FOR_DEVICE_ID := true\n");
gui/action.cpp
+1 -1
View File
@@ -348,7 +348,7 @@ void GUIAction::operation_end(const int operation_status, const int simulate)
#endif
time(&Stop);
if ((int) difftime(Stop, Start) > 10)
DataManager::Vibrate("tw_vibrate");
DataManager::Vibrate("tw_action_vibrate");
}
int GUIAction::doAction(Action action, int isThreaded /* = 0 */)
gui/button.cpp
+1 -1
View File
@@ -281,7 +281,7 @@ int GUIButton::NotifyTouch(TOUCH_STATE state, int x, int y)
} else {
if (last_state == 0) {
last_state = 1;
DataManager::Vibrate("tw_vibrate");
DataManager::Vibrate("tw_button_vibrate");
if (mButtonLabel != NULL)
mButtonLabel->isHighlighted = true;
if (mButtonImg != NULL)
gui/devices/1024x600/res/ui.xml
+64 -9
View File
@@ -2428,6 +2428,24 @@
<action function="page">timezone</action>
</object>
<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%" />
@@ -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" />
gui/devices/1024x768/res/ui.xml
+64 -9
View File
@@ -2428,6 +2428,24 @@
<action function="page">timezone</action>
</object>
<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%" />
@@ -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" />
gui/devices/1080x1920/res/ui.xml
+18 -2
View File
@@ -2684,8 +2684,24 @@
<object type="slidervalue">
<placement x="col1_x" y="%row4_text_y%" w="%slidervalue_w%" />
<font resource="font" color="%text_color%" />
<text>Vibration Value : </text>
<data variable="tw_vibrate" min="0" max="300" />
<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="col1_x" y="%row8_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="col1_x" y="%row12_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>
gui/devices/1200x1920/res/ui.xml
+56 -1
View File
@@ -2459,7 +2459,16 @@
</object>
<object type="button">
<placement x="%col_center_x%" y="%row4_y%" />
<highlight color="%highlight_color%" />
<placement x="%col2_x%" y="%row4_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">
<placement x="%col_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Restore Defaults</text>
<image resource="main_button" />
@@ -2666,6 +2675,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_header_y%" placement="5" />
<text>Vibration Settings :</text>
</object>
<object type="slidervalue">
<placement x="col1_x" y="%row4_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="col1_x" y="%row8_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="col1_x" y="%row12_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" />
gui/devices/1280x800/res/ui.xml
+64 -9
View File
@@ -2428,6 +2428,24 @@
<action function="page">timezone</action>
</object>
<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%" />
@@ -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" />
gui/devices/1920x1200/res/ui.xml
+64 -9
View File
@@ -2428,6 +2428,24 @@
<action function="page">timezone</action>
</object>
<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%" />
@@ -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" />
gui/devices/2560x1600/res/ui.xml
+64 -9
View File
@@ -2428,6 +2428,24 @@
<action function="page">timezone</action>
</object>
<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%" />
@@ -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" />
gui/devices/320x480/res/ui.xml
+56 -1
View File
@@ -2443,7 +2443,16 @@
</object>
<object type="button">
<placement x="%col_center_x%" y="%row4_y%" />
<highlight color="%highlight_color%" />
<placement x="%col2_x%" y="%row4_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">
<placement x="%col_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Restore Defaults</text>
<image resource="main_button" />
@@ -2650,6 +2659,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_header_y%" placement="5" />
<text>Vibration Settings :</text>
</object>
<object type="slidervalue">
<placement x="col1_x" y="%row4_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="col1_x" y="%row8_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="col1_x" y="%row12_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" />
gui/devices/480x800/res/ui.xml
+56 -1
View File
@@ -2443,7 +2443,16 @@
</object>
<object type="button">
<placement x="%col_center_x%" y="%row4_y%" />
<highlight color="%highlight_color%" />
<placement x="%col2_x%" y="%row4_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">
<placement x="%col_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Restore Defaults</text>
<image resource="main_button" />
@@ -2650,6 +2659,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_header_y%" placement="5" />
<text>Vibration Settings :</text>
</object>
<object type="slidervalue">
<placement x="col1_x" y="%row4_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="col1_x" y="%row8_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="col1_x" y="%row12_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" />
gui/devices/480x854/res/ui.xml
+56 -1
View File
@@ -2442,7 +2442,16 @@
</object>
<object type="button">
<placement x="%col_center_x%" y="%row4_y%" />
<highlight color="%highlight_color%" />
<placement x="%col2_x%" y="%row4_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">
<placement x="%col_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Restore Defaults</text>
<image resource="main_button" />
@@ -2649,6 +2658,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_header_y%" placement="5" />
<text>Vibration Settings :</text>
</object>
<object type="slidervalue">
<placement x="col1_x" y="%row4_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="col1_x" y="%row8_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="col1_x" y="%row12_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" />
gui/devices/540x960/res/ui.xml
+56 -1
View File
@@ -2443,7 +2443,16 @@
</object>
<object type="button">
<placement x="%col_center_x%" y="%row4_y%" />
<highlight color="%highlight_color%" />
<placement x="%col2_x%" y="%row4_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">
<placement x="%col_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Restore Defaults</text>
<image resource="main_button" />
@@ -2650,6 +2659,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_header_y%" placement="5" />
<text>Vibration Settings :</text>
</object>
<object type="slidervalue">
<placement x="col1_x" y="%row4_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="col1_x" y="%row8_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="col1_x" y="%row12_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" />
gui/devices/720x1280/res/ui.xml
+56 -1
View File
@@ -2456,7 +2456,16 @@
</object>
<object type="button">
<placement x="%col_center_x%" y="%row4_y%" />
<highlight color="%highlight_color%" />
<placement x="%col2_x%" y="%row4_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">
<placement x="%col_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Restore Defaults</text>
<image resource="main_button" />
@@ -2663,6 +2672,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_header_y%" placement="5" />
<text>Vibration Settings :</text>
</object>
<object type="slidervalue">
<placement x="col1_x" y="%row4_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="col1_x" y="%row8_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="col1_x" y="%row12_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" />
gui/devices/800x1280/res/ui.xml
+56 -1
View File
@@ -2444,7 +2444,16 @@
</object>
<object type="button">
<placement x="%col_center_x%" y="%row4_y%" />
<highlight color="%highlight_color%" />
<placement x="%col2_x%" y="%row4_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">
<placement x="%col_x%" y="%row4_y%" />
<font resource="font" color="%button_text_color%" />
<text>Restore Defaults</text>
<image resource="main_button" />
@@ -2651,6 +2660,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_header_y%" placement="5" />
<text>Vibration Settings :</text>
</object>
<object type="slidervalue">
<placement x="col1_x" y="%row4_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="col1_x" y="%row8_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="col1_x" y="%row12_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" />
gui/devices/800x480/res/ui.xml
+64 -9
View File
@@ -2436,6 +2436,24 @@
<action function="page">timezone</action>
</object>
<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%" />
@@ -2445,15 +2463,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>
@@ -2660,6 +2669,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" />
gui/keyboard.cpp
+2 -2
View File
@@ -389,7 +389,6 @@ int GUIKeyboard::NotifyTouch(TOUCH_STATE state, int x, int y)
switch (state)
{
case TOUCH_START:
DataManager::Vibrate("tw_vibrate");
if (GetSelection(x, y) == 0) {
startSelection = -1;
was_held = 0;
@@ -421,7 +420,6 @@ int GUIKeyboard::NotifyTouch(TOUCH_STATE state, int x, int y)
if (highlightRenderCount != 0)
mRendered = false;
highlightRenderCount = 0;
DataManager::Vibrate("tw_vibrate");
startSelection = 0;
}
break;
@@ -478,6 +476,7 @@ int GUIKeyboard::NotifyTouch(TOUCH_STATE state, int x, int y)
startSelection = 0;
break;
} else if (state == TOUCH_RELEASE && was_held == 0) {
DataManager::Vibrate("tw_keyboard_vibrate");
if ((int)keyboard_keys[currentLayout - 1][rowIndex][indexx].key < KEYBOARD_SPECIAL_KEYS && (int)keyboard_keys[currentLayout - 1][rowIndex][indexx].key > 0) {
// Regular key
PageManager::NotifyKeyboard(keyboard_keys[currentLayout - 1][rowIndex][indexx].key);
@@ -503,6 +502,7 @@ int GUIKeyboard::NotifyTouch(TOUCH_STATE state, int x, int y)
PageManager::NotifyKeyboard(keyboard_keys[currentLayout - 1][rowIndex][indexx].key);
} else if ((int)keyboard_keys[currentLayout - 1][rowIndex][indexx].longpresskey < KEYBOARD_SPECIAL_KEYS && (int)keyboard_keys[currentLayout - 1][rowIndex][indexx].longpresskey > 0) {
// Long Press Key
DataManager::Vibrate("tw_keyboard_vibrate");
PageManager::NotifyKeyboard(keyboard_keys[currentLayout - 1][rowIndex][indexx].longpresskey);
}
} else if (state == TOUCH_REPEAT) {
gui/slider.cpp
+3 -2
View File
@@ -154,12 +154,13 @@ int GUISlider::NotifyTouch(TOUCH_STATE state, int x, int y)
break;
case TOUCH_RELEASE:
DataManager::Vibrate("tw_button_vibrate");
if (!dragging)
return 0;
if (sCurTouchX >= mRenderX + mRenderW - sTouchW)
if (sCurTouchX >= mRenderX + mRenderW - sTouchW) {
DataManager::Vibrate("tw_button_vibrate");
sAction->doActions();
}
sCurTouchX = mRenderX;
dragging = false;