diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index f62487f06c72d..c0fa64f445a96 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -583,13 +583,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
         boolean smoothScrollbar = a.getBoolean(R.styleable.AbsListView_smoothScrollbar, true);
         setSmoothScrollbarEnabled(smoothScrollbar);
 
-        int defaultGestures = GESTURES_NONE;
-        if (useTextFilter) {
-            defaultGestures = GESTURES_FILTER;
-        } else if (enableFastScroll) {
-            defaultGestures = GESTURES_JUMP;
-        }
-        int gestures = a.getInt(R.styleable.AbsListView_gestures, defaultGestures);
+        int gestures = a.getInt(R.styleable.AbsListView_gestures, GESTURES_NONE);
         setGestures(gestures);
 
         a.recycle();
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 8c4b714c218c7..7a1603625fc1d 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -79,7 +79,7 @@
         <attr name="textColorPrimaryInverseNoDisable" format="reference|color" />
         <!-- Dim inverse text color. This does not differentiate the disabled state. -->
         <attr name="textColorSecondaryInverseNoDisable" format="reference|color" />
-        
+
         <!-- Text color for urls in search suggestions, used by things like global search and the browser. @hide -->
         <attr name="textColorSearchUrl" format="reference|color" />
 
@@ -97,9 +97,9 @@
         <!-- Text color, typeface, size, and style for "small" inverse text. Defaults to secondary inverse text color. -->
         <attr name="textAppearanceSmallInverse" format="reference" />
 
-        <!-- Text color, typeface, size, and style for system search result title. Defaults to primary inverse text color. @hide -->	
-        <attr name="textAppearanceSearchResultTitle" format="reference" />	
-        <!-- Text color, typeface, size, and style for system search result subtitle. Defaults to primary inverse text color. @hide -->	
+        <!-- Text color, typeface, size, and style for system search result title. Defaults to primary inverse text color. @hide -->
+        <attr name="textAppearanceSearchResultTitle" format="reference" />
+        <!-- Text color, typeface, size, and style for system search result subtitle. Defaults to primary inverse text color. @hide -->
         <attr name="textAppearanceSearchResultSubtitle" format="reference" />
 
 
@@ -669,7 +669,7 @@
     <attr name="x" format="dimension" />
     <!-- A coordinate in the Y dimension. -->
     <attr name="y" format="dimension" />
-          
+
     <!-- Specifies how to place the content of an object, both
          on the x and y axis, within the object itself. -->
     <attr name="gravity">
@@ -1386,12 +1386,9 @@
             <!-- No gesture -->
             <enum name="none" value="0" />
             <!-- Gestures jump to a specific position in the content. This requires
-                  fast scroll to be enabled. If fast scroll is enabled from XML,
-                  jump gestures will be enabled automatically. -->
+                  fast scroll to be enabled. -->
             <enum name="jump" value="1" />
-            <!-- Gestures filter the content. This requires text filtering to be enabled.
-                 If text filtering is enabled from XML, filter gestures will be enabled
-                 automatically. -->
+            <!-- Gestures filter the content. This requires text filtering to be enabled. -->
             <enum name="filter" value="2" />
         </attr>
     </declare-styleable>
@@ -2848,16 +2845,16 @@
             string will be placed in the data field of the {@link android.content.Intent Intent}
             when the user clicks a suggestion.  <i>Optional attribute.</i> -->
         <attr name="searchSuggestIntentData" format="string" />
-        
+
         <!-- If provided, this is the minimum number of characters needed to trigger
              search suggestions. The default value is 0. <i>Optional attribute.</i> -->
         <attr name="searchSuggestThreshold" format="integer" />
-        
+
         <!-- If provided and <code>true</code>, this searchable activity will be
              included in any global lists of search targets.
              The default value is <code>false</code>. <i>Optional attribute.</i>. -->
         <attr name="includeInGlobalSearch" format="boolean" />
-        
+
     </declare-styleable>
 
     <!-- In order to process special action keys during search, you must define them using
@@ -3290,7 +3287,6 @@
         <attr name="configure" format="string" />
     </declare-styleable>
 
-
     <!-- =============================== -->
     <!-- Accounts package class attributes -->
     <!-- =============================== -->
@@ -3316,6 +3312,5 @@
         <attr name="accountType"/>
     </declare-styleable>
 
-
 </resources>