omnirom · 1Jesper1 · Jan 14, 2022
diff --git a/Android.mk b/Android.mk
@@ -281,6 +281,9 @@ endif
 ifeq ($(TW_NO_EXFAT_FUSE), true)
     LOCAL_CFLAGS += -DTW_NO_EXFAT_FUSE
 endif
+ifeq ($(TW_NO_HAPTICS), true)
+    LOCAL_CFLAGS += -DTW_NO_HAPTICS
+endif
 ifeq ($(TW_INCLUDE_JB_CRYPTO), true)
     TW_INCLUDE_CRYPTO := true
 endif

diff --git a/data.cpp b/data.cpp
@@ -530,9 +530,16 @@ void DataManager::SetDefaultValues()
 	mConst.SetValue("false", "0");
 
 	mConst.SetValue(TW_VERSION_VAR, TW_VERSION_STR);
+
+#ifndef TW_NO_HAPTICS
 	mPersist.SetValue("tw_button_vibrate", "80");
 	mPersist.SetValue("tw_keyboard_vibrate", "40");
 	mPersist.SetValue("tw_action_vibrate", "160");
+	mConst.SetValue("tw_disable_haptics", "0");
+#else
+	LOGINFO("TW_NO_HAPTICS := true\n");
+	mConst.SetValue("tw_disable_haptics", "1");
+#endif
 
 	TWPartition *store = PartitionManager.Get_Default_Storage_Partition();
 	if (store)
@@ -1047,9 +1054,11 @@ string DataManager::GetSettingsStoragePath(void)
 
 void DataManager::Vibrate(const string& varName)
 {
+#ifndef TW_NO_HAPTICS
 	int vib_value = 0;
 	GetValue(varName, vib_value);
 	if (vib_value) {
 		vibrate(vib_value);
 	}
+#endif	
 }
diff --git a/gui/action.cpp b/gui/action.cpp
@@ -516,8 +516,10 @@ void GUIAction::operation_end(const int operation_status)
 	blankTimer.resetTimerAndUnblank();
 	property_set("twrp.action_complete", "1");
 	time(&Stop);
+#ifndef TW_NO_HAPTICS
 	if ((int) difftime(Stop, Start) > 10)
 		DataManager::Vibrate("tw_action_vibrate");
+#endif
 	LOGINFO("operation_end - status=%d\n", operation_status);
 }
 

diff --git a/gui/button.cpp b/gui/button.cpp
@@ -248,7 +248,9 @@ int GUIButton::NotifyTouch(TOUCH_STATE state, int x, int y)
 	} else {
 		if (last_state == 0) {
 			last_state = 1;
+		#ifndef TW_NO_HAPTICS
 			DataManager::Vibrate("tw_button_vibrate");
+		#endif
 			if (mButtonLabel != NULL)
 				mButtonLabel->isHighlighted = true;
 			if (mButtonImg != NULL)

diff --git a/gui/checkbox.cpp b/gui/checkbox.cpp
@@ -177,8 +177,9 @@ int GUICheckbox::NotifyTouch(TOUCH_STATE state, int x __unused, int y __unused)
 		DataManager::GetValue(mVarName, lastState);
 		lastState = (lastState == 0) ? 1 : 0;
 		DataManager::SetValue(mVarName, lastState);
-
+	#ifndef TW_NO_HAPTICS
 		DataManager::Vibrate("tw_button_vibrate");
+	#endif
 	}
 	return 0;
 }

diff --git a/gui/keyboard.cpp b/gui/keyboard.cpp
@@ -549,7 +549,9 @@ int GUIKeyboard::NotifyTouch(TOUCH_STATE state, int x, int y)
 			bool repeatKey = false;
 			Layout& lay = layouts[currentLayout - 1];
 			if (state == TOUCH_RELEASE && was_held == 0) {
+			#ifndef TW_NO_HAPTICS
 				DataManager::Vibrate("tw_keyboard_vibrate");
+			#endif
 				if (key.layout > 0) {
 					// Switch layouts
 					if (lay.is_caps && key.layout == lay.revert_layout && !CapsLockOn) {
@@ -593,7 +595,9 @@ int GUIKeyboard::NotifyTouch(TOUCH_STATE state, int x, int y)
 				was_held = 1;
 				if (key.longpresskey > 0) {
 					// Long Press Key
+				#ifndef TW_NO_HAPTICS
 					DataManager::Vibrate("tw_keyboard_vibrate");
+				#endif
 					PageManager::NotifyCharInput(key.longpresskey);
 				}
 				else

diff --git a/gui/patternpassword.cpp b/gui/patternpassword.cpp
@@ -371,7 +371,9 @@ int GUIPatternPassword::NotifyTouch(TOUCH_STATE state, int x, int y)
 			mTrackingTouch = true;
 			ResetActiveDots();
 			ConnectDot(dot_idx);
+		#ifndef TW_NO_HAPTICS
 			DataManager::Vibrate("tw_button_vibrate");
+		#endif
 			mCurLineX = x;
 			mCurLineY = y;
 			mNeedRender = true;
@@ -387,7 +389,9 @@ int GUIPatternPassword::NotifyTouch(TOUCH_STATE state, int x, int y)
 			{
 				ConnectIntermediateDots(dot_idx);
 				ConnectDot(dot_idx);
+			#ifndef TW_NO_HAPTICS
 				DataManager::Vibrate("tw_button_vibrate");
+			#endif
 			}
 
 			mCurLineX = x;

diff --git a/gui/scrolllist.cpp b/gui/scrolllist.cpp
@@ -504,8 +504,9 @@ int GUIScrollList::NotifyTouch(TOUCH_STATE state, int x, int y)
 			// We've selected an item!
 			NotifySelect(selectedItem);
 			mUpdate = 1;
-
+		#ifndef TW_NO_HAPTICS
 			DataManager::Vibrate("tw_button_vibrate");
+		#endif
 			selectedItem = NO_ITEM;
 		} else {
 			// Start kinetic scrolling

diff --git a/gui/slider.cpp b/gui/slider.cpp
@@ -205,8 +205,10 @@ int GUISlider::NotifyTouch(TOUCH_STATE state, int x, int y)
 			return 0;
 
 		if (sCurTouchX >= mRenderX + mRenderW - sTouchW) {
+	 	#ifndef TW_NO_HAPTICS
 			DataManager::Vibrate("tw_button_vibrate");
 			sAction->doActions();
+		#endif
 		}
 
 		sCurTouchX = mRenderX;

diff --git a/gui/terminal.cpp b/gui/terminal.cpp
@@ -527,7 +527,9 @@ class TerminalEngine
 		switch (ch)
 		{
 			case 7: // BEL
+			#ifndef TW_NO_HAPTICS
 				DataManager::Vibrate("tw_button_vibrate");
+			#endif
 				break;
 			case 8: // BS
 				left();

diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
@@ -3159,25 +3159,34 @@
 				<text>{@vibration_hdr=Vibration}</text>
 			</text>
 
+			<text style="text_m">
+				<condition var1="tw_disable_haptics" var2="1"/>
+				<placement x="col1_x_left" y="%row4_y%" w="%content_width%"/>
+				<text>{@vibration_disabled=Vibration Disabled for Device}</text>
+			</text>
+
 			<template name="tabs_settings"/>
 
 			<fill color="%text_color%">
 				<placement x="%tab5_col4_x%" y="%row_tab_y%" w="%tab5_width%" h="%tab_indicator_height%"/>
 			</fill>
 
 			<slidervalue>
+				<condition var1="tw_disable_haptics" var2="0"/>
 				<placement x="col1_x_left" y="%row4_y%" w="%content_width%"/>
 				<text>{@button_vibration=Button Vibration:}</text>
 				<data variable="tw_button_vibrate" min="0" max="300"/>
 			</slidervalue>
 
 			<slidervalue>
+				<condition var1="tw_disable_haptics" var2="0"/>
 				<placement x="col1_x_left" y="%row9_y%" w="%content_width%"/>
 				<text>{@kb_vibration=Keyboard Vibration:}</text>
 				<data variable="tw_keyboard_vibrate" min="0" max="300"/>
 			</slidervalue>
 
 			<slidervalue>
+				<condition var1="tw_disable_haptics" var2="0"/>
 				<placement x="col1_x_left" y="%row14_y%" w="%content_width%"/>
 				<text>{@act_vibration=Action Vibration:}</text>
 				<data variable="tw_action_vibrate" min="0" max="500"/>

diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
@@ -317,6 +317,7 @@
 		<string name="settings_tz_btn">Time Zone</string>
 		<string name="settings_screen_btn">Screen</string>
 		<string name="settings_screen_bright_btn">Screen Brightness</string>
+		<string name="vibration_disabled">Vibration is disabled for this device</string>
 		<string name="settings_vibration_btn">Vibration</string>
 		<string name="settings_language_btn">Language</string>
 		<string name="time_zone_hdr">Time Zone</string>

diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
@@ -3322,25 +3322,34 @@
 				<text>{@vibration_hdr=Vibration}</text>
 			</text>
 
+			<text style="text_m">
+				<condition var1="tw_disable_haptics" var2="1"/>
+				<placement x="%indent%" y="%row4_y%"/>
+				<text>{@vibration_disabled=Vibration Disabled for Device}</text>
+			</text>
+
 			<template name="tabs_settings"/>
 
 			<fill color="%text_color%">
 				<placement x="%tab5_col4_x%" y="%row_tab_y%" w="%tab5_width%" h="%tab_indicator_height%"/>
 			</fill>
 
 			<slidervalue>
+				<condition var1="tw_disable_haptics" var2="0"/>
 				<placement x="indent" y="%row4_y%" w="%content_width%"/>
 				<text>{@button_vibration=Button Vibration:}</text>
 				<data variable="tw_button_vibrate" min="0" max="300"/>
 			</slidervalue>
 
 			<slidervalue>
+				<condition var1="tw_disable_haptics" var2="0"/>
 				<placement x="indent" y="%row9_y%" w="%content_width%"/>
 				<text>{@kb_vibration=Keyboard Vibration:}</text>
 				<data variable="tw_keyboard_vibrate" min="0" max="300"/>
 			</slidervalue>
 
 			<slidervalue>
+				<condition var1="tw_disable_haptics" var2="0"/>
 				<placement x="indent" y="%row14_y%" w="%content_width%"/>
 				<text>{@act_vibration=Action Vibration:}</text>
 				<data variable="tw_action_vibrate" min="0" max="500"/>

diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
@@ -3532,6 +3532,7 @@
 			</button>
 
 			<button style="main_button">
+				<condition var1="tw_disable_haptics" var2="0"/>
 				<placement x="%col1_x_right%" y="%row6_y%"/>
 				<text>{@settings_vibration_btn=Vibration}</text>
 				<action function="page">settings_vibration</action>

diff --git a/minuitwrp/events.cpp b/minuitwrp/events.cpp
@@ -108,6 +108,7 @@ static inline int ABS(int x) {
     return x<0?-x:x;
 }
 
+#ifndef TW_NO_HAPTICS
 int vibrate(int timeout_ms)
 {
     char str[20];
@@ -129,6 +130,7 @@ int vibrate(int timeout_ms)
 
     return 0;
 }
+#endif
 
 /* Returns empty tokens */
 static char *vk_strtok_r(char *str, const char *delim, char **save_str)
@@ -715,9 +717,9 @@ static int vk_modify(struct ev *e, struct input_event *ev)
                 ev->value = 1;
 
                 last_virt_key = e->vks[i].scancode;
-
+            #ifndef TW_NO_HAPTICS
                 vibrate(VIBRATOR_TIME_MS);
-
+            #endif
                 // Mark that all further movement until lift is discard,
                 // and make sure we don't come back into this area
                 discard = 1;