diff --git a/api/current.xml b/api/current.xml
index 24febda326d13..c7bdc4c1a6386 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -7830,39 +7830,6 @@
  visibility="public"
 >
 </field>
-<field name="stripEnabled"
- type="int"
- transient="false"
- volatile="false"
- value="16843454"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="stripLeft"
- type="int"
- transient="false"
- volatile="false"
- value="16843452"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="stripRight"
- type="int"
- transient="false"
- volatile="false"
- value="16843453"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="suggestActionMsg"
  type="int"
  transient="false"
@@ -7951,6 +7918,39 @@
  visibility="public"
 >
 </field>
+<field name="tabStripEnabled"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843454"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="tabStripLeft"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843452"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="tabStripRight"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843453"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="tabWidgetStyle"
  type="int"
  transient="false"
diff --git a/core/java/android/view/HapticFeedbackConstants.java b/core/java/android/view/HapticFeedbackConstants.java
index d31c8dc0e222e..8f402605a9b68 100644
--- a/core/java/android/view/HapticFeedbackConstants.java
+++ b/core/java/android/view/HapticFeedbackConstants.java
@@ -34,11 +34,6 @@ public class HapticFeedbackConstants {
      * The user has pressed on a virtual on-screen key.
      */
     public static final int VIRTUAL_KEY = 1;
-
-    /**
-     * The user has hit the barrier point while scrolling a view.
-     */
-    public static final int SCROLL_BARRIER = 2;
     
     /**
      * The user has pressed a soft keyboard key.
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 7e748c00a5f70..4744c64e063d6 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -8771,14 +8771,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
             newScrollY = top;
             clampedY = true;
         }
-        
-        // Bump the device with some haptic feedback if we're at the edge,
-        // didn't start there, and the scroll is the result of a touch event.
-        if (isTouchEvent &&
-                ((overscrollHorizontal && clampedX && scrollX != left && scrollX != right) ||
-                (overscrollVertical && clampedY && scrollY != top && scrollY != bottom))) {
-            performHapticFeedback(HapticFeedbackConstants.SCROLL_BARRIER);
-        }
 
         onOverscrolled(newScrollX, newScrollY, clampedX, clampedY);
         
diff --git a/core/java/android/widget/TabWidget.java b/core/java/android/widget/TabWidget.java
index 5a133fc79ad0f..4e1b5856e156c 100644
--- a/core/java/android/widget/TabWidget.java
+++ b/core/java/android/widget/TabWidget.java
@@ -42,9 +42,9 @@ import android.view.View.OnFocusChangeListener;
  * called on the containing TabHost object.
  * 
  * @attr ref android.R.styleable#TabWidget_divider
- * @attr ref android.R.styleable#TabWidget_stripEnabled
- * @attr ref android.R.styleable#TabWidget_stripLeft
- * @attr ref android.R.styleable#TabWidget_stripRight
+ * @attr ref android.R.styleable#TabWidget_tabStripEnabled
+ * @attr ref android.R.styleable#TabWidget_tabStripLeft
+ * @attr ref android.R.styleable#TabWidget_tabStripRight
  */
 public class TabWidget extends LinearLayout implements OnFocusChangeListener {
     private OnTabSelectionChanged mSelectionChangedListener;
@@ -76,10 +76,10 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener {
             context.obtainStyledAttributes(attrs, com.android.internal.R.styleable.TabWidget,
                     defStyle, 0);
 
-        mDrawBottomStrips = a.getBoolean(R.styleable.TabWidget_stripEnabled, true);
+        mDrawBottomStrips = a.getBoolean(R.styleable.TabWidget_tabStripEnabled, true);
         mDividerDrawable = a.getDrawable(R.styleable.TabWidget_divider);
-        mLeftStrip = a.getDrawable(R.styleable.TabWidget_stripLeft);
-        mRightStrip = a.getDrawable(R.styleable.TabWidget_stripRight);
+        mLeftStrip = a.getDrawable(R.styleable.TabWidget_tabStripLeft);
+        mRightStrip = a.getDrawable(R.styleable.TabWidget_tabStripRight);
 
         a.recycle();
 
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 06e9bbf83a2e7..f92dd9b20ff4f 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -1874,11 +1874,11 @@
         <!-- Drawable used to draw the divider between tabs. -->
         <attr name="divider" />
         <!-- Determines whether the strip under the tab indicators is drawn or not. -->
-        <attr name="stripEnabled" format="boolean" />
+        <attr name="tabStripEnabled" format="boolean" />
         <!-- Drawable used to draw the left part of the strip underneath the tabs. -->
-        <attr name="stripLeft" format="reference" />
+        <attr name="tabStripLeft" format="reference" />
         <!-- Drawable used to draw the right part of the strip underneath the tabs. -->
-        <attr name="stripRight" format="reference" />
+        <attr name="tabStripRight" format="reference" />
     </declare-styleable>
     <declare-styleable name="TextAppearance">
         <!-- Text color. -->
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index a7336fc2c0feb..ef6719dfbe8af 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -1232,9 +1232,9 @@
   <public type="attr" name="webTextViewStyle" id="0x010102b9" />
   <public type="attr" name="overscrollMode" id="0x010102ba" />
   <public type="attr" name="restoreAnyVersion" id="0x010102bb" />
-  <public type="attr" name="stripLeft" id="0x010102bc" />
-  <public type="attr" name="stripRight" id="0x010102bd" />
-  <public type="attr" name="stripEnabled" id="0x010102be" />
+  <public type="attr" name="tabStripLeft" id="0x010102bc" />
+  <public type="attr" name="tabStripRight" id="0x010102bd" />
+  <public type="attr" name="tabStripEnabled" id="0x010102be" />
   <public type="attr" name="overscrollHeader" id="0x010102bf" />
   <public type="attr" name="overscrollFooter" id="0x010102c0" />