Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '71836f4cb6389042d839d2a26582f796c6e97c26' into kraken

* commit '71836f4cb6389042d839d2a26582f796c6e97c26':
  Remove scroll barrier constant.
This commit is contained in:
Romain Guy
2010-03-29 15:05:08 -07:00
committed by Android Git Automerger
parent eee817e5f4 8154cd3bbc
commit 7836b05105
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
policy/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -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;
}