Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7836b051 authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

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

Merge commit '71836f4cb6389042d839d2a26582f796c6e97c26' into kraken

* commit '71836f4cb6389042d839d2a26582f796c6e97c26':
  Remove scroll barrier constant.
parents eee817e5 8154cd3b

policy/com/android/internal/policy/impl/PhoneWindowManager.java

+1 −9
Original line number Diff line number Diff line
@@ -186,9 +186,6 @@ 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;

        }