commit 1de7559bdcbca5d6841d32537d4f13e46bea8f68
author Doris Ling <dling@google.com> Mon Jul 11 22:28:52 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jul 11 22:28:52 2016 +0000
tree f0f1b73d9fc8a05568d8e0a718a537800d9d16cd
parent 932b49408d19b680fbc27d76ab39ca4b81f1b968
parent 709aa539c8e8a244c014dfcf6693592d40dc16ea

Merge \"Disable Gestures Settings by default.\" into nyc-mr1-dev
am: 709aa539c8

Change-Id: I164c244613a9d58b7e2f5ec37d144385d577ccdd

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f0110fe..5b818cc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2923,7 +2923,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" />

res/values/config.xml

diff --git a/res/values/config.xml b/res/values/config.xml
index 3491922..c8ea171 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>