diff options
author | Romain Guy <romainguy@google.com> | 2010-03-29 15:05:08 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-29 15:05:08 -0700 |
commit | 7836b05105ab2c8cd945b63ccebb2373396ad5b2 (patch) | |
tree | e6ad0f7333f1cb5a3293b34edc41a3b293f54787 /policy/com | |
parent | eee817e5f43e48b619c5d3698126de387e74abea (diff) | |
parent | 8154cd3bbce98e2b3850d47a7d0826e93860506b (diff) | |
download | frameworks_base-7836b05105ab2c8cd945b63ccebb2373396ad5b2.zip frameworks_base-7836b05105ab2c8cd945b63ccebb2373396ad5b2.tar.gz frameworks_base-7836b05105ab2c8cd945b63ccebb2373396ad5b2.tar.bz2 |
am 71836f4c: Remove scroll barrier constant. Bug #2553595
Merge commit '71836f4cb6389042d839d2a26582f796c6e97c26' into kraken
* commit '71836f4cb6389042d839d2a26582f796c6e97c26':
Remove scroll barrier constant.
Diffstat (limited to 'policy/com')
-rwxr-xr-x | policy/com/android/internal/policy/impl/PhoneWindowManager.java | 10 |
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; } |