diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e633741c700..3a3f5679a52 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2921,7 +2921,7 @@
         <activity android:name="Settings$GestureSettingsActivity"
                   android:label="@string/gesture_preference_title"
                   android:icon="@drawable/ic_settings_gestures"
-                  android:taskAffinity="">
+                  android:enabled="@bool/config_gesture_settings_enabled">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="com.android.settings.SHORTCUT" />
diff --git a/res/values/config.xml b/res/values/config.xml
index 3491922529b..c8ea17158f0 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -52,4 +52,7 @@
     <string name="gesture_double_twist_sensor_name" translatable="false"></string>
     <string name="gesture_double_twist_sensor_vendor" translatable="false"></string>
 
+    <!-- When true enable gesture setting. -->
+    <bool name="config_gesture_settings_enabled">false</bool>
+
 </resources>