android 手势，快速打开相机，默认关闭修改

diff --git a/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index afcae19..8915200 100755
--- a/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -252,4 +252,7 @@
 
     <!-- Default for Settings.System.TIME_12_24 -->
     <string name="def_time_format" translatable="false">12</string>
+    <!--jicong.wang add for bug 18497 start {@-->
+    <integer name="def_camera_double_tap_power_gesture_disable">1</integer>
+    <!--jicong.wang add for bug 18497 end @}-->
 </resources>
diff --git a/frameworks/base/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/frameworks/base/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 3b0592a..77747d4 100755
--- a/frameworks/base/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/frameworks/base/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -2402,6 +2402,10 @@ class DatabaseHelper extends SQLiteOpenHelper {
 
             loadIntegerSetting(stmt, Settings.Secure.SLEEP_TIMEOUT,
                     R.integer.def_sleep_timeout);
+            /*jicong.wang modify for bug 18497 start {@*/
+            loadIntegerSetting(stmt,Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,
+                    R.integer.def_camera_double_tap_power_gesture_disable);
+            /*jicong.wang modify for bug 18497 end @}*/
 
             /*
              * IMPORTANT: Do not add any more upgrade steps here as the global,