Merge "Adds the Swipe Up settings page under gestures" into pi-dev

diff --cc res/xml/gestures.xml
Simple merge

diff --cc src/com/android/settings/gestures/GestureSettings.java
index 439819c,9856e4e..ec0577b
--- 1/src/com/android/settings/gestures/GestureSettings.java
--- 2/src/com/android/settings/gestures/GestureSettings.java
+++ b/src/com/android/settings/gestures/GestureSettings.java
@@@ -96,9 -116,9 +97,10 @@@ public class GestureSettings extends Da
                      keys.add(KEY_SWIPE_DOWN);
                      keys.add(KEY_DOUBLE_TAP_POWER);
                      keys.add(KEY_DOUBLE_TWIST);
+                     keys.add(KEY_SWIPE_UP);
                      keys.add(KEY_DOUBLE_TAP_SCREEN);
                      keys.add(KEY_PICK_UP);
 +                    keys.add(KEY_PREVENT_RINGING);
  
                      return keys;
                  }

diff --cc src/com/android/settings/search/SearchIndexableResourcesImpl.java
Simple merge