am 71836f4c: Remove scroll barrier constant. Bug #2553595

Merge commit '71836f4cb6389042d839d2a26582f796c6e97c26' into kraken

* commit '71836f4cb6389042d839d2a26582f796c6e97c26':
  Remove scroll barrier constant.

1 files changed, 1 insertions, 9 deletions

diff --git a/policy/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
index f750f23..cfdce5a 100755
--- a/policy/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -185,10 +185,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
     
     // Vibrator pattern for haptic feedback during boot when safe mode is enabled.
     long[] mSafeModeEnabledVibePattern;
-    
-    // Vibrator pattern for haptic feedback when the user hits a touch scroll barrier.
-    long[] mScrollBarrierVibePattern;
-    
+
     /** If true, hitting shift & menu will broadcast Intent.ACTION_BUG_REPORT */
     boolean mEnableShiftMenuBugReports = false;
     
@@ -541,8 +538,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                 com.android.internal.R.array.config_safeModeDisabledVibePattern);
         mSafeModeEnabledVibePattern = getLongIntArray(mContext.getResources(),
                 com.android.internal.R.array.config_safeModeEnabledVibePattern);
-        mScrollBarrierVibePattern = getLongIntArray(mContext.getResources(),
-                com.android.internal.R.array.config_scrollBarrierVibePattern);
     }
 
     public void updateSettings() {
@@ -2362,9 +2357,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
             case HapticFeedbackConstants.SAFE_MODE_ENABLED:
                 pattern = mSafeModeEnabledVibePattern;
                 break;
-            case HapticFeedbackConstants.SCROLL_BARRIER:
-                pattern = mScrollBarrierVibePattern;
-                break;
             default:
                 return false;
         }